signalfx · crobert-1 · Dec 1, 2023 · Dec 1, 2023 · Dec 1, 2023 · Dec 1, 2023
@@ -0,0 +1,12 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, networkExplorer, 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: Make clusterName optional in EKS and GKE
+# One or more tracking issues related to the change
+issues: [1056]
+# (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:
@@ -152,9 +152,11 @@ For Splunk Observability Cloud the following parameters are required:
 - `splunkObservability.accessToken`: Your Splunk Observability org access
   token.
 
-The following parameter is required for any of the destinations:
+The following parameter is required or optional depending on the Kubernetes service:
 
 - `clusterName`: arbitrary value that identifies your Kubernetes cluster. The value will be associated with every trace, metric and log as "k8s.cluster.name" attribute.
+  * Optional: If `distribution` is set to EKS, EKS/fargate, GKE, and GKE/autopilot. If `clusterName` is specified it will overwrite detected value.
+  * Required: For all other distributions.
 
 Run the following commands, replacing the parameters above with their appropriate values.
 

@@ -183,6 +183,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       filelog:
         encoding: utf-8

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 2ed8cac6190f5e6b4d88c2a41231a6e7e939e4bf0acdf70d7d55583aa56c3a71
+        checksum/config: 51de9ac52f1678407bfc952a0bd4038e40bb40d8c8257ca9b5259156032a4303
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 14367a1254370c5fdbac0ebb1def583bdea4f355fae06dcc22e2dfb8ed5f5320
+        checksum/config: 04cc3b443f9422bd2f3e9a8dbfaf3a3de759142cb3830eca6bec635cde9576e2
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -132,6 +132,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       filelog:
         encoding: utf-8

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: f17b83e48bb335a2bdc8eaae8e7599f35a9aaa91ac4255582c4351fdbba7803e
+        checksum/config: 893773b44fe97e265c14a5947207b6be7bae41338a5a00c5e4bf53cc0c70b733
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 14367a1254370c5fdbac0ebb1def583bdea4f355fae06dcc22e2dfb8ed5f5320
+        checksum/config: 04cc3b443f9422bd2f3e9a8dbfaf3a3de759142cb3830eca6bec635cde9576e2
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -124,6 +124,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       hostmetrics:
         collection_interval: 10s

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 730b35d6f7e4789fe8fe659d9ec9e4bcaac4f44fa68beedb10bf00907ce50fe9
+        checksum/config: 15919b0ab38ef42f028221fc8b69774c3b543edac3d9381e7bfdf29c9c0508a0
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 14367a1254370c5fdbac0ebb1def583bdea4f355fae06dcc22e2dfb8ed5f5320
+        checksum/config: 04cc3b443f9422bd2f3e9a8dbfaf3a3de759142cb3830eca6bec635cde9576e2
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -127,6 +127,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       hostmetrics:
         collection_interval: 10s

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 82888cbf9fa590464676e01a10139250fc45e8b343b842514151320ef1a8aaf3
+        checksum/config: 62017f63e77890b706f6a3efb61527b4c78926010c0343355a202ef22d758403
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 14367a1254370c5fdbac0ebb1def583bdea4f355fae06dcc22e2dfb8ed5f5320
+        checksum/config: 04cc3b443f9422bd2f3e9a8dbfaf3a3de759142cb3830eca6bec635cde9576e2
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -150,6 +150,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
       transform/istio_service_name:
         error_mode: ignore
         log_statements:

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 4e44e9f614aa9e5000f2a641146e51d44c47b29885be5b83e5b903e17241606f
+        checksum/config: 1322578a4cc5c20d2c106b5f5e5038105bf580150dc41fd16725c751f8abbc96
         kubectl.kubernetes.io/default-container: otel-collector
         sidecar.istio.io/inject: "false"
     spec:

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 14367a1254370c5fdbac0ebb1def583bdea4f355fae06dcc22e2dfb8ed5f5320
+        checksum/config: 04cc3b443f9422bd2f3e9a8dbfaf3a3de759142cb3830eca6bec635cde9576e2
         sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: default-splunk-otel-collector

@@ -124,6 +124,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       hostmetrics:
         collection_interval: 10s

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 33630506932c6f4b210dc9ee99ac4979339ab0a737edba26a5d080202ae581c8
+        checksum/config: 33eb0914c7cfd138ef1edd2bf1636855255def6e73f8889ce308d3f42100a03f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

@@ -110,6 +110,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       hostmetrics:
         collection_interval: 10s

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -124,6 +124,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       jaeger:
         protocols:

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 78717919b7015ed68641b72c25951cf611e4fff51bc8215c187f1bdb6b6dd77f
+        checksum/config: 82088ffe37f558c434248823c1b9481cf0012d01195fc0bc28cd9a723782e916
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 14367a1254370c5fdbac0ebb1def583bdea4f355fae06dcc22e2dfb8ed5f5320
+        checksum/config: 04cc3b443f9422bd2f3e9a8dbfaf3a3de759142cb3830eca6bec635cde9576e2
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 1afcddac6dfce4237231dc01a4d7aecee885f5de2b6193f4de6e6ce999805523
+        checksum/config: ea4259c2968c3535c76528037624b24ece5c503be6b4ba7dcac993e6c407d29f
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -72,6 +72,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
       transform/add_sourcetype:
         log_statements:
         - context: log

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 70f8b64d9c959e0bac5c2697fa2c04995ed79e0bebd64e3388b80da73a4a3787
+        checksum/config: b50612c77989dbe333321be4648a8d407a56e25e6fc61d4980507b9c70e6dbe9
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -124,6 +124,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       jaeger:
         protocols:

@@ -30,7 +30,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 1afcddac6dfce4237231dc01a4d7aecee885f5de2b6193f4de6e6ce999805523
+        checksum/config: ea4259c2968c3535c76528037624b24ece5c503be6b4ba7dcac993e6c407d29f
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

@@ -124,6 +124,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       hostmetrics:
         collection_interval: 10s

@@ -66,6 +66,11 @@ data:
         - system
         override: true
         timeout: 10s
+      resourcedetection/k8s_cluster_name:
+        detectors:
+        - env
+        override: true
+        timeout: 10s
     receivers:
       k8s_cluster:
         auth_type: serviceAccount

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 33630506932c6f4b210dc9ee99ac4979339ab0a737edba26a5d080202ae581c8
+        checksum/config: 33eb0914c7cfd138ef1edd2bf1636855255def6e73f8889ce308d3f42100a03f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true