Merge branch 'local-refactoring-removing-env-variables' into removing…

…-not-needed-env-variables
signalfx · Jan 16, 2025 · b6ee42e · b6ee42e
2 parents f64500b + 91d932b
commit b6ee42e
Show file tree

Hide file tree

Showing 149 changed files with 398 additions and 1,377 deletions.
diff --git a/.chloggen/refactoring-removing-not-needed-environmental-variables.yaml b/.chloggen/refactoring-removing-not-needed-environmental-variables.yaml
@@ -0,0 +1,13 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: clusterReceiver
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: clusterReceiver refactor by removing unnecessary environmental variables after introducing the k8sAttributesProcessor to clusterReceiver, and improve the configuration for the metrics k8sAttributesProcessor
+
+# One or more tracking issues related to the change
+issues: []
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml
@@ -134,6 +134,7 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
+          - k8s.pod.ip
           - container.id
           - container.image.name
           - container.image.tag

diff --git a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml
@@ -30,23 +30,6 @@ data:
     processors:
       batch:
         send_batch_max_size: 32768
-      k8sattributes/clusterReceiver:
-        extract:
-          metadata:
-          - k8s.namespace.name
-          - k8s.node.name
-          - k8s.pod.name
-          - k8s.pod.uid
-          - container.id
-          - container.image.name
-          - container.image.tag
-        pod_association:
-        - sources:
-          - from: resource_attribute
-            name: k8s.namespace.name
-        - sources:
-          - from: resource_attribute
-            name: k8s.node.name
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
@@ -63,15 +46,6 @@ data:
         - action: insert
           key: k8s.node.name
           value: ${K8S_NODE_NAME}
-        - action: insert
-          key: k8s.pod.name
-          value: ${K8S_POD_NAME}
-        - action: insert
-          key: k8s.pod.uid
-          value: ${K8S_POD_UID}
-        - action: insert
-          key: k8s.namespace.name
-          value: ${K8S_NAMESPACE}
       resource/k8s_cluster:
         attributes:
         - action: insert

diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: e62f6ee4ef1ba1d8771d4056077ed10afe5d3bc6b4052980b2a7cc9f15a2bcdd
+        checksum/config: b208f1dbfe25d3d0868fc9abbff56e114925e1c925b731bec81165896d79f675
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
+        checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
@@ -50,23 +50,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          - name: K8S_POD_IP
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: status.podIP
-          - name: K8S_POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: K8S_POD_UID
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.uid
-          - name: K8S_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom:
               secretKeyRef:

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml
@@ -83,6 +83,7 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
+          - k8s.pod.ip
           - container.id
           - container.image.name
           - container.image.tag

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml
@@ -30,23 +30,6 @@ data:
     processors:
       batch:
         send_batch_max_size: 32768
-      k8sattributes/clusterReceiver:
-        extract:
-          metadata:
-          - k8s.namespace.name
-          - k8s.node.name
-          - k8s.pod.name
-          - k8s.pod.uid
-          - container.id
-          - container.image.name
-          - container.image.tag
-        pod_association:
-        - sources:
-          - from: resource_attribute
-            name: k8s.namespace.name
-        - sources:
-          - from: resource_attribute
-            name: k8s.node.name
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
@@ -63,15 +46,6 @@ data:
         - action: insert
           key: k8s.node.name
           value: ${K8S_NODE_NAME}
-        - action: insert
-          key: k8s.pod.name
-          value: ${K8S_POD_NAME}
-        - action: insert
-          key: k8s.pod.uid
-          value: ${K8S_POD_UID}
-        - action: insert
-          key: k8s.namespace.name
-          value: ${K8S_NAMESPACE}
       resource/k8s_cluster:
         attributes:
         - action: insert

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: e8ae8de67a024a79ab31a0ac261fdb0c85fd63b509681242d93917bfc29b8a76
+        checksum/config: 956cc5846c316e03adf372da704fe97be150b9d1ed4f406c316c99fbe002534c
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
+        checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
@@ -50,23 +50,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          - name: K8S_POD_IP
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: status.podIP
-          - name: K8S_POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: K8S_POD_UID
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.uid
-          - name: K8S_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom:
               secretKeyRef:

diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml
@@ -75,6 +75,7 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
+          - k8s.pod.ip
           - container.id
           - container.image.name
           - container.image.tag

diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml
@@ -30,23 +30,6 @@ data:
     processors:
       batch:
         send_batch_max_size: 32768
-      k8sattributes/clusterReceiver:
-        extract:
-          metadata:
-          - k8s.namespace.name
-          - k8s.node.name
-          - k8s.pod.name
-          - k8s.pod.uid
-          - container.id
-          - container.image.name
-          - container.image.tag
-        pod_association:
-        - sources:
-          - from: resource_attribute
-            name: k8s.namespace.name
-        - sources:
-          - from: resource_attribute
-            name: k8s.node.name
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
@@ -63,15 +46,6 @@ data:
         - action: insert
           key: k8s.node.name
           value: ${K8S_NODE_NAME}
-        - action: insert
-          key: k8s.pod.name
-          value: ${K8S_POD_NAME}
-        - action: insert
-          key: k8s.pod.uid
-          value: ${K8S_POD_UID}
-        - action: insert
-          key: k8s.namespace.name
-          value: ${K8S_NAMESPACE}
       resource/k8s_cluster:
         attributes:
         - action: insert

diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 46b8ba55ad9b9c54254be9211b0396df3cd0d3a71dbc20fb3ba8893b6318ad88
+        checksum/config: a8a17d34e94811972158654ce2c32889a49e06d7a04912bad4b66c866224346c
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
+        checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
@@ -50,23 +50,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          - name: K8S_POD_IP
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: status.podIP
-          - name: K8S_POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: K8S_POD_UID
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.uid
-          - name: K8S_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom:
               secretKeyRef:

diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml
@@ -75,6 +75,7 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
+          - k8s.pod.ip
           - container.id
           - container.image.name
           - container.image.tag

diff --git a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml
@@ -30,23 +30,6 @@ data:
     processors:
       batch:
         send_batch_max_size: 32768
-      k8sattributes/clusterReceiver:
-        extract:
-          metadata:
-          - k8s.namespace.name
-          - k8s.node.name
-          - k8s.pod.name
-          - k8s.pod.uid
-          - container.id
-          - container.image.name
-          - container.image.tag
-        pod_association:
-        - sources:
-          - from: resource_attribute
-            name: k8s.namespace.name
-        - sources:
-          - from: resource_attribute
-            name: k8s.node.name
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
@@ -63,15 +46,6 @@ data:
         - action: insert
           key: k8s.node.name
           value: ${K8S_NODE_NAME}
-        - action: insert
-          key: k8s.pod.name
-          value: ${K8S_POD_NAME}
-        - action: insert
-          key: k8s.pod.uid
-          value: ${K8S_POD_UID}
-        - action: insert
-          key: k8s.namespace.name
-          value: ${K8S_NAMESPACE}
       resource/k8s_cluster:
         attributes:
         - action: insert

diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 4a6276e318600d9ea3e76c91b6670f201c626ba375a03af94eac9d8efcf71cdb
+        checksum/config: fd21c71811a6331e0d2bfbab6371861bdcad8ff638892862bd74fca9d9503fa2
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
+        checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
@@ -50,23 +50,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          - name: K8S_POD_IP
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: status.podIP
-          - name: K8S_POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: K8S_POD_UID
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.uid
-          - name: K8S_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom:
               secretKeyRef:

diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml
@@ -101,6 +101,7 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
+          - k8s.pod.ip
           - container.id
           - container.image.name
           - container.image.tag