pre-commit

signalfx · Jan 16, 2025 · 91d932b · 91d932b
1 parent dead8f4
commit 91d932b
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 40 deletions.
diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml
@@ -179,16 +179,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml
@@ -63,16 +63,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 985300eaa324e11cb82ec99f749d0610e00583aa2ceaf070dbb713298bfd5f65
+        checksum/config: dbb447ecc8d9bf95ee011a35906548d3b58e88e42d61efd3a94a44e152f39768
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/...ples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/...ples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7
+        checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml
@@ -179,16 +179,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml
@@ -63,16 +63,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 510117b184c909cfb9abff8788bc0f7302fdc447bab27878d5bd7fed90382839
+        checksum/config: 0c1013410d53ac7cc1f90719366a1562a0140defefb8efa233d69d2eccca6418
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7
+        checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml
@@ -151,16 +151,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml
@@ -63,16 +63,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: f8c6d49e07bd737865bdb8549b295c9235e68ea713133c51179b4ba70af0d1d7
+        checksum/config: 12412a236b479470b533fb9014d9e385372f1b4a8c901fee20aa05c1f7ce5625
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7
+        checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml
@@ -124,16 +124,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml
@@ -63,16 +63,23 @@ data:
           - k8s.node.name
           - k8s.pod.name
           - k8s.pod.uid
-          - k8s.pod.ip
-          - container.id
-          - container.image.name
-          - container.image.tag
         filter:
           node_from_env_var: K8S_NODE_NAME
         pod_association:
         - sources:
           - from: resource_attribute
             name: k8s.node.name
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.uid
+        - sources:
+          - from: resource_attribute
+            name: k8s.pod.ip
+        - sources:
+          - from: resource_attribute
+            name: ip
+        - sources:
+          - from: connection
       memory_limiter:
         check_interval: 2s
         limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}

diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: d3c057f48749f6578aac4521b00e6d0881a68372751f8477fb64d7fcc6860567
+        checksum/config: 9c68190812a8e47027c6a79dfd115802f0c62795b9eb33fb3f15530c9a2ac4a1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7
+        checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector: