Add environment processor to metrics sent to Splunk

signalfx · Mar 8, 2022 · 1809628 · 1809628
1 parent 75cfd0b
commit 1809628
Show file tree

Hide file tree

Showing 60 changed files with 136 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## [0.44.1] - 2022-03-09
+
+### Fixed
+
+- Add environment processor to metrics pipeline when sending metrics to Splunk (#399)
+
 ## [0.44.0] - 2022-03-03
 
 ### Added

diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: splunk-otel-collector
-version: 0.44.0
+version: 0.44.1
 appVersion: 0.44.0
 description: Splunk OpenTelemetry Collector for Kubernetes
 icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png

diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
@@ -693,6 +693,9 @@ service:
         - batch
         - resourcedetection
         - resource
+        {{- if (and .Values.splunkPlatform.metricsEnabled .Values.environment) }}
+        - resource/add_environment
+        {{- end }}
         {{- if .Values.isWindows }}
         - metricstransform
         {{- end }}

diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
@@ -193,6 +193,9 @@ service:
         {{- if .Values.extraAttributes.custom }}
         - resource/add_custom_attrs
         {{- end }}
+        {{- if (and .Values.splunkPlatform.metricsEnabled .Values.environment) }}
+        - resource/add_environment
+        {{- end }}
       exporters:
         {{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }}
         - signalfx

diff --git a/rendered/manifests/agent-only/clusterRole.yaml b/rendered/manifests/agent-only/clusterRole.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 rules:

diff --git a/rendered/manifests/agent-only/clusterRoleBinding.yaml b/rendered/manifests/agent-only/clusterRoleBinding.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 roleRef:

diff --git a/rendered/manifests/agent-only/configmap-agent.yaml b/rendered/manifests/agent-only/configmap-agent.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-otel-agent
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 data:

diff --git a/rendered/manifests/agent-only/configmap-cluster-receiver.yaml b/rendered/manifests/agent-only/configmap-cluster-receiver.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-otel-k8s-cluster-receiver
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 data:

diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-agent
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 spec:
@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: 22485775cf7aa15d84c29f3b263478c8094585023d7835357d3b75903a80b381
+        checksum/config: d9bdeeee21bc8da10680e6338d3c530701df3c580a7788264aa362acab2fcf7a
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/rendered/manifests/agent-only/deployment-cluster-receiver.yaml b/rendered/manifests/agent-only/deployment-cluster-receiver.yaml
@@ -6,13 +6,13 @@ metadata:
   name: default-splunk-otel-collector-k8s-cluster-receiver
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
     component: otel-k8s-cluster-receiver
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
     app.kubernetes.io/component: otel-k8s-cluster-receiver
@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: f071e6903141bc1aa59f94faf8eef2e519f56acb4cf28cfd38c5fe295ce2b5b8
+        checksum/config: c66f93805b2b2e5fb1c4d21ebe36fb1a6688d7451b6bc8ebf468f0fd5bce78c9
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/rendered/manifests/agent-only/secret-splunk.yaml b/rendered/manifests/agent-only/secret-splunk.yaml
@@ -6,12 +6,12 @@ metadata:
   name: splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 type: Opaque

diff --git a/rendered/manifests/agent-only/serviceAccount.yaml b/rendered/manifests/agent-only/serviceAccount.yaml
@@ -6,11 +6,11 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
diff --git a/rendered/manifests/eks-fargate/clusterRole.yaml b/rendered/manifests/eks-fargate/clusterRole.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 rules:

diff --git a/rendered/manifests/eks-fargate/clusterRoleBinding.yaml b/rendered/manifests/eks-fargate/clusterRoleBinding.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 roleRef:

diff --git a/rendered/manifests/eks-fargate/configmap-cluster-receiver-node-discoverer-script.yaml b/rendered/manifests/eks-fargate/configmap-cluster-receiver-node-discoverer-script.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-cr-node-discoverer-script
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 data:

diff --git a/rendered/manifests/eks-fargate/configmap-cluster-receiver.yaml b/rendered/manifests/eks-fargate/configmap-cluster-receiver.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-otel-k8s-cluster-receiver
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 data:

diff --git a/rendered/manifests/eks-fargate/configmap-gateway.yaml b/rendered/manifests/eks-fargate/configmap-gateway.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 data:

diff --git a/rendered/manifests/eks-fargate/deployment-cluster-receiver.yaml b/rendered/manifests/eks-fargate/deployment-cluster-receiver.yaml
@@ -6,13 +6,13 @@ metadata:
   name: default-splunk-otel-collector-k8s-cluster-receiver
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
     component: otel-k8s-cluster-receiver
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
     app.kubernetes.io/component: otel-k8s-cluster-receiver
@@ -32,7 +32,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: a4127846f195dd23e69913307ee6e25e5f810546e7a5c25ec81b7d8f747b54ae
+        checksum/config: d739a74eb5a8404135fe62b0730cb2e7fd8e8372dbc3f265d943a9e27c62ca03
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/rendered/manifests/eks-fargate/deployment-gateway.yaml b/rendered/manifests/eks-fargate/deployment-gateway.yaml
@@ -6,13 +6,13 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
     component: otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
     app.kubernetes.io/component: otel-collector
@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: aea5807dba6bcab44c89502c99a514f8c0a784e613eddd792bf4edd53724ac8f
+        checksum/config: d00b2479ef868a93e0c99374748ec9d9bc7bff151450dccf46b3ac6dac4971f4
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/rendered/manifests/eks-fargate/secret-splunk.yaml b/rendered/manifests/eks-fargate/secret-splunk.yaml
@@ -6,12 +6,12 @@ metadata:
   name: splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 type: Opaque

diff --git a/rendered/manifests/eks-fargate/service.yaml b/rendered/manifests/eks-fargate/service.yaml
@@ -6,13 +6,13 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
     component: otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
     app.kubernetes.io/component: otel-collector

diff --git a/rendered/manifests/eks-fargate/serviceAccount.yaml b/rendered/manifests/eks-fargate/serviceAccount.yaml
@@ -6,11 +6,11 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
diff --git a/rendered/manifests/gateway-only/clusterRole.yaml b/rendered/manifests/gateway-only/clusterRole.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 rules:

diff --git a/rendered/manifests/gateway-only/clusterRoleBinding.yaml b/rendered/manifests/gateway-only/clusterRoleBinding.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 roleRef:

diff --git a/rendered/manifests/gateway-only/configmap-gateway.yaml b/rendered/manifests/gateway-only/configmap-gateway.yaml
@@ -6,12 +6,12 @@ metadata:
   name: default-splunk-otel-collector-otel-collector
   labels:
     app.kubernetes.io/name: splunk-otel-collector
-    helm.sh/chart: splunk-otel-collector-0.44.0
+    helm.sh/chart: splunk-otel-collector-0.44.1
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: default
     app.kubernetes.io/version: "0.44.0"
     app: splunk-otel-collector
-    chart: splunk-otel-collector-0.44.0
+    chart: splunk-otel-collector-0.44.1
     release: default
     heritage: Helm
 data: