fix pod metrics annotations (#1977)

* fix metrics pod annotations, add integration tests with both namespace and pod annotations

* rework k8sattributes/metrics

* update CHANGELOG note

Author: omrozowicz-splunk

.chloggen/fix-metrics-annotations.yaml

@@ -0,0 +1,12 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: chart
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix per-pod configuration of 'metricsIndex' and 'sourcetype' config for Splunk Platform metrics via annotations
+# One or more tracking issues related to the change
+issues: [1977]
+# (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:

ci_scripts/k8s-splunk.yml

@@ -46,6 +46,12 @@ data:
               homePath: $SPLUNK_DB/test_metrics/db
               maxTotalDataSizeMB: 512000
               thawedPath: $SPLUNK_DB/test_metrics/thaweddb
+            test_metrics_annotation:
+              coldPath: $SPLUNK_DB/test_metrics_annotation/colddb
+              datatype: metric
+              homePath: $SPLUNK_DB/test_metrics_annotation/db
+              maxTotalDataSizeMB: 512000
+              thawedPath: $SPLUNK_DB/test_metrics_annotation/thaweddb
 ---
 apiVersion: v1
 kind: Pod

examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml

@@ -183,18 +183,17 @@ data:
         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
+            name: k8s.namespace.name
+          - from: resource_attribute
+            name: k8s.pod.name
         - sources:
           - from: resource_attribute
-            name: ip
+            name: k8s.pod.ip
         - sources:
           - from: connection
       memory_limiter:

examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml

@@ -132,18 +132,17 @@ data:
         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
+            name: k8s.namespace.name
+          - from: resource_attribute
+            name: k8s.pod.name
         - sources:
           - from: resource_attribute
-            name: ip
+            name: k8s.pod.ip
         - sources:
           - from: connection
       memory_limiter:

examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 059f577d9797aed9a5dacdf64b59877cb8c69ea52dbc3c9599321e55d13d92fc
+        checksum/config: dd3c0878d50994e2e84f458240f9f99f16783f827015ddc2f4b5d21bf4f8220e
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/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: 1298c6b84710112199e140eea2d0434691e311f9b080d275d833e53655b40187
+        checksum/config: 694025094891807930f62008e82432b8df8d0d6f867c53510b85f3b57e669df9
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml

@@ -183,18 +183,17 @@ data:
         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
+            name: k8s.namespace.name
+          - from: resource_attribute
+            name: k8s.pod.name
         - sources:
           - from: resource_attribute
-            name: ip
+            name: k8s.pod.ip
         - sources:
           - from: connection
       memory_limiter:

examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml

@@ -132,18 +132,17 @@ data:
         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
+            name: k8s.namespace.name
+          - from: resource_attribute
+            name: k8s.pod.name
         - sources:
           - from: resource_attribute
-            name: ip
+            name: k8s.pod.ip
         - sources:
           - from: connection
       memory_limiter:

examples/enable-persistence-queue/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: d544513bc2209474427c49ec73cc5f053c1feb32c4879a2f2f8558cda472bd0a
+        checksum/config: a99138ec442323b8f5a2b3a7fd84f55dfed26b8e3823b88f94ab2237353307fe
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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: 1298c6b84710112199e140eea2d0434691e311f9b080d275d833e53655b40187
+        checksum/config: 694025094891807930f62008e82432b8df8d0d6f867c53510b85f3b57e669df9
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector: