Add some missing fields of SCK

signalfx · Feb 10, 2023 · e9f1403 · e9f1403
1 parent 8aaa664
commit e9f1403
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 9 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl
@@ -162,6 +162,12 @@ resource/logs:
     {{- 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 }}
 
 {{/*

diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
@@ -646,6 +646,9 @@ service:
         - batch
         - resource
         {{- if not $gatewayEnabled }}
+        {{- if .Values.splunkPlatform.fieldNameConvention.renameFieldsSck }}
+        - transform/sck_fields
+        {{- end }}
         - resource/logs
         {{- end }}
         - resourcedetection

diff --git a/rendered/manifests/agent-only/configmap-agent.yaml b/rendered/manifests/agent-only/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

diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/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

diff --git a/rendered/manifests/cluster-receiver-objects/configmap-agent.yaml b/rendered/manifests/cluster-receiver-objects/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:
       filelog:
         encoding: utf-8
@@ -344,6 +350,7 @@ data:
           - filter/logs
           - batch
           - resource
+          - transform/sck_fields
           - resource/logs
           - resourcedetection
           receivers:

diff --git a/rendered/manifests/cluster-receiver-objects/daemonset.yaml b/rendered/manifests/cluster-receiver-objects/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 615e6ecdac1dbd088376a5473f7b107f2e990ed3283b7911cecdbaf46f5059b6
+        checksum/config: 32b79b34331f22f51e732b7a346c92a5512f14faf4080b4d9127d221d6d539a1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/rendered/manifests/eks-fargate/configmap-gateway.yaml b/rendered/manifests/eks-fargate/configmap-gateway.yaml
@@ -123,6 +123,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:

diff --git a/rendered/manifests/eks-fargate/deployment-gateway.yaml b/rendered/manifests/eks-fargate/deployment-gateway.yaml
@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 4bfe8002d655d77fd9c91437a5fdfa6b21f8d1a6888dffc8bd352a18f10b0204
+        checksum/config: 97c9e722e8c0848ff511f9b9bbcd37998bc2658a40de30705a15bdbc782d1ff1
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/rendered/manifests/gateway-only/configmap-gateway.yaml b/rendered/manifests/gateway-only/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:

diff --git a/rendered/manifests/gateway-only/deployment-gateway.yaml b/rendered/manifests/gateway-only/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:

diff --git a/rendered/manifests/logs-only/configmap-agent.yaml b/rendered/manifests/logs-only/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
@@ -172,6 +178,7 @@ data:
           - filter/logs
           - batch
           - resource
+          - transform/sck_fields
           - resource/logs
           - resourcedetection
           receivers:

diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml
@@ -30,7 +30,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: c72a5536ce2ddd9792af9317f7d0f7b61e52a9f46c9e1819f79075f3da4c0311
+        checksum/config: 18908ebfd6f759e74e2ba14e8a71d9c04475831b901faed559eff77339503636
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/rendered/manifests/metrics-only/configmap-agent.yaml b/rendered/manifests/metrics-only/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

diff --git a/rendered/manifests/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/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

diff --git a/rendered/manifests/network-explorer/configmap-gateway.yaml b/rendered/manifests/network-explorer/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:

diff --git a/rendered/manifests/network-explorer/deployment-gateway.yaml b/rendered/manifests/network-explorer/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:

diff --git a/rendered/manifests/otel-logs/configmap-agent.yaml b/rendered/manifests/otel-logs/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:
       filelog:
         encoding: utf-8
@@ -344,6 +350,7 @@ data:
           - filter/logs
           - batch
           - resource
+          - transform/sck_fields
           - resource/logs
           - resourcedetection
           receivers:

diff --git a/rendered/manifests/otel-logs/daemonset.yaml b/rendered/manifests/otel-logs/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 615e6ecdac1dbd088376a5473f7b107f2e990ed3283b7911cecdbaf46f5059b6
+        checksum/config: 32b79b34331f22f51e732b7a346c92a5512f14faf4080b4d9127d221d6d539a1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/rendered/manifests/traces-only/configmap-agent.yaml b/rendered/manifests/traces-only/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:

diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/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