Fix naming convention issue in helm chart

examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml

@@ -135,6 +135,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       hostmetrics:
         collection_interval: 10s
@@ -250,6 +256,22 @@ data:
       - memory_ballast
       - zpages
       pipelines:
+        logs:
+          exporters:
+          - splunk_hec/o11y
+          processors:
+          - memory_limiter
+          - k8sattributes
+          - filter/logs
+          - batch
+          - resource
+          - transform/sck_fields
+          - resource/logs
+          - resourcedetection
+          receivers:
+          - filelog
+          - fluentforward
+          - otlp
         metrics:
           exporters:
           - signalfx

examples/add-receiver-creator/rendered_manifests/daemonset.yaml

@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 38479c03e5add2b8a5fec907700bf8dd3649d9aa584dd86280ff9d6f34812316
+        checksum/config: 32b79b34331f22f51e732b7a346c92a5512f14faf4080b4d9127d221d6d539a1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/add-sampler/rendered_manifests/daemonset.yaml

@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: fb7b212cc914fce0178fb811a13ec32be64b73489d87cef5249462f9b9d29e2b
+        checksum/config: 32b79b34331f22f51e732b7a346c92a5512f14faf4080b4d9127d221d6d539a1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/collector-agent-only/rendered_manifests/configmap-agent.yaml

@@ -135,6 +135,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       hostmetrics:
         collection_interval: 10s

examples/collector-agent-only/rendered_manifests/daemonset.yaml

@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: f24285909af0884c7557482977a7a54aa1294e3a121a5cf78d7572a19fc5bafd
+        checksum/config: 049014f601e42813b9b5b9ccd071b6238e31a86df263a9f3e2f6f2aa2b1375d7
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/collector-gateway-only-advanced/rendered_manifests/configmap-gateway.yaml

@@ -121,6 +121,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       jaeger:
         protocols:

examples/collector-gateway-only-advanced/rendered_manifests/deployment-gateway.yaml

@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 0a71c96ab49070efbab9792ac6bd2a7fd6c79456ffbd8742ee2dda17103c2ae6
+        checksum/config: 97c9e722e8c0848ff511f9b9bbcd37998bc2658a40de30705a15bdbc782d1ff1
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml

@@ -121,6 +121,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       jaeger:
         protocols:

examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml

@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 0a71c96ab49070efbab9792ac6bd2a7fd6c79456ffbd8742ee2dda17103c2ae6
+        checksum/config: b167e2d8128b9a576780e47aedcab7dd65e44a3723428e7226f884c392673ec0
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/enable-network-explorer/rendered_manifests/configmap-gateway.yaml

@@ -121,6 +121,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       jaeger:
         protocols:

examples/enable-network-explorer/rendered_manifests/deployment-gateway.yaml

@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 0a71c96ab49070efbab9792ac6bd2a7fd6c79456ffbd8742ee2dda17103c2ae6
+        checksum/config: b167e2d8128b9a576780e47aedcab7dd65e44a3723428e7226f884c392673ec0
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml

@@ -138,6 +138,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       fluentforward:
         endpoint: 0.0.0.0:8006
@@ -171,9 +177,10 @@ data:
           - k8sattributes
           - filter/logs
           - batch
+          - resource
+          - transform/sck_fields
           - resource/logs
           - resourcedetection
-          - resource
           receivers:
           - fluentforward
           - otlp

examples/only-logs-fluentd/rendered_manifests/daemonset.yaml

@@ -30,7 +30,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 23076ae4687ac47f216f076d5dab7dab6e03d3b4d3f926c8e05de9ced7112821
+        checksum/config: 18908ebfd6f759e74e2ba14e8a71d9c04475831b901faed559eff77339503636
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/only-logs-otel/rendered_manifests/configmap-agent.yaml

@@ -129,6 +129,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       filelog:
         encoding: utf-8
@@ -262,9 +268,10 @@ data:
           - k8sattributes
           - filter/logs
           - batch
+          - resource
+          - transform/sck_fields
           - resource/logs
           - resourcedetection
-          - resource
           receivers:
           - filelog
           - fluentforward

examples/only-metrics/rendered_manifests/configmap-agent.yaml

@@ -132,6 +132,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       hostmetrics:
         collection_interval: 10s

examples/only-metrics/rendered_manifests/daemonset.yaml

@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 59819d366b1050061720f5fdd77ca4b47469bb212e45a875f610857d0e2f426f
+        checksum/config: 443a6a66451af9b57d33e821a6fb7637c215181f4788c9feec71493b772fc3c7
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/only-traces/rendered_manifests/configmap-agent.yaml

@@ -135,6 +135,12 @@ data:
         - system
         override: true
         timeout: 10s
+      transform/sck_fields:
+        log_statements:
+        - context: log
+          statements:
+          - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"],
+            resource.attributes["container.image.tag"]], ":"))
     receivers:
       jaeger:
         protocols:

examples/only-traces/rendered_manifests/daemonset.yaml

@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: f2cfc1fa5ccc8fe78d3a9cab38b1004a993cd130974dd47b9e49ad6b8bd4b168
+        checksum/config: 7cb6cef9a2ec7925bb3349f625142d75274871945bf8bb1280490efadd143d49
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

helm-charts/splunk-otel-collector/templates/config/_common.tpl

@@ -133,6 +133,9 @@ resource/logs:
     - key: namespace
       from_attribute: k8s.namespace.name
       action: upsert
+    - key: label_app
+      from_attribute: k8s.pod.labels.app
+      action: upsert
     {{- range $_, $label := .Values.extraAttributes.podLabels }}
     - key: {{ printf "label_%s" $label }}
       from_attribute: {{ printf "k8s.pod.labels.%s" $label }}
@@ -151,12 +154,20 @@ resource/logs:
       action: delete
     - key: k8s.namespace.name
       action: delete
+    - key: k8s.pod.labels.app
+      action: delete
     {{- range $_, $label := .Values.extraAttributes.podLabels }}
     - key: {{ printf "k8s.pod.labels.%s" $label }}
       action: delete
     {{- end }}
     {{- end }}
     {{- end }}
+
+transform/sck_fields:
+  log_statements:
+    - context: log
+      statements:
+        - set(resource.attributes["container_image"], Concat([resource.attributes["container.image.name"], resource.attributes["container.image.tag"]], ":"))
 {{- end }}
 
 {{/*

helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl

@@ -644,11 +644,14 @@ service:
         - filter/logs
         {{- end }}
         - batch
+        - resource
         {{- if not $gatewayEnabled }}
+        {{- if .Values.splunkPlatform.fieldNameConvention.renameFieldsSck }}
+        - transform/sck_fields
+        {{- end }}
         - resource/logs
         {{- end }}
         - resourcedetection
-        - resource
         {{- if .Values.environment }}
         - resource/add_environment
         {{- end }}