From bba55d8d56e96b8f67912110871d819cc91bb50d Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Fri, 13 Dec 2024 14:34:48 +0100 Subject: [PATCH 01/15] trigger tests locally --- .github/workflows/functional_test_v2.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/functional_test_v2.yaml b/.github/workflows/functional_test_v2.yaml index 62ece289f8..0a529cafe8 100644 --- a/.github/workflows/functional_test_v2.yaml +++ b/.github/workflows/functional_test_v2.yaml @@ -3,7 +3,9 @@ name: functional-tests on: pull_request: push: - branches: [ main ] + branches: + - main + - local-refactoring-removing-env-variables workflow_dispatch: inputs: UPDATE_EXPECTED_RESULTS: From b860041d1721c65a03bf9f832c170e30b5696e97 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Fri, 13 Dec 2024 14:45:08 +0100 Subject: [PATCH 02/15] try to trigger functional test v2 --- .github/workflows/functional_test_v2.yaml | 6 ++---- .../expected/v1.29/controller_manager_metrics.yaml | 2 +- .../testdata_histogram/expected/v1.29/coredns_metrics.yaml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/functional_test_v2.yaml b/.github/workflows/functional_test_v2.yaml index 0a529cafe8..93df9fe2f1 100644 --- a/.github/workflows/functional_test_v2.yaml +++ b/.github/workflows/functional_test_v2.yaml @@ -2,10 +2,8 @@ name: functional-tests on: pull_request: - push: - branches: - - main - - local-refactoring-removing-env-variables +# push: +# branches: [ main ] workflow_dispatch: inputs: UPDATE_EXPECTED_RESULTS: diff --git a/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml b/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml index 5504487d8b..cf64577368 100644 --- a/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml +++ b/functional_tests/testdata_histogram/expected/v1.29/controller_manager_metrics.yaml @@ -4883,4 +4883,4 @@ resourceMetrics: name: node_ipam_controller_cidrset_allocation_tries_per_request scope: name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver - version: v0.109.0 + version: v0.110.0 diff --git a/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml b/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml index 82b43fc357..a379eb94dd 100644 --- a/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml +++ b/functional_tests/testdata_histogram/expected/v1.29/coredns_metrics.yaml @@ -388,4 +388,4 @@ resourceMetrics: name: coredns_kubernetes_rest_client_rate_limiter_duration_seconds scope: name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver - version: v0.109.0 + version: v0.110.0 From cf9ff27a23940469d2f0f488e057f8f9928e164b Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Fri, 13 Dec 2024 15:25:16 +0100 Subject: [PATCH 03/15] trigger on push --- .github/workflows/functional_test_v2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional_test_v2.yaml b/.github/workflows/functional_test_v2.yaml index 93df9fe2f1..6a6def33f1 100644 --- a/.github/workflows/functional_test_v2.yaml +++ b/.github/workflows/functional_test_v2.yaml @@ -2,7 +2,7 @@ name: functional-tests on: pull_request: -# push: + push: # branches: [ main ] workflow_dispatch: inputs: From 6fcf40b323a401cb2db187bea1c8346e11c0159c Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Fri, 13 Dec 2024 15:37:37 +0100 Subject: [PATCH 04/15] test if test will run --- .github/workflows/functional_test_v2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional_test_v2.yaml b/.github/workflows/functional_test_v2.yaml index 6a6def33f1..f503b83d5a 100644 --- a/.github/workflows/functional_test_v2.yaml +++ b/.github/workflows/functional_test_v2.yaml @@ -400,7 +400,7 @@ jobs: env: GCE_KUBECONFIG: ${{ secrets.GCE_KUBECONFIG }} - name: run functional tests - uses: mobiledevops/secret-to-file-action@v1 +# uses: mobiledevops/secret-to-file-action@v1 env: HOST_ENDPOINT: 0.0.0.0 KUBECONFIG: /tmp/kubeconfig From 7047e94048c1c66c2a0e339a2b3d6ac14bad4d36 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Mon, 13 Jan 2025 13:50:17 +0100 Subject: [PATCH 05/15] add resourceAttributes tests --- .../configuration_switching_test.go | 175 +++++++++++++++++- .../values_cluster_receiver_only.yaml.tmpl | 26 +++ 2 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 functional_tests/testdata_configuration_switching/values/values_cluster_receiver_only.yaml.tmpl diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index 3cf5c8f6e7..5b297a1bbe 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -180,6 +180,7 @@ func Test_Functions(t *testing.T) { t.Run("agent logs and metrics enabled or disabled", testAgentLogsAndMetrics) t.Run("logs and metrics index switch", testIndexSwitch) t.Run("cluster receiver enabled or disabled", testClusterReceiverEnabledOrDisabled) + t.Run("resource attributes verification", testVerifyResourceAttributes) } @@ -347,6 +348,103 @@ func testClusterReceiverEnabledOrDisabled(t *testing.T) { resetLogsSink(t, logsObjectsConsumer) } +func testVerifyResourceAttributes(t *testing.T) { + attributesList := [4]string{"k8s.node.name", "k8s.pod.name", "k8s.pod.uid", "k8s.namespace.name"} + + hostEp := hostEndpoint(t) + if len(hostEp) == 0 { + require.Fail(t, "Host endpoint not found") + } + + t.Run("verify cluster receiver resource attributes", func(t *testing.T) { + valuesFileName := "values_cluster_receiver_only.yaml.tmpl" + logsObjectsConsumer := setupOnce(t).logsObjectsConsumer + logsObjectsHecEndpoint := fmt.Sprintf("http://%s:%d/services/collector", hostEp, hecLogsObjectsReceiverPort) + + replacements := map[string]interface{}{ + "ClusterReceiverEnabled": true, + "LogObjectsHecEndpoint": logsObjectsHecEndpoint, + } + deployChartsAndApps(t, valuesFileName, replacements) + resetLogsSink(t, logsObjectsConsumer) + waitForLogs(t, 5, logsObjectsConsumer) + t.Logf("===> >>>> Logs: %v", len(logsObjectsConsumer.AllLogs())) + + for _, attr := range attributesList { + t.Log("Checking resourceAttribute: ", attr) + resourceAttrValues, notFoundCounter := getLogsResourceAttribute(logsObjectsConsumer.AllLogs(), attr) + assert.True(t, len(resourceAttrValues) >= 1) + assert.Equal(t, 0, notFoundCounter) + t.Logf("Resource Attributes: %v", resourceAttrValues) + } + }) + + t.Run("verify cluster receiver metrics resource attributes", func(t *testing.T) { + valuesFileName := "values_cluster_receiver_only.yaml.tmpl" + hecMetricsConsumer := setupOnce(t).hecMetricsConsumer + logsObjectsHecEndpoint := fmt.Sprintf("http://%s:%d/services/collector", hostEp, hecLogsObjectsReceiverPort) + + replacements := map[string]interface{}{ + "ClusterReceiverEnabled": true, + "LogObjectsHecEndpoint": logsObjectsHecEndpoint, + } + deployChartsAndApps(t, valuesFileName, replacements) + resetMetricsSink(t, hecMetricsConsumer) + t.Logf("===> >>>> Metrics: %v", len(hecMetricsConsumer.AllMetrics())) + + waitForMetrics(t, 5, hecMetricsConsumer) + for _, attr := range attributesList { + t.Log("Checking resourceAttribute: ", attr) + resourceAttrValues, notFoundCounter := getMetricsResourceAttribute(hecMetricsConsumer.AllMetrics(), attr) + assert.True(t, len(resourceAttrValues) >= 1) + assert.Equal(t, 0, notFoundCounter) + t.Logf("Resource Attributes for %s: %v", attr, resourceAttrValues) + } + }) + + t.Run("verify agent logs resource attributes", func(t *testing.T) { + valuesFileName := "values_logs_and_metrics_switching.yaml.tmpl" + agentLogsConsumer := setupOnce(t).logsConsumer + + replacements := map[string]interface{}{ + "MetricsEnabled": true, + "LogsEnabled": true, + } + deployChartsAndApps(t, valuesFileName, replacements) + resetLogsSink(t, agentLogsConsumer) + + waitForLogs(t, 5, agentLogsConsumer) + for _, attr := range attributesList { + t.Log("Checking resourceAttribute: ", attr) + resourceAttrValues, notFoundCounter := getLogsResourceAttribute(agentLogsConsumer.AllLogs(), attr) + assert.True(t, len(resourceAttrValues) >= 1) + assert.Equal(t, 0, notFoundCounter) + t.Logf("Resource Attributes: %v", resourceAttrValues) + } + }) + + t.Run("verify metrics resource attributes", func(t *testing.T) { + valuesFileName := "values_logs_and_metrics_switching.yaml.tmpl" + hecMetricsConsumer := setupOnce(t).hecMetricsConsumer + + replacements := map[string]interface{}{ + "MetricsEnabled": true, + "LogsEnabled": true, + } + deployChartsAndApps(t, valuesFileName, replacements) + resetMetricsSink(t, hecMetricsConsumer) + + waitForMetrics(t, 5, hecMetricsConsumer) + for _, attr := range attributesList { + t.Log("Checking resourceAttribute: ", attr) + resourceAttrValues, notFoundCounter := getMetricsResourceAttribute(hecMetricsConsumer.AllMetrics(), attr) + assert.True(t, len(resourceAttrValues) >= 1) + assert.Equal(t, 0, notFoundCounter) + t.Logf("Resource Attributes for %s: %v", attr, resourceAttrValues) + } + }) +} + func checkPodExists(pods *corev1.PodList, podNamePrefix string) bool { for _, pod := range pods.Items { if strings.HasPrefix(pod.Name, podNamePrefix) { @@ -410,7 +508,6 @@ func getMetricsIndex(metrics []pmetric.Metrics) []string { var indices []string for i := 0; i < len(metrics); i++ { m := metrics[i] - fmt.Printf("Metrics: %v", m.ResourceMetrics().At(0).Resource().Attributes()) if value, ok := m.ResourceMetrics().At(0).Resource().Attributes().Get("com.splunk.index"); ok { index := value.AsString() if !contains(indices, index) { @@ -430,6 +527,82 @@ func contains(list []string, newValue string) bool { return false } +func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, int) { + var resourceAttributes []string + var notFoundCounter int = 0 + + for i := 0; i < len(logs); i++ { + l := logs[i] + for j := 0; j < l.ResourceLogs().Len(); j++ { + rl := l.ResourceLogs().At(j) + sl := rl.ScopeLogs().At(j) + for k := 0; k < sl.LogRecords().Len(); k++ { + tmpAttribute, ok := sl.LogRecords().At(k).Attributes().Get(attributeName) + if ok { + if !contains(resourceAttributes, tmpAttribute.AsString()) { + resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) + } + } else { + fmt.Println("== Resource Attribute not found: ", attributeName) + notFoundCounter++ + } + } + } + } + return resourceAttributes, notFoundCounter +} + +func getMetricsResourceAttribute(metrics []pmetric.Metrics, attributeName string) ([]string, int) { + var resourceAttributes []string + var notFoundCounter int = 0 + var foundCounter int = 0 + var skippedCounter int = 0 + prefixesForMetricsToSkip := []string{ + // agent metrics + "system.", "k8s.node.", + // cluster receiver metrics + "k8s.deployment.", "k8s.namespace.", "k8s.replicaset.", "k8s.daemonset.", "k8s.node.", + } + + for i := 0; i < len(metrics); i++ { + m := metrics[i] + for j := 0; j < m.ResourceMetrics().Len(); j++ { + rm := m.ResourceMetrics().At(j) + for k := 0; k < rm.ScopeMetrics().Len(); k++ { + sm := rm.ScopeMetrics().At(k) + for l := 0; l < sm.Metrics().Len(); l++ { + skip := false + for _, prefix := range prefixesForMetricsToSkip { + if strings.HasPrefix(sm.Metrics().At(l).Name(), prefix) { + skip = true + break + } + } + if skip { + skippedCounter++ + continue + } + for m := 0; m < sm.Metrics().At(l).Gauge().DataPoints().Len(); m++ { + tmpAttribute, ok := sm.Metrics().At(l).Gauge().DataPoints().At(m).Attributes().Get(attributeName) + + if ok { + if !contains(resourceAttributes, tmpAttribute.AsString()) { + resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) + } + foundCounter++ + } else { + fmt.Printf("Resource Attribute %s not found for metric: %v \n", attributeName, sm.Metrics().At(l).Name()) + notFoundCounter++ + } + } + } + } + } + } + fmt.Printf("Counters: Found: %d, Skipped: %d, not Found: %d\n", foundCounter, skippedCounter, notFoundCounter) + return resourceAttributes, notFoundCounter +} + func uninstallDeployment(t *testing.T) { testKubeConfig, setKubeConfig := os.LookupEnv("KUBECONFIG") require.True(t, setKubeConfig, "the environment variable KUBECONFIG must be set") diff --git a/functional_tests/testdata_configuration_switching/values/values_cluster_receiver_only.yaml.tmpl b/functional_tests/testdata_configuration_switching/values/values_cluster_receiver_only.yaml.tmpl new file mode 100644 index 0000000000..b5625cb975 --- /dev/null +++ b/functional_tests/testdata_configuration_switching/values/values_cluster_receiver_only.yaml.tmpl @@ -0,0 +1,26 @@ +--- +splunkPlatform: + token: foobar + endpoint: {{ .LogHecEndpoint }} + metricsEnabled: true + metricsIndex: myMetricsIndex + +agent: + enabled: false + +clusterReceiver: + enabled: {{ .ClusterReceiverEnabled }} + config: + exporters: + splunk_hec/platform_logs: + endpoint: {{ .LogObjectsHecEndpoint }} + splunk_hec/platform_metrics: + endpoint: {{ .MetricHecEndpoint }} + k8sObjects: + - name: pods + mode: pull + interval: 5s + - name: events + mode: watch + +clusterName: dev-operator From 2b891bf57a7517a4d65399d3e41370bda81b1fb8 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Mon, 13 Jan 2025 14:43:45 +0100 Subject: [PATCH 06/15] fix --- .../configuration_switching_test.go | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index 5b297a1bbe..779d039a72 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -535,16 +535,18 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, l := logs[i] for j := 0; j < l.ResourceLogs().Len(); j++ { rl := l.ResourceLogs().At(j) - sl := rl.ScopeLogs().At(j) - for k := 0; k < sl.LogRecords().Len(); k++ { - tmpAttribute, ok := sl.LogRecords().At(k).Attributes().Get(attributeName) - if ok { - if !contains(resourceAttributes, tmpAttribute.AsString()) { - resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) + for k := 0; k < rl.ScopeLogs().Len(); k++ { + sl := rl.ScopeLogs().At(k) + for m := 0; m < sl.LogRecords().Len(); m++ { + tmpAttribute, ok := sl.LogRecords().At(m).Attributes().Get(attributeName) + if ok { + if !contains(resourceAttributes, tmpAttribute.AsString()) { + resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) + } + } else { + fmt.Println("== Resource Attribute not found: ", attributeName) + notFoundCounter++ } - } else { - fmt.Println("== Resource Attribute not found: ", attributeName) - notFoundCounter++ } } } From ac38d643a21defad37a7c1f4db1282b3be6bfcf4 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Tue, 14 Jan 2025 13:58:21 +0100 Subject: [PATCH 07/15] env variables removed --- .../configuration_switching_test.go | 6 ++--- .../templates/config/_common.tpl | 23 +++++++++---------- .../_otel-k8s-cluster-receiver-config.tpl | 10 -------- .../deployment-cluster-receiver.yaml | 13 +++++++++++ 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index 779d039a72..f22738444f 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -349,7 +349,7 @@ func testClusterReceiverEnabledOrDisabled(t *testing.T) { } func testVerifyResourceAttributes(t *testing.T) { - attributesList := [4]string{"k8s.node.name", "k8s.pod.name", "k8s.pod.uid", "k8s.namespace.name"} + attributesList := [5]string{"k8s.node.name", "k8s.pod.name", "k8s.pod.uid", "k8s.namespace.name", "k8s.pod.ip"} hostEp := hostEndpoint(t) if len(hostEp) == 0 { @@ -367,7 +367,7 @@ func testVerifyResourceAttributes(t *testing.T) { } deployChartsAndApps(t, valuesFileName, replacements) resetLogsSink(t, logsObjectsConsumer) - waitForLogs(t, 5, logsObjectsConsumer) + waitForLogs(t, 10, logsObjectsConsumer) t.Logf("===> >>>> Logs: %v", len(logsObjectsConsumer.AllLogs())) for _, attr := range attributesList { @@ -563,7 +563,7 @@ func getMetricsResourceAttribute(metrics []pmetric.Metrics, attributeName string // agent metrics "system.", "k8s.node.", // cluster receiver metrics - "k8s.deployment.", "k8s.namespace.", "k8s.replicaset.", "k8s.daemonset.", "k8s.node.", + "k8s.deployment.", "k8s.namespace.", "k8s.replicaset.", "k8s.daemonset.", } for i := 0; i < len(metrics); i++ { diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 9e40a9206a..b5f2dabc7a 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -184,6 +184,7 @@ k8sattributes: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -226,6 +227,7 @@ k8sattributes/clusterReceiver: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -251,19 +253,16 @@ k8sattributes/metrics: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection extract: - metadata: [] + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.ip + - container.id + - container.image.name + - container.image.tag annotations: - key: splunk.com/sourcetype from: pod 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 index 183d65f771..f6f14047b4 100644 --- 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 @@ -73,7 +73,6 @@ receivers: {{- end }} processors: - {{- include "splunk-otel-collector.k8sClusterReceiverAttributesProcessor" . | nindent 2 }} {{- include "splunk-otel-collector.otelMemoryLimiterConfig" . | nindent 2 }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} @@ -132,15 +131,6 @@ processors: - action: insert key: k8s.node.name value: "${K8S_NODE_NAME}" - - action: insert - key: k8s.pod.name - value: "${K8S_POD_NAME}" - - action: insert - key: k8s.pod.uid - value: "${K8S_POD_UID}" - - action: insert - key: k8s.namespace.name - value: "${K8S_NAMESPACE}" resource: attributes: diff --git a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml index 108181e039..9beb096eac 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml @@ -91,6 +91,15 @@ spec: image: public.ecr.aws/amazonlinux/amazonlinux:latest imagePullPolicy: IfNotPresent command: ["bash", "-c", "/splunk-scripts/init-eks-fargate-cluster-receiver.sh"] + env: + - name: K8S_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: K8S_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName volumeMounts: - name: init-eks-fargate-cluster-receiver-script mountPath: /splunk-scripts @@ -123,6 +132,10 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "{{ include "splunk-otel-collector.convertMemToMib" $clusterReceiver.resources.limits.memory | int64 }}" + - name: K8S_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: From fd468492b2d1be0943d3ea09ca77deabb913c237 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Tue, 14 Jan 2025 14:05:12 +0100 Subject: [PATCH 08/15] pre-commit --- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/configmap-gateway.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../deployment-gateway.yaml | 2 +- .../configmap-cluster-receiver.yaml | 10 +--- .../deployment-cluster-receiver.yaml | 6 ++- .../rendered_manifests/configmap-gateway.yaml | 1 + .../deployment-gateway.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../default/rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 22 ++++----- .../configmap-cluster-receiver.yaml | 46 ++----------------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/configmap-gateway.yaml | 1 + .../deployment-cluster-receiver.yaml | 19 +------- .../deployment-gateway.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 22 ++++----- .../configmap-cluster-receiver.yaml | 46 ++----------------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 22 ++++----- .../configmap-cluster-receiver.yaml | 46 ++----------------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 22 ++++----- .../configmap-cluster-receiver.yaml | 46 ++----------------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- .../rendered_manifests/configmap-agent.yaml | 1 + .../configmap-cluster-receiver.yaml | 26 ----------- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 19 +------- 140 files changed, 167 insertions(+), 1438 deletions(-) diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml index 6b5d30f9d8..235cc54c5e 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml @@ -134,6 +134,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 5a0c87055e..9c9f583ed7 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e62f6ee4ef1ba1d8771d4056077ed10afe5d3bc6b4052980b2a7cc9f15a2bcdd + checksum/config: b208f1dbfe25d3d0868fc9abbff56e114925e1c925b731bec81165896d79f675 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml index 4e7af223a4..0e69eb1c19 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml @@ -83,6 +83,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 481f8df2f6..aca267ff80 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e8ae8de67a024a79ab31a0ac261fdb0c85fd63b509681242d93917bfc29b8a76 + checksum/config: 956cc5846c316e03adf372da704fe97be150b9d1ed4f406c316c99fbe002534c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml index a4d42d6f76..a89fb00997 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 3b4085d2ee..10e0d9eace 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 46b8ba55ad9b9c54254be9211b0396df3cd0d3a71dbc20fb3ba8893b6318ad88 + checksum/config: a8a17d34e94811972158654ce2c32889a49e06d7a04912bad4b66c866224346c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml index 94249f154d..ed359c6c6b 100644 --- a/examples/add-sampler/rendered_manifests/configmap-agent.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 5e21ce77ba..3e3f2a7fc3 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 4a6276e318600d9ea3e76c91b6670f201c626ba375a03af94eac9d8efcf71cdb + checksum/config: fd21c71811a6331e0d2bfbab6371861bdcad8ff638892862bd74fca9d9503fa2 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml index f66f46e4e3..35959c1221 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml @@ -101,6 +101,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 646b0deb1c..d0906d7238 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c22db802040791e7ed72c236060ae18ce39720b23c968d35bd6d8aac1fb07295 + checksum/config: fc335e6f677739994e0573ccb759e68e2863f71d6f0d3a5251c70d2299d70a46 kubectl.kubernetes.io/default-container: otel-collector sidecar.istio.io/inject: "false" spec: diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index d7d8f4d853..301a3e0610 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc sidecar.istio.io/inject: "false" spec: serviceAccountName: default-splunk-otel-collector @@ -51,23 +51,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml index 5ae71d8b50..4a10710993 100644 --- a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index d54237ebac..ec4db97a0e 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1d6330c88154a12a7ef72f47ff1fe38ad8ab08eb47f5116a2b16c13f735ade30 + checksum/config: ac4190a8b8a433eb92c661b0836745de0fc56f5abf03e284f8effc196a739c61 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml index a564047d4d..dbb27b77f4 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml @@ -67,6 +67,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml index fd9592869e..e87aebade7 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml @@ -73,6 +73,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 10f0384b7c..a079ea0d67 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: aa6f2aba1c3d388e69538aef580c1ab673bd1bbc263a1ecccb99a7cd76c2e25d + checksum/config: 3a297d0a4fdf88601cebab7b35b4937f8434e5d3b3f8d6311650736d99ad15ce kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index c4b183e39d..50d4f4db6e 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: a4f6cdac19856ea507be247f9656711d130956dc6e895c1a8c16512745ff68b5 + checksum/config: 5f9a13cc6baf2508f5d81381bf46816ea204d9c887bc1059395620400f0d23e4 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml index f6b9c8b7b0..d72a408c3e 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml @@ -43,6 +43,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -69,15 +70,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml index 4661f1c45d..ac9f050a2c 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 16eb789f621f6f691683ae1d9872e6221975434b8cafa68b14aa399c3d07f46e + checksum/config: 5c43884e2ea8e5eb15baf6a1d53d6224f4b681183fb4903e05560b2b2784e947 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -46,6 +46,10 @@ spec: env: - name: SPLUNK_MEMORY_TOTAL_MIB value: "500" + - name: K8S_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml index fd9592869e..e87aebade7 100644 --- a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml @@ -73,6 +73,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index a5930aa12c..1ccf6104f0 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: a4f6cdac19856ea507be247f9656711d130956dc6e895c1a8c16512745ff68b5 + checksum/config: 5f9a13cc6baf2508f5d81381bf46816ea204d9c887bc1059395620400f0d23e4 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml index 30b28594b3..8b79d37435 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml @@ -80,6 +80,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 6b2c75d5b9..c6f9b41659 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 71ea8369e9e1803325fc72bbcfcf4a28339570a0c421c74677a752722f8a5cb6 + checksum/config: 3f33d8b98ea30e5dd6a9cd19331395a826d2491d2f43dd117cc6950b058cb684 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml index 5ae71d8b50..4a10710993 100644 --- a/examples/crio-logging/rendered_manifests/configmap-agent.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index d54237ebac..ec4db97a0e 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1d6330c88154a12a7ef72f47ff1fe38ad8ab08eb47f5116a2b16c13f735ade30 + checksum/config: ac4190a8b8a433eb92c661b0836745de0fc56f5abf03e284f8effc196a739c61 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml index 5ae71d8b50..4a10710993 100644 --- a/examples/default/rendered_manifests/configmap-agent.yaml +++ b/examples/default/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index d54237ebac..ec4db97a0e 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1d6330c88154a12a7ef72f47ff1fe38ad8ab08eb47f5116a2b16c13f735ade30 + checksum/config: ac4190a8b8a433eb92c661b0836745de0fc56f5abf03e284f8effc196a739c61 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index 43afd2ee1f..96c2b2ad72 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -142,6 +142,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -173,24 +174,21 @@ data: - from: pod key: splunk.com/metricsIndex tag_name: com.splunk.index - metadata: [] + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.ip + - container.id + - container.image.name + - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml index 82b9a420b3..a7e196fae1 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,61 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: + k8sattributes/metrics: extract: annotations: - from: pod key: splunk.com/sourcetype - from: namespace - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index - from: pod - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index metadata: - k8s.namespace.name - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name - k8sattributes/metrics: - extract: - annotations: - - from: pod - key: splunk.com/sourcetype - - from: namespace - key: splunk.com/metricsIndex - tag_name: com.splunk.index - - from: pod - key: splunk.com/metricsIndex - tag_name: com.splunk.index - metadata: [] filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -118,15 +89,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index b3f2fbb34e..6f31b8ec86 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 8f13ff66652ba33fe2a9aee4c1a2e43517bfe12d57093be5d675ef515f537d78 + checksum/config: 985300eaa324e11cb82ec99f749d0610e00583aa2ceaf070dbb713298bfd5f65 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index a39fcbcba6..9b8c97d2b6 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 31057c8fa63ede3a8e48bce75a40865619cdd244a7cc16ade3471013072fb603 + checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml index 118fa48d35..12d37de355 100644 --- a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 436041b411..52a50c361a 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 231a2f6df986952c3f8bee10614bcf75037622f942563f3efdcbfc5a8e132f0a + checksum/config: a8fb132b68bf7b512759c58debba6c4f1f913255c98aa9885873c3154a3aef4f kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml index 7e7d51b3ea..4d1294041e 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml index 8287ee8204..e109780da8 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index a4e496a103..f688eea3b7 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: b77d2f4051fab7484cd75e4c622c11aabd72af22dbf6f63412ef41d5e312a87f + checksum/config: 4301389f252eb040f50af01b1e6b76f1b9bc7f0986c2fbb0fe0c46783ba5dfbc kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index fc277c4609..33d245d00f 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: a26a387d06f8d9ff63215cdd2e7762321b8c1e63734b2af49f80874f5bf641f9 + checksum/config: 5a8674b1e0b84a8ea92046e5629ec97a31646270d000ea120b320428b3de5e3b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml index 1db86e34e2..3f29f4a7e0 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml @@ -33,23 +33,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -66,15 +49,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml index a59b90aa2d..32461c3129 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml @@ -73,6 +73,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index 16aac9b303..20fb26da4f 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -33,7 +33,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 93de5553d98ca8c1308763682892e9d8f85066cd76192936be78510a08d5d4f2 + checksum/config: ba64d5794c98f49520e499acdf35038e51b942a110ca413237521ba30d8d0ddb spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -83,23 +83,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 75c867568c..a8df8a5b8a 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 40e24931c5e5d4fc49d32dc1e9bc073fcedd41116956babf3fdc8b4f0846881a + checksum/config: 0e9ecf5af518eeeb55d7f64b6cc27c40c627397621c8930f9bcaa85bd67e50b5 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml index 63ce89fe38..9e62c4db52 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml index 54375f2640..f425605bf6 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index d25a6dc150..0529b4c02d 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2c67fa0a01433844aaf5c723440d30f55c6c90dd05554e96e3a186279a3d603e + checksum/config: 5e8e55150456815c6bc5df8dc5ca033e2ebfac865533fa7f41ac98df9871df73 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index 8719f68e1f..6fc8de98ab 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f9a639dc73306fd666cd53308a3f5b491b20b70f2ff489b230d2f2a47731282a + checksum/config: de3377574ce253f387b35f84d271561ac719877b25225d330298c106c8f0978a spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml index 5a6bbd5597..fe1b9ebc77 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml index 262084bba9..18805285c1 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 1c47a441d4..4c03f4b8de 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e0fa06b0593a64c95a4cfcaf7516fab16808ac2985ac30f02d0549fff6cf6efc + checksum/config: a278b8b11a15a65d3f70302099b397ae073a964c873729eee3c8bdc21cd6980d kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index 5c04b932a8..136f743d6e 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: c79002621deb1b6a8c3d2fa7eeedb291558c59ad7c05d0e4ad9dd7dfd5e1050a + checksum/config: 22026e788cea38b9f776dfe315e9fec6ec78447a4bc1ff872a452e58de9f368b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml index 553533cdf4..716db751b7 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml index 262084bba9..18805285c1 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index af75da5288..45b8ecb6a8 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 747dcc2cf82c242f5c1e93afbe873cef0230ab630026acbef7afb4a170561fbf + checksum/config: dd8017baf0617a805f244474d5459b5f900c159ee3bc91f2c932893f32139a9c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index 5c04b932a8..136f743d6e 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: c79002621deb1b6a8c3d2fa7eeedb291558c59ad7c05d0e4ad9dd7dfd5e1050a + checksum/config: 22026e788cea38b9f776dfe315e9fec6ec78447a4bc1ff872a452e58de9f368b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml index 57a0685930..1fbf850ce0 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml index 9f6c7b2529..bfab6f5cfe 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 6bdee94e4d..807d5acab9 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5604b19093ef3a5f7d732fe88084dac041d662b8db54be49883e68edf05b61a5 + checksum/config: 8680f25194a0fd3340d05ab6250249fb0dc9f319f78d713dd12f0bc9aa9512f0 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index f278021c93..8c23bc01dd 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f3c1444fc4a52e438505dda39fbaa9efceb923cbc38be5ac2c3b0eb90d2aa38d + checksum/config: ca5d67937533f0ac8b794ac0232e456b870a2efc681081aefc11f18b36336471 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml index 72c2e450ee..ae6215fcc7 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml @@ -83,6 +83,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml index c2b8de6ae3..7ad483f111 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 11a62e36ce..9e1af2b112 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: fffa19a4586067f00cfbcf33346aeb74293292766d08dbe53c8beb8f447cb4fc + checksum/config: 6f0c3229a402eed23bc872823cfcae9f9d957e429a5b8433494a6d60afe7f7bc kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index 5a31e01661..ad9aaa4c97 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: beda1c4d66ee049ca6ac56a57faab5831c4108eb760853740bfe9782ceb235fb + checksum/config: 3245b019647802eac7ae613d0d310797c4dfaee9d73ffd8abe6337bdfc5802ad spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index 00024b666c..26d6d33250 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -142,6 +142,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -173,24 +174,21 @@ data: - from: pod key: splunk.com/metricsIndex tag_name: com.splunk.index - metadata: [] + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.ip + - container.id + - container.image.name + - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml index 82b9a420b3..a7e196fae1 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,61 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: + k8sattributes/metrics: extract: annotations: - from: pod key: splunk.com/sourcetype - from: namespace - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index - from: pod - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index metadata: - k8s.namespace.name - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name - k8sattributes/metrics: - extract: - annotations: - - from: pod - key: splunk.com/sourcetype - - from: namespace - key: splunk.com/metricsIndex - tag_name: com.splunk.index - - from: pod - key: splunk.com/metricsIndex - tag_name: com.splunk.index - metadata: [] filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -118,15 +89,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index a90d194015..f11faf3c01 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 7e28ba091fe865d050d7328d4484a25a517e3f7937d660ab8aca68b1f7206d21 + checksum/config: 510117b184c909cfb9abff8788bc0f7302fdc447bab27878d5bd7fed90382839 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index a39fcbcba6..9b8c97d2b6 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 31057c8fa63ede3a8e48bce75a40865619cdd244a7cc16ade3471013072fb603 + checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml index b621f10f6d..85651ac769 100644 --- a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 49e2166f94..806e2743f8 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 87ed5affb87edf7ca49ed750ba43eeb6ec9c15f1a30ff507640dbdc10a819d19 + checksum/config: 7b982b5afb7599e843ad31b139813ab4d93df3b4279813beafb175c9d037d1af kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml index 497310d936..59565cf0dd 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml @@ -76,6 +76,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index b390b7f0fe..4a8ab7f927 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 533c39b970ca066d32816a89883d8d71a47056cb8fb9e01c7f4a164e3dddc894 + checksum/config: 053f7c52ad35ee5aeb353ab9eb1073cf082920683f583221d8a048a6b1c245ca kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml index 43a565a8dc..b641cc58c5 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml @@ -91,6 +91,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index 3810c3ea12..eb543cf79b 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 294cef8c6d6f4ab7e9c2c92b02f377e8ede701cc0b7942fde18617b1c615684e + checksum/config: 30347d64851fee3fac6517d995c923ecf6901d0e1c387aee4d2264d693befbbe kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml index 43a565a8dc..b641cc58c5 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml @@ -91,6 +91,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index bb1942a30e..dd18a7a07e 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: cffb91393d44138edc979f79c33175a975444fb3a7ff92240498d76bf23da4e6 + checksum/config: f2f25f8f6e9ba1ff14bc22a9a78e25acdc5e5dad2c644fc0d9f8eaa17adeb306 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml index 99241178d7..b095fcbc5f 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml @@ -83,6 +83,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 750dcba98b..2afc92a6d4 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: bf49f549e45d83598b52121660f4cd179d3f97f0f71dab39bf412367b621d242 + checksum/config: 04d9c81fb25a1bb399ce6bc5294388283a694e4f3b3b530e2b6dae9b278d848a kubectl.kubernetes.io/default-container: otel-collector spec: dnsPolicy: ClusterFirstWithHostNet diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index f0c57db56d..0a80e1114b 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -52,23 +52,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index 64fecd53cd..1c2271f9fb 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -114,6 +114,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -145,24 +146,21 @@ data: - from: pod key: splunk.com/metricsIndex tag_name: com.splunk.index - metadata: [] + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.ip + - container.id + - container.image.name + - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 82b9a420b3..a7e196fae1 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,61 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: + k8sattributes/metrics: extract: annotations: - from: pod key: splunk.com/sourcetype - from: namespace - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index - from: pod - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index metadata: - k8s.namespace.name - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name - k8sattributes/metrics: - extract: - annotations: - - from: pod - key: splunk.com/sourcetype - - from: namespace - key: splunk.com/metricsIndex - tag_name: com.splunk.index - - from: pod - key: splunk.com/metricsIndex - tag_name: com.splunk.index - metadata: [] filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -118,15 +89,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index abe7bd8296..3025559885 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5b4ddaf2cc99de360060d11ef3f956eaf152f249d2aeb62cf477602745b4cea1 + checksum/config: f8c6d49e07bd737865bdb8549b295c9235e68ea713133c51179b4ba70af0d1d7 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index a39fcbcba6..9b8c97d2b6 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 31057c8fa63ede3a8e48bce75a40865619cdd244a7cc16ade3471013072fb603 + checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml index f9d4e24aa8..d0843a41e8 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml @@ -86,6 +86,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index c26559d2a2..a5a7864bc9 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: bdc593fc6bb963542e70636338e108d880db0730ef8e3c356df5925bcebb2af6 + checksum/config: c3b6ebdfe6c671bf5c2df7368f4f6adc7c6140c50a8c9d50d0026096e13782f8 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml index a16075a822..c608b620dd 100644 --- a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml @@ -78,6 +78,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index ddc1d1eadb..a3dc6b8e95 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 7ae5eac37faee22fb3d54332696ec32e0ee7c02cf20a5a4e7665d26bfbfc5a2c + checksum/config: a4830f01c2864db00a32b9f0f870cf371755e83a8e3d51996c8de83fb308debb kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml index 1c4de8c501..435c896616 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml @@ -78,6 +78,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 0731bbf288..93af283404 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c32110f203c813ed884597ecfa98f6337945e80cf154d1a66dd84232c74d1508 + checksum/config: c8f886e78e7cfbd9aa86b50797de6ae96858c85f7864c263ca14cc865c25d790 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index 4501f48092..e53c17fa04 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -87,6 +87,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag @@ -118,24 +119,21 @@ data: - from: pod key: splunk.com/metricsIndex tag_name: com.splunk.index - metadata: [] + metadata: + - k8s.namespace.name + - k8s.node.name + - k8s.pod.name + - k8s.pod.uid + - k8s.pod.ip + - container.id + - container.image.name + - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml index 82b9a420b3..a7e196fae1 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -47,61 +47,32 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: + k8sattributes/metrics: extract: annotations: - from: pod key: splunk.com/sourcetype - from: namespace - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index - from: pod - key: splunk.com/index + key: splunk.com/metricsIndex tag_name: com.splunk.index metadata: - k8s.namespace.name - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name - k8sattributes/metrics: - extract: - annotations: - - from: pod - key: splunk.com/sourcetype - - from: namespace - key: splunk.com/metricsIndex - tag_name: com.splunk.index - - from: pod - key: splunk.com/metricsIndex - tag_name: com.splunk.index - metadata: [] filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name - - sources: - - from: resource_attribute - name: k8s.pod.uid - - sources: - - from: resource_attribute - name: k8s.pod.ip - - sources: - - from: resource_attribute - name: ip - - sources: - - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -118,15 +89,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 386aeb8542..1b37106c66 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1d48c12fc0681c6793c2c6e581e5199248d33a81165761431e28cc813cecd5c5 + checksum/config: d3c057f48749f6578aac4521b00e6d0881a68372751f8477fb64d7fcc6860567 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index a39fcbcba6..9b8c97d2b6 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 31057c8fa63ede3a8e48bce75a40865619cdd244a7cc16ade3471013072fb603 + checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: diff --git a/examples/only-metrics/rendered_manifests/configmap-agent.yaml b/examples/only-metrics/rendered_manifests/configmap-agent.yaml index b94daee3a9..79ef5b13bb 100644 --- a/examples/only-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-agent.yaml @@ -70,6 +70,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index b834592e03..fb93eb508e 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 25993deedb3b21f8c07058cba61cb0cf7bde34473b48c7e3d2dca615b5eed460 + checksum/config: c4c54713a76c98f25c0dfdcd3b5b5131b46ead2b5ae3462f7d7ca1b285e752ba kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/only-traces/rendered_manifests/configmap-agent.yaml b/examples/only-traces/rendered_manifests/configmap-agent.yaml index 42f943d054..386bb2dc40 100644 --- a/examples/only-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/only-traces/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index fb70e0ba2e..df30ff7a71 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2c176facdef5a9c1b642a71cc7608bd30d1ff2bd95ee138a8b2ef96a72c385bd + checksum/config: 406f2962be109053ea92f86453d3f3b2176cd415b2064b7e1278eae289ee205d kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml index d4c86481d6..90d131e414 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml @@ -79,6 +79,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml index 8bf930b1fc..b4371f3b10 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 3dc54a8c6e..334a0dd6ad 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2b6cf7100cf13fc7b91055f8f32720a6999caf9ece7f6c834d21204ab80c02bd + checksum/config: 31bdb10860a5e309a609e8dcfb0329959e03e9891dd5d4ec9cfe383e71ce9bdd kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index 3c47cff735..fd9a2e9a2d 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 54fc5cd7eeb294eed3f035509cb18d352a86accf13563cdc91e49f2d527d523d + checksum/config: 7904504039d68640ded05e10c60fbe12330ea074b4868c3c8d9cabcfdde3dc23 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/secret-validation/rendered_manifests/configmap-agent.yaml b/examples/secret-validation/rendered_manifests/configmap-agent.yaml index 88210f8e41..5298c0eb03 100644 --- a/examples/secret-validation/rendered_manifests/configmap-agent.yaml +++ b/examples/secret-validation/rendered_manifests/configmap-agent.yaml @@ -78,6 +78,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index e979cb9098..c909eb18ea 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 6c57b882104f758c1b708ac9ee4f5e5bd133faeb8594957b7b1baacbf6d37e98 + checksum/config: c6abc46905165da5796b4ad7d86a2877830d92d4c15bc6a9cdc4dc0c923310cb kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml index f623ce8602..6f7acb675e 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml @@ -90,6 +90,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 0d6ba0129b..4f5234a4f1 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 3a45f718a21ebacf0c0c7d5d892d43e4cf761adc81e7f6eba5a9e2c6b466fb4e + checksum/config: d24d0912448f32771f92780d85939657f1fa33f3f6edba3f8f3a20835583ccc0 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/target-allocator/rendered_manifests/configmap-agent.yaml b/examples/target-allocator/rendered_manifests/configmap-agent.yaml index cf3ae3f816..39292e0135 100644 --- a/examples/target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 00d9ae358a..535543e82b 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5a020b1268df244ba36936ae8f5f0d3e64c0f804979402c47d071f94b1066d7e + checksum/config: 770438a87afc5e7e5c4f691decad8e19fdd7377bf34269b2b8ab6fe1d878c916 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/use-proxy/rendered_manifests/configmap-agent.yaml b/examples/use-proxy/rendered_manifests/configmap-agent.yaml index 5ae71d8b50..4a10710993 100644 --- a/examples/use-proxy/rendered_manifests/configmap-agent.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 16ee8848c2..e950c8aa5f 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1d6330c88154a12a7ef72f47ff1fe38ad8ab08eb47f5116a2b16c13f735ade30 + checksum/config: ac4190a8b8a433eb92c661b0836745de0fc56f5abf03e284f8effc196a739c61 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index f9d5cf2e57..cf66cdcea8 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: diff --git a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml index f644d782ea..f040198e76 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml @@ -75,6 +75,7 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid + - k8s.pod.ip - container.id - container.image.name - container.image.tag diff --git a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index 770447f850..428f39f653 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -30,23 +30,6 @@ data: processors: batch: send_batch_max_size: 32768 - k8sattributes/clusterReceiver: - extract: - metadata: - - k8s.namespace.name - - k8s.node.name - - k8s.pod.name - - k8s.pod.uid - - container.id - - container.image.name - - container.image.tag - pod_association: - - sources: - - from: resource_attribute - name: k8s.namespace.name - - sources: - - from: resource_attribute - name: k8s.node.name memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} @@ -63,15 +46,6 @@ data: - action: insert key: k8s.node.name value: ${K8S_NODE_NAME} - - action: insert - key: k8s.pod.name - value: ${K8S_POD_NAME} - - action: insert - key: k8s.pod.uid - value: ${K8S_POD_UID} - - action: insert - key: k8s.namespace.name - value: ${K8S_NAMESPACE} resource/k8s_cluster: attributes: - action: insert diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 5ed25e80b2..f63253703e 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 134b3c49173c0d6dfac367908b7792d171d61a6547407cdb1a37102577920b30 + checksum/config: d8dccf5f58fb545beb9ff714ade5cf8ecce6356d61c2eba5bf8195782a65e5b6 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index 256cfb0041..a5f84cc6c9 100644 --- a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21 + checksum/config: facd436383b82db1d6ec2c833eea2c53bed34336bb80812b606ff16107f95afc spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -50,23 +50,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: K8S_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: From 002c62f1267d4fe2f1bdd7aa1aed24efbf849822 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Tue, 14 Jan 2025 14:22:57 +0100 Subject: [PATCH 09/15] adding changelog --- ...removing-not-needed-environmental-variables.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .chloggen/refactoring-removing-not-needed-environmental-variables.yaml diff --git a/.chloggen/refactoring-removing-not-needed-environmental-variables.yaml b/.chloggen/refactoring-removing-not-needed-environmental-variables.yaml new file mode 100644 index 0000000000..8a59c6ac5b --- /dev/null +++ b/.chloggen/refactoring-removing-not-needed-environmental-variables.yaml @@ -0,0 +1,13 @@ +# 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, operator, chart, other) +component: clusterReceiver +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: clusterReceiver refactor by removing unnecessary environmental variables after introducing the k8sAttributesProcessor to clusterReceiver, and improve the configuration for the metrics k8sAttributesProcessor + +# One or more tracking issues related to the change +issues: [] +# (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: From bb77737b4a066ae1f14eae6a5c25f4b1a58d4aa7 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Tue, 14 Jan 2025 15:04:03 +0100 Subject: [PATCH 10/15] minor changes --- functional_tests/configuration_switching_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index f22738444f..2a5de2a684 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -530,6 +530,7 @@ func contains(list []string, newValue string) bool { func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, int) { var resourceAttributes []string var notFoundCounter int = 0 + var foundCounter int = 0 for i := 0; i < len(logs); i++ { l := logs[i] @@ -543,6 +544,7 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, if !contains(resourceAttributes, tmpAttribute.AsString()) { resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) } + foundCounter++ } else { fmt.Println("== Resource Attribute not found: ", attributeName) notFoundCounter++ @@ -551,6 +553,7 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, } } } + fmt.Printf("Counters: Found: %d | Not Found: %d\n", foundCounter, notFoundCounter) return resourceAttributes, notFoundCounter } @@ -601,7 +604,7 @@ func getMetricsResourceAttribute(metrics []pmetric.Metrics, attributeName string } } } - fmt.Printf("Counters: Found: %d, Skipped: %d, not Found: %d\n", foundCounter, skippedCounter, notFoundCounter) + fmt.Printf("Counters: Found: %d | Skipped: %d | Not Found: %d\n", foundCounter, skippedCounter, notFoundCounter) return resourceAttributes, notFoundCounter } From 688ced2fe8315ba9fcb4ea5b5be9d8bd7c5870cf Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Wed, 15 Jan 2025 14:20:58 +0100 Subject: [PATCH 11/15] adjustments for metrics --- functional_tests/configuration_switching_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index 2a5de2a684..f1b7fef749 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -349,7 +349,7 @@ func testClusterReceiverEnabledOrDisabled(t *testing.T) { } func testVerifyResourceAttributes(t *testing.T) { - attributesList := [5]string{"k8s.node.name", "k8s.pod.name", "k8s.pod.uid", "k8s.namespace.name", "k8s.pod.ip"} + attributesList := [4]string{"k8s.node.name", "k8s.pod.name", "k8s.pod.uid", "k8s.namespace.name"} //"k8s.pod.ip", hostEp := hostEndpoint(t) if len(hostEp) == 0 { @@ -547,6 +547,7 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, foundCounter++ } else { fmt.Println("== Resource Attribute not found: ", attributeName) + fmt.Printf("Log Record Body: %v\n", sl.LogRecords().At(m).Body().AsRaw()) notFoundCounter++ } } From a59d44b3248dbfe59c9fa883f82fa8cd0bed28bf Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Wed, 15 Jan 2025 15:50:16 +0100 Subject: [PATCH 12/15] minor improvements --- functional_tests/configuration_switching_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index 779d039a72..3d48badfa7 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -530,6 +530,7 @@ func contains(list []string, newValue string) bool { func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, int) { var resourceAttributes []string var notFoundCounter int = 0 + var foundCounter int = 0 for i := 0; i < len(logs); i++ { l := logs[i] @@ -543,14 +544,17 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, if !contains(resourceAttributes, tmpAttribute.AsString()) { resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) } + foundCounter++ } else { fmt.Println("== Resource Attribute not found: ", attributeName) + fmt.Printf("Log Record Body: %v\n", sl.LogRecords().At(m).Body().AsRaw()) notFoundCounter++ } } } } } + fmt.Printf("Counters: Found: %d | Not Found: %d\n", foundCounter, notFoundCounter) return resourceAttributes, notFoundCounter } @@ -563,7 +567,7 @@ func getMetricsResourceAttribute(metrics []pmetric.Metrics, attributeName string // agent metrics "system.", "k8s.node.", // cluster receiver metrics - "k8s.deployment.", "k8s.namespace.", "k8s.replicaset.", "k8s.daemonset.", "k8s.node.", + "k8s.deployment.", "k8s.namespace.", "k8s.replicaset.", "k8s.daemonset.", } for i := 0; i < len(metrics); i++ { @@ -601,7 +605,7 @@ func getMetricsResourceAttribute(metrics []pmetric.Metrics, attributeName string } } } - fmt.Printf("Counters: Found: %d, Skipped: %d, not Found: %d\n", foundCounter, skippedCounter, notFoundCounter) + fmt.Printf("Counters: Found: %d | Skipped: %d | Not Found: %d\n", foundCounter, skippedCounter, notFoundCounter) return resourceAttributes, notFoundCounter } From 1d580b57df3e7e3dd0cad1326f5570b756079f98 Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Wed, 15 Jan 2025 16:09:29 +0100 Subject: [PATCH 13/15] changes after review - renaming resourceAttributes -> attributes, etc --- .../configuration_switching_test.go | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/functional_tests/configuration_switching_test.go b/functional_tests/configuration_switching_test.go index 3d48badfa7..908f2ead20 100644 --- a/functional_tests/configuration_switching_test.go +++ b/functional_tests/configuration_switching_test.go @@ -180,7 +180,7 @@ func Test_Functions(t *testing.T) { t.Run("agent logs and metrics enabled or disabled", testAgentLogsAndMetrics) t.Run("logs and metrics index switch", testIndexSwitch) t.Run("cluster receiver enabled or disabled", testClusterReceiverEnabledOrDisabled) - t.Run("resource attributes verification", testVerifyResourceAttributes) + t.Run("logs and metrics attributes verification", testVerifyLogsAndMetricsAttributes) } @@ -348,7 +348,7 @@ func testClusterReceiverEnabledOrDisabled(t *testing.T) { resetLogsSink(t, logsObjectsConsumer) } -func testVerifyResourceAttributes(t *testing.T) { +func testVerifyLogsAndMetricsAttributes(t *testing.T) { attributesList := [4]string{"k8s.node.name", "k8s.pod.name", "k8s.pod.uid", "k8s.namespace.name"} hostEp := hostEndpoint(t) @@ -356,7 +356,7 @@ func testVerifyResourceAttributes(t *testing.T) { require.Fail(t, "Host endpoint not found") } - t.Run("verify cluster receiver resource attributes", func(t *testing.T) { + t.Run("verify cluster receiver attributes", func(t *testing.T) { valuesFileName := "values_cluster_receiver_only.yaml.tmpl" logsObjectsConsumer := setupOnce(t).logsObjectsConsumer logsObjectsHecEndpoint := fmt.Sprintf("http://%s:%d/services/collector", hostEp, hecLogsObjectsReceiverPort) @@ -371,15 +371,15 @@ func testVerifyResourceAttributes(t *testing.T) { t.Logf("===> >>>> Logs: %v", len(logsObjectsConsumer.AllLogs())) for _, attr := range attributesList { - t.Log("Checking resourceAttribute: ", attr) - resourceAttrValues, notFoundCounter := getLogsResourceAttribute(logsObjectsConsumer.AllLogs(), attr) - assert.True(t, len(resourceAttrValues) >= 1) + t.Log("Checking attribute: ", attr) + attrValues, notFoundCounter := getLogsAttributes(logsObjectsConsumer.AllLogs(), attr) + assert.True(t, len(attrValues) >= 1) assert.Equal(t, 0, notFoundCounter) - t.Logf("Resource Attributes: %v", resourceAttrValues) + t.Logf("Attributes: %v", attrValues) } }) - t.Run("verify cluster receiver metrics resource attributes", func(t *testing.T) { + t.Run("verify cluster receiver metrics attributes", func(t *testing.T) { valuesFileName := "values_cluster_receiver_only.yaml.tmpl" hecMetricsConsumer := setupOnce(t).hecMetricsConsumer logsObjectsHecEndpoint := fmt.Sprintf("http://%s:%d/services/collector", hostEp, hecLogsObjectsReceiverPort) @@ -390,19 +390,19 @@ func testVerifyResourceAttributes(t *testing.T) { } deployChartsAndApps(t, valuesFileName, replacements) resetMetricsSink(t, hecMetricsConsumer) - t.Logf("===> >>>> Metrics: %v", len(hecMetricsConsumer.AllMetrics())) + t.Logf("===> >>>> Metrics: %d", len(hecMetricsConsumer.AllMetrics())) waitForMetrics(t, 5, hecMetricsConsumer) for _, attr := range attributesList { - t.Log("Checking resourceAttribute: ", attr) - resourceAttrValues, notFoundCounter := getMetricsResourceAttribute(hecMetricsConsumer.AllMetrics(), attr) - assert.True(t, len(resourceAttrValues) >= 1) + t.Log("Checking attributes: ", attr) + attrValues, notFoundCounter := getMetricsAttributes(hecMetricsConsumer.AllMetrics(), attr) + assert.True(t, len(attrValues) >= 1) assert.Equal(t, 0, notFoundCounter) - t.Logf("Resource Attributes for %s: %v", attr, resourceAttrValues) + t.Logf("Resource Attributes for %s: %v", attr, attrValues) } }) - t.Run("verify agent logs resource attributes", func(t *testing.T) { + t.Run("verify agent logs attributes", func(t *testing.T) { valuesFileName := "values_logs_and_metrics_switching.yaml.tmpl" agentLogsConsumer := setupOnce(t).logsConsumer @@ -415,15 +415,15 @@ func testVerifyResourceAttributes(t *testing.T) { waitForLogs(t, 5, agentLogsConsumer) for _, attr := range attributesList { - t.Log("Checking resourceAttribute: ", attr) - resourceAttrValues, notFoundCounter := getLogsResourceAttribute(agentLogsConsumer.AllLogs(), attr) - assert.True(t, len(resourceAttrValues) >= 1) + t.Log("Checking attribute: ", attr) + attrValues, notFoundCounter := getLogsAttributes(agentLogsConsumer.AllLogs(), attr) + assert.True(t, len(attrValues) >= 1) assert.Equal(t, 0, notFoundCounter) - t.Logf("Resource Attributes: %v", resourceAttrValues) + t.Logf("Attributes: %v", attrValues) } }) - t.Run("verify metrics resource attributes", func(t *testing.T) { + t.Run("verify metrics attributes", func(t *testing.T) { valuesFileName := "values_logs_and_metrics_switching.yaml.tmpl" hecMetricsConsumer := setupOnce(t).hecMetricsConsumer @@ -436,11 +436,11 @@ func testVerifyResourceAttributes(t *testing.T) { waitForMetrics(t, 5, hecMetricsConsumer) for _, attr := range attributesList { - t.Log("Checking resourceAttribute: ", attr) - resourceAttrValues, notFoundCounter := getMetricsResourceAttribute(hecMetricsConsumer.AllMetrics(), attr) - assert.True(t, len(resourceAttrValues) >= 1) + t.Log("Checking attribute: ", attr) + attrValues, notFoundCounter := getMetricsAttributes(hecMetricsConsumer.AllMetrics(), attr) + assert.True(t, len(attrValues) >= 1) assert.Equal(t, 0, notFoundCounter) - t.Logf("Resource Attributes for %s: %v", attr, resourceAttrValues) + t.Logf("Attributes for %s: %v", attr, attrValues) } }) } @@ -527,8 +527,8 @@ func contains(list []string, newValue string) bool { return false } -func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, int) { - var resourceAttributes []string +func getLogsAttributes(logs []plog.Logs, attributeName string) ([]string, int) { + var attributes []string var notFoundCounter int = 0 var foundCounter int = 0 @@ -541,12 +541,12 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, for m := 0; m < sl.LogRecords().Len(); m++ { tmpAttribute, ok := sl.LogRecords().At(m).Attributes().Get(attributeName) if ok { - if !contains(resourceAttributes, tmpAttribute.AsString()) { - resourceAttributes = append(resourceAttributes, tmpAttribute.AsString()) + if !contains(attributes, tmpAttribute.AsString()) { + attributes = append(attributes, tmpAttribute.AsString()) } foundCounter++ } else { - fmt.Println("== Resource Attribute not found: ", attributeName) + fmt.Println("=== Attribute not found: ", attributeName) fmt.Printf("Log Record Body: %v\n", sl.LogRecords().At(m).Body().AsRaw()) notFoundCounter++ } @@ -555,10 +555,10 @@ func getLogsResourceAttribute(logs []plog.Logs, attributeName string) ([]string, } } fmt.Printf("Counters: Found: %d | Not Found: %d\n", foundCounter, notFoundCounter) - return resourceAttributes, notFoundCounter + return attributes, notFoundCounter } -func getMetricsResourceAttribute(metrics []pmetric.Metrics, attributeName string) ([]string, int) { +func getMetricsAttributes(metrics []pmetric.Metrics, attributeName string) ([]string, int) { var resourceAttributes []string var notFoundCounter int = 0 var foundCounter int = 0 From dead8f4e45bc2c54670ffdf5cad8faa0327e753c Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Thu, 16 Jan 2025 14:22:50 +0100 Subject: [PATCH 14/15] fixing functional test --- .../expected_cluster_receiver.yaml | 11 ++++++++++- .../templates/config/_common.tpl | 15 +++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/functional_tests/testdata/expected_kind_values/expected_cluster_receiver.yaml b/functional_tests/testdata/expected_kind_values/expected_cluster_receiver.yaml index 10ec768cdd..fde6e7cc75 100644 --- a/functional_tests/testdata/expected_kind_values/expected_cluster_receiver.yaml +++ b/functional_tests/testdata/expected_kind_values/expected_cluster_receiver.yaml @@ -6054,12 +6054,21 @@ resourceMetrics: - key: k8s.cluster.name value: stringValue: dev-operator + - key: k8s.namespace.name + value: + stringValue: default - key: k8s.node.name value: stringValue: kind-control-plane - key: k8s.node.uid value: - stringValue: 15985013-7564-45b7-a2ae-3b5f5d9b93e5 + stringValue: 30cea3fc-191d-4891-ad80-7aea7a5bfef2 + - key: k8s.pod.name + value: + stringValue: dotnet-test-6f6d54979f-lfcqx + - key: k8s.pod.uid + value: + stringValue: 85bd538b-5c34-4c4a-80e5-7c3a9c29340a - key: metric_source value: stringValue: kubernetes diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index b5f2dabc7a..d6876e6bea 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -253,16 +253,23 @@ k8sattributes/metrics: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection extract: metadata: - k8s.namespace.name - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag annotations: - key: splunk.com/sourcetype from: pod From 91d932b08a853942ed563f7f23698d9618b8729e Mon Sep 17 00:00:00 2001 From: Pawel Szkamruk Date: Thu, 16 Jan 2025 14:25:59 +0100 Subject: [PATCH 15/15] pre-commit --- .../rendered_manifests/configmap-agent.yaml | 15 +++++++++++---- .../configmap-cluster-receiver.yaml | 15 +++++++++++---- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 15 +++++++++++---- .../configmap-cluster-receiver.yaml | 15 +++++++++++---- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 15 +++++++++++---- .../configmap-cluster-receiver.yaml | 15 +++++++++++---- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 15 +++++++++++---- .../configmap-cluster-receiver.yaml | 15 +++++++++++---- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- 16 files changed, 96 insertions(+), 40 deletions(-) diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index 96c2b2ad72..7239ad4aba 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -179,16 +179,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml index a7e196fae1..7e898a6834 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -63,16 +63,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 6f31b8ec86..8d7a9d5188 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 985300eaa324e11cb82ec99f749d0610e00583aa2ceaf070dbb713298bfd5f65 + checksum/config: dbb447ecc8d9bf95ee011a35906548d3b58e88e42d61efd3a94a44e152f39768 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index 9b8c97d2b6..d300e30d7e 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 + checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index 26d6d33250..9d202fd3d3 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -179,16 +179,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml index a7e196fae1..7e898a6834 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -63,16 +63,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index f11faf3c01..8048478ea4 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 510117b184c909cfb9abff8788bc0f7302fdc447bab27878d5bd7fed90382839 + checksum/config: 0c1013410d53ac7cc1f90719366a1562a0140defefb8efa233d69d2eccca6418 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index 9b8c97d2b6..d300e30d7e 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 + checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index 1c2271f9fb..952eac9287 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -151,16 +151,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index a7e196fae1..7e898a6834 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -63,16 +63,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 3025559885..103377e34f 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: f8c6d49e07bd737865bdb8549b295c9235e68ea713133c51179b4ba70af0d1d7 + checksum/config: 12412a236b479470b533fb9014d9e385372f1b4a8c901fee20aa05c1f7ce5625 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 9b8c97d2b6..d300e30d7e 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 + checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index e53c17fa04..77aab6935e 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -124,16 +124,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml index a7e196fae1..7e898a6834 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -63,16 +63,23 @@ data: - k8s.node.name - k8s.pod.name - k8s.pod.uid - - k8s.pod.ip - - container.id - - container.image.name - - container.image.tag filter: node_from_env_var: K8S_NODE_NAME pod_association: - sources: - from: resource_attribute name: k8s.node.name + - sources: + - from: resource_attribute + name: k8s.pod.uid + - sources: + - from: resource_attribute + name: k8s.pod.ip + - sources: + - from: resource_attribute + name: ip + - sources: + - from: connection memory_limiter: check_interval: 2s limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB} diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 1b37106c66..bdc98c1fbd 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: d3c057f48749f6578aac4521b00e6d0881a68372751f8477fb64d7fcc6860567 + checksum/config: 9c68190812a8e47027c6a79dfd115802f0c62795b9eb33fb3f15530c9a2ac4a1 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index 9b8c97d2b6..d300e30d7e 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: debc148d8c27723655252d88670fc21b4a010b7ebb30039ce4230d0e9756c6a7 + checksum/config: 8c6ebb0ea6eacabcf206597ecc3ecc8a6f7bf93d8e696bc8616aa6e08b4664ed spec: serviceAccountName: default-splunk-otel-collector nodeSelector: