From 6859bb0f1ffc1864375f06953fc5cf71c27a1760 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Wed, 6 Nov 2024 10:50:54 +0100 Subject: [PATCH 1/2] split k8sattributes/ecs processor: do not add any extra metadata Signed-off-by: Tetiana Kravchenko --- resources/kubernetes/operator/helm/values.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index da9e09dd..9b3b99e0 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -682,6 +682,21 @@ collectors: - tag_name: app.label.version key: app.kubernetes.io/version from: pod + k8sattributes/ecs: + filter: + # Only retrieve pods running on the same node as the collector + node_from_env_var: OTEL_K8S_NODE_NAME + passthrough: false + pod_association: + # Below association takes a look at the k8s.pod.ip and k8s.pod.uid resource attributes or connection's context, and tries to match it with the pod having the same attribute. + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: connection receivers: # [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) otlp: @@ -852,7 +867,7 @@ collectors: processors: - elasticinframetrics - batch - - k8sattributes + - k8sattributes/ecs - resourcedetection/system - resourcedetection/eks - resourcedetection/gcp From bb2712877b65b26bb4a474df08a7ecd28221bf69 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Wed, 6 Nov 2024 12:00:39 +0100 Subject: [PATCH 2/2] add back name metadata Signed-off-by: Tetiana Kravchenko --- resources/kubernetes/operator/helm/values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index 9b3b99e0..8df60895 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -697,6 +697,13 @@ collectors: name: k8s.pod.uid - sources: - from: connection + extract: + metadata: + - "k8s.replicaset.name" + - "k8s.statefulset.name" + - "k8s.daemonset.name" + - "k8s.cronjob.name" + - "k8s.job.name" receivers: # [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) otlp: