use k8s.resource.name attribute for sourcetype

signalfx · Jan 20, 2023 · 00d0fde · 00d0fde
1 parent b8cc18e
commit 00d0fde
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl
@@ -111,7 +111,7 @@ processors:
     log_statements:
       - context: log
         statements:
-          - set(resource.attributes["com.splunk.sourcetype"], Concat(["kube:object:", attributes["event.name"]], ""))
+          - set(resource.attributes["com.splunk.sourcetype"], Concat(["kube:object:", attributes["k8s.resource.name"]], ""))
   {{- end }}
 
   # Resource attributes specific to the collector itself.

diff --git a/rendered/manifests/cluster-receiver-objects/configmap-cluster-receiver.yaml b/rendered/manifests/cluster-receiver-objects/configmap-cluster-receiver.yaml
@@ -75,7 +75,7 @@ data:
         - context: log
           statements:
           - set(resource.attributes["com.splunk.sourcetype"], Concat(["kube:object:",
-            attributes["event.name"]], ""))
+            attributes["k8s.resource.name"]], ""))
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

diff --git a/rendered/manifests/cluster-receiver-objects/deployment-cluster-receiver.yaml b/rendered/manifests/cluster-receiver-objects/deployment-cluster-receiver.yaml
@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: dc69aeb7ddf5ba0b1b1a5f994a735fdb8b0f1c951bd035444687a6e259ece306
+        checksum/config: b887031f92ae34e484cd4cc73a442dd1f077897614b7d31fc67918572913c447
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/test/k8s_objects_tests/test_config_objects.py b/test/k8s_objects_tests/test_config_objects.py
@@ -30,9 +30,9 @@ def test_k8s_objects(setup, test_key, test_value, expected):
     assert len(events) >= expected
 
 @pytest.mark.parametrize("test_key, test_value, expected", [
-    ("sourcetype", "kube:object:Pod", 1),
-    ("sourcetype", "kube:object:namespace", 1),
-    ("sourcetype", "kube:object:node", 1)
+    ("sourcetype", "kube:object:pods", 1),
+    ("sourcetype", "kube:object:namespaces", 1),
+    ("sourcetype", "kube:object:nodes", 1)
 ])
 def test_k8s_objects_sourcetype(setup, test_key, test_value, expected):
     '''