From 3b0a2cb2c8b9c94e9ce702c5453fcf884b88b0b7 Mon Sep 17 00:00:00 2001 From: mstopa-splunk Date: Wed, 7 Aug 2024 14:20:31 +0000 Subject: [PATCH 1/9] Fix sourcetype annotation for metrics --- .../splunk-otel-collector/templates/config/_common.tpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 3dcbd2b989..12dbe6d289 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -233,7 +233,11 @@ k8sattributes/metrics: extract: metadata: [] annotations: - - key: splunk.com/sourcetype + - key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype + from: namespace + - key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype from: pod - key: splunk.com/metricsIndex tag_name: com.splunk.index From e31b53e71a9138c9e868826c9ab106a0c99df53c Mon Sep 17 00:00:00 2001 From: mstopa-splunk Date: Thu, 8 Aug 2024 08:20:55 +0000 Subject: [PATCH 2/9] Update .chloggen, examples and tests --- .chloggen/fixmetricssourcetypeannotation.yaml | 12 +++++++++++ docs/advanced-configuration.md | 3 ++- .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../configmap-cluster-receiver.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../configmap-cluster-receiver.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../configmap-cluster-receiver.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 6 +++++- .../configmap-cluster-receiver.yaml | 6 +++++- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- test/k8s_logging_tests/test_config_logging.py | 21 +++++++++++++++++++ test/test_setup.yaml | 1 + 20 files changed, 84 insertions(+), 17 deletions(-) create mode 100644 .chloggen/fixmetricssourcetypeannotation.yaml diff --git a/.chloggen/fixmetricssourcetypeannotation.yaml b/.chloggen/fixmetricssourcetypeannotation.yaml new file mode 100644 index 0000000000..96a189e4d6 --- /dev/null +++ b/.chloggen/fixmetricssourcetypeannotation.yaml @@ -0,0 +1,12 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: other +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixed updating metrics' sourcetype with annotations +# 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: diff --git a/docs/advanced-configuration.md b/docs/advanced-configuration.md index 1414f28efb..c0d1b0eb70 100644 --- a/docs/advanced-configuration.md +++ b/docs/advanced-configuration.md @@ -563,7 +563,8 @@ Manage Splunk OTel Collector Logging with these supported annotations. * Filter logs using pod and/or namespace annotation * If `logsCollection.containers.useSplunkIncludeAnnotation` is `false` (default: false), set `splunk.com/exclude` annotation to `true` on pod and/or namespace to exclude its logs from ingested. * If `logsCollection.containers.useSplunkIncludeAnnotation` is `true` (default: false), set `splunk.com/include` annotation to `true` on pod and/or namespace to only include its logs from ingested. All other logs will be ignored. -* Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME`. +* Use `splunk.com/sourcetype` annotation on pod to overwrite logs' `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME`. +* Use `splunk.com/metricsSourceType` annotation on namespace to update metrics' default sourcetype. ### Performance of native OpenTelemetry logs collection 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 a262548509..79ed13e9bf 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -159,8 +159,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index 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 73bef45b81..23e1f9bd98 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 @@ -50,8 +50,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 75ca7e4a29..2e1c8e9100 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: 612ba872d694afbafd3444952b6efde9d7815eda4ccaf37f1aa2dfdb620836bf + checksum/config: 756210895e6da4166bac31faf70c70ea24ff50222bcea1bbb9d09dd3c1286e75 kubectl.kubernetes.io/default-container: otel-collector container.apparmor.security.beta.kubernetes.io/otel-collector: unconfined spec: 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 1d263c2dae..3b51a9303c 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: 7d5472cfd0b31ede1de1c7c2c115a41346ccf9ad2318bca6c7a5c43d4fcdf806 + checksum/config: 6e22e0b836cb9fbdd6b029b87f5c89b3c3d1e7f3efdd385eb5d39b8f447e7180 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 a3f88ed4c1..6380cfa030 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -159,8 +159,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index 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 73bef45b81..23e1f9bd98 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,8 +50,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index af0564d390..17f50571dc 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: 405a28e02408d4b5a2c389fb67d2aacb46c986b58d3206f8ec1ac22222a22bf1 + checksum/config: 40d46b9c743b79422053b1d1ae96c6c7a2bc7256aac6782808f3daf1413b2452 kubectl.kubernetes.io/default-container: otel-collector container.apparmor.security.beta.kubernetes.io/otel-collector: unconfined spec: 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 1d263c2dae..3b51a9303c 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: 7d5472cfd0b31ede1de1c7c2c115a41346ccf9ad2318bca6c7a5c43d4fcdf806 + checksum/config: 6e22e0b836cb9fbdd6b029b87f5c89b3c3d1e7f3efdd385eb5d39b8f447e7180 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 a38955743d..94c5a6fbc7 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -131,8 +131,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 73bef45b81..23e1f9bd98 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,8 +50,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 2aac3fde4b..0582765ea7 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: c742abedac5c9f8b7d6d4421a0707f64dda0b320dd3e4e30d0956f4b68bac284 + checksum/config: 4cf071b9d4ccf12145f67e0249646f40aee7ffb9a8daa316191e40982792cc3d kubectl.kubernetes.io/default-container: otel-collector container.apparmor.security.beta.kubernetes.io/otel-collector: unconfined spec: diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 1d263c2dae..3b51a9303c 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: 7d5472cfd0b31ede1de1c7c2c115a41346ccf9ad2318bca6c7a5c43d4fcdf806 + checksum/config: 6e22e0b836cb9fbdd6b029b87f5c89b3c3d1e7f3efdd385eb5d39b8f447e7180 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 fa23fd7c50..81672fa920 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -104,8 +104,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index 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 73bef45b81..23e1f9bd98 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,8 +50,12 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/sourcetype + key: splunk.com/metricsSourceType + tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex tag_name: com.splunk.index diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 83db96a049..972e3a6a5b 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: aba0e9159605718310d082e54f59d4e6adef6278712522d63cb9d223adc317fb + checksum/config: 8170f6f672a6c93c1db9d3b5d3123c11c55f0b2b94310311b302ff08fc0ab55f kubectl.kubernetes.io/default-container: otel-collector container.apparmor.security.beta.kubernetes.io/otel-collector: unconfined spec: 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 1d263c2dae..3b51a9303c 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: 7d5472cfd0b31ede1de1c7c2c115a41346ccf9ad2318bca6c7a5c43d4fcdf806 + checksum/config: 6e22e0b836cb9fbdd6b029b87f5c89b3c3d1e7f3efdd385eb5d39b8f447e7180 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/test/k8s_logging_tests/test_config_logging.py b/test/k8s_logging_tests/test_config_logging.py index ed83846c4c..f17fba67dc 100644 --- a/test/k8s_logging_tests/test_config_logging.py +++ b/test/k8s_logging_tests/test_config_logging.py @@ -81,3 +81,24 @@ def test_metric_index_from_annotations(setup, index, expected): logger.info("Splunk received %s events in the last minute", len(events)) assert len(events) >= expected + +@pytest.mark.parametrize("index,sourcetype,expected", [ + ("test_metrics", "test:metrics", 1) +]) +def test_metric_sourcetype_from_annotations(setup, index, sourcetype, expected): + + ''' + Test that metrics are being assigned the "test:metrics" sourcetype, as defined by splunk.com/metricsSourceType annotation added during setup + ''' + logger.info("testing for metrics index={0} sourcetype={1} expected={2} event(s)".format(index, sourcetype, expected)) + search_query = "index={0} filter=\"sourcetype={1}\"".format(index, sourcetype) + + events = check_events_from_splunk(start_time="-1h@h", + url=setup["splunkd_url"], + user=setup["splunk_user"], + query=["mpreview {0}".format( + search_query)], + password=setup["splunk_password"]) + logger.info("Splunk received %s events in the last minute", + len(events)) + assert len(events) >= expected \ No newline at end of file diff --git a/test/test_setup.yaml b/test/test_setup.yaml index 82434fa2d4..5aa02cae95 100644 --- a/test/test_setup.yaml +++ b/test/test_setup.yaml @@ -26,6 +26,7 @@ metadata: name: default annotations: splunk.com/metricsIndex: test_metrics + splunk.com/metricsSourceType: test:metrics --- apiVersion: batch/v1 kind: Job From 46cb97b642974b57ad04c0e62723d98266d613ca Mon Sep 17 00:00:00 2001 From: mstopa-splunk <139441697+mstopa-splunk@users.noreply.github.com> Date: Fri, 9 Aug 2024 11:48:12 +0200 Subject: [PATCH 3/9] Update fixmetricssourcetypeannotation.yaml --- .chloggen/fixmetricssourcetypeannotation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/fixmetricssourcetypeannotation.yaml b/.chloggen/fixmetricssourcetypeannotation.yaml index 96a189e4d6..a7f31d1de7 100644 --- a/.chloggen/fixmetricssourcetypeannotation.yaml +++ b/.chloggen/fixmetricssourcetypeannotation.yaml @@ -3,7 +3,7 @@ change_type: bug_fix # The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) component: other # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fixed updating metrics' sourcetype with annotations +note: Fixed updating metrics' sourcetype with annotations # One or more tracking issues related to the change issues: [] # (Optional) One or more lines of additional information to render under the primary note. From 52c5ee01e0a3f9d62430ab46eefac93276ced5fd Mon Sep 17 00:00:00 2001 From: mstopa-splunk Date: Mon, 16 Sep 2024 09:06:38 +0000 Subject: [PATCH 4/9] Remove metricsSourceType for sourcetype --- docs/advanced-configuration.md | 3 +-- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- examples/multi-metrics/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../only-metrics-platform/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- test/k8s_logging_tests/test_config_logging.py | 4 ++-- test/test_setup.yaml | 1 - 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/advanced-configuration.md b/docs/advanced-configuration.md index c0d1b0eb70..c738ea52d1 100644 --- a/docs/advanced-configuration.md +++ b/docs/advanced-configuration.md @@ -563,8 +563,7 @@ Manage Splunk OTel Collector Logging with these supported annotations. * Filter logs using pod and/or namespace annotation * If `logsCollection.containers.useSplunkIncludeAnnotation` is `false` (default: false), set `splunk.com/exclude` annotation to `true` on pod and/or namespace to exclude its logs from ingested. * If `logsCollection.containers.useSplunkIncludeAnnotation` is `true` (default: false), set `splunk.com/include` annotation to `true` on pod and/or namespace to only include its logs from ingested. All other logs will be ignored. -* Use `splunk.com/sourcetype` annotation on pod to overwrite logs' `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME`. -* Use `splunk.com/metricsSourceType` annotation on namespace to update metrics' default sourcetype. +* Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME` for logs and defaults to "httpevent" for metrics. ### Performance of native OpenTelemetry logs collection diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index dc62fee354..9731991e87 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: 068897d39969e321b5a814179eddd2f7f737785ba8ff107c45979bcd2a1e788b + checksum/config: 6dc98d4dc6eb08cbb248c38bbf1a27c67a31693fe85a8505f8b8ebb15b0139ff 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 99507a4891..f341b0b490 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: b5bdd9198d04f9a84b31a870e0f69c61f29a28dc2af003c2682db0d92a951d11 + checksum/config: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index f0f3baba8c..6eae2f2be6 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: 05ef4a80e4010dc707c37364538d5fa1caea6e4ec70e47d40b05d4854604d02a + checksum/config: 1b64bdb5fe01862c864abd1a5773a6e8f9bef79a8d64eeb44a8a5464e0e9c482 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 99507a4891..f341b0b490 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: b5bdd9198d04f9a84b31a870e0f69c61f29a28dc2af003c2682db0d92a951d11 + checksum/config: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 9c7bf0ad66..73d83c6f21 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: 5fe75d65f83fde093bd36e84d7176c1ed4887c3ce0516aceaf06a25f367ac88f + checksum/config: 3b1af577b38a0ccfcad5da9eed57e316357b3915d621d188840dfea3fd439ca7 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 99507a4891..f341b0b490 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: b5bdd9198d04f9a84b31a870e0f69c61f29a28dc2af003c2682db0d92a951d11 + checksum/config: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index b9ba7fa89b..be04333a96 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: c1d5086a46b85ca0828c7fdd4d35e1b421db0eedbb9ac7b525ebb1a87262f77a + checksum/config: 2a8346e9b2a75b557b3a12f81d16c7800c2bbf3f82fba28c601a780b9eb33749 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 99507a4891..f341b0b490 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: b5bdd9198d04f9a84b31a870e0f69c61f29a28dc2af003c2682db0d92a951d11 + checksum/config: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/test/k8s_logging_tests/test_config_logging.py b/test/k8s_logging_tests/test_config_logging.py index f17fba67dc..9b1ee48e8d 100644 --- a/test/k8s_logging_tests/test_config_logging.py +++ b/test/k8s_logging_tests/test_config_logging.py @@ -83,12 +83,12 @@ def test_metric_index_from_annotations(setup, index, expected): assert len(events) >= expected @pytest.mark.parametrize("index,sourcetype,expected", [ - ("test_metrics", "test:metrics", 1) + ("test_metrics", "sourcetype-anno", 1) ]) def test_metric_sourcetype_from_annotations(setup, index, sourcetype, expected): ''' - Test that metrics are being assigned the "test:metrics" sourcetype, as defined by splunk.com/metricsSourceType annotation added during setup + Test that metrics are being assigned the "sourcetype-anno" sourcetype, as defined by splunk.com/sourcetype annotation added during setup ''' logger.info("testing for metrics index={0} sourcetype={1} expected={2} event(s)".format(index, sourcetype, expected)) search_query = "index={0} filter=\"sourcetype={1}\"".format(index, sourcetype) diff --git a/test/test_setup.yaml b/test/test_setup.yaml index 5aa02cae95..82434fa2d4 100644 --- a/test/test_setup.yaml +++ b/test/test_setup.yaml @@ -26,7 +26,6 @@ metadata: name: default annotations: splunk.com/metricsIndex: test_metrics - splunk.com/metricsSourceType: test:metrics --- apiVersion: batch/v1 kind: Job From 127c2116bfefec7dd500f2a72110a33ce28b3ef3 Mon Sep 17 00:00:00 2001 From: mstopa-splunk Date: Mon, 16 Sep 2024 09:16:03 +0000 Subject: [PATCH 5/9] Remove metricsSourceType for sourcetype --- .../rendered_manifests/configmap-agent.yaml | 5 +---- .../rendered_manifests/configmap-cluster-receiver.yaml | 5 +---- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 5 +---- .../rendered_manifests/configmap-cluster-receiver.yaml | 5 +---- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../multi-metrics/rendered_manifests/configmap-agent.yaml | 5 +---- .../rendered_manifests/configmap-cluster-receiver.yaml | 5 +---- examples/multi-metrics/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 5 +---- .../rendered_manifests/configmap-cluster-receiver.yaml | 5 +---- .../only-metrics-platform/rendered_manifests/daemonset.yaml | 2 +- 15 files changed, 15 insertions(+), 39 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 1607c69c1a..a03fe6ac56 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -159,11 +159,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex 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 8019bbb92c..c6a663b852 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 @@ -50,11 +50,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 9731991e87..99c291bcd2 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: 6dc98d4dc6eb08cbb248c38bbf1a27c67a31693fe85a8505f8b8ebb15b0139ff + checksum/config: 475f8c97681a13e8e30986fdc3baa71eee05a2f3e066c29e0777080a9a8a87c0 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 f341b0b490..fe946f9ebb 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: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 + checksum/config: c238a58b0c8c81f81b1497dcff8d795a79788d35ee239ffafb7ad4f58dc6b09e 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 d75f0bb9a8..d72b36ebc4 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -159,11 +159,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex 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 8019bbb92c..c6a663b852 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,11 +50,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index 6eae2f2be6..7b5619dfcd 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: 1b64bdb5fe01862c864abd1a5773a6e8f9bef79a8d64eeb44a8a5464e0e9c482 + checksum/config: f1e5fbd7c1b4136ebec743dd00fa834dcb9d6d78c37eed30cff72e4fc0efe22c 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 f341b0b490..fe946f9ebb 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: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 + checksum/config: c238a58b0c8c81f81b1497dcff8d795a79788d35ee239ffafb7ad4f58dc6b09e 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 7a6210ec3e..a61b04de09 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -131,11 +131,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 8019bbb92c..c6a663b852 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,11 +50,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 73d83c6f21..59404ee95f 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: 3b1af577b38a0ccfcad5da9eed57e316357b3915d621d188840dfea3fd439ca7 + checksum/config: 96af0d7f6f9dba3b552802d25ca1356f443c35bb3a34492873f004325a1c9fb4 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 f341b0b490..fe946f9ebb 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: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 + checksum/config: c238a58b0c8c81f81b1497dcff8d795a79788d35ee239ffafb7ad4f58dc6b09e 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 67ef588ae4..385dda26a0 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -104,11 +104,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex 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 8019bbb92c..c6a663b852 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,11 +50,8 @@ data: k8sattributes/metrics: extract: annotations: - - from: namespace - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: pod - key: splunk.com/metricsSourceType + key: splunk.com/sourcetype tag_name: com.splunk.sourcetype - from: namespace key: splunk.com/metricsIndex diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index be04333a96..0efe599b38 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: 2a8346e9b2a75b557b3a12f81d16c7800c2bbf3f82fba28c601a780b9eb33749 + checksum/config: ca910388e71a4073e6934a02abfb92b7c2b25a1be94dd1dc902759dd1f6d0aeb kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true From ffa3a20bed00a67f1255b43d1776bc3b03db362d Mon Sep 17 00:00:00 2001 From: mstopa-splunk Date: Mon, 16 Sep 2024 09:16:28 +0000 Subject: [PATCH 6/9] Remove metricsSourceType for sourcetype --- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../splunk-otel-collector/templates/config/_common.tpl | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 f341b0b490..fe946f9ebb 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: 81a30ab8d8f836c45f200676533baba17d97e5fd424ddc6d6b92bfcce76f9d46 + checksum/config: c238a58b0c8c81f81b1497dcff8d795a79788d35ee239ffafb7ad4f58dc6b09e spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index ec1361b8e3..5e6635b66b 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -233,10 +233,7 @@ k8sattributes/metrics: extract: metadata: [] annotations: - - key: splunk.com/metricsSourceType - tag_name: com.splunk.sourcetype - from: namespace - - key: splunk.com/metricsSourceType + - key: splunk.com/sourcetype tag_name: com.splunk.sourcetype from: pod - key: splunk.com/metricsIndex From 19b586dfd20e2e5f4fe177069a1b7ccfab06ab87 Mon Sep 17 00:00:00 2001 From: Maciek Stopa Date: Tue, 7 Jan 2025 11:35:58 +0000 Subject: [PATCH 7/9] Implement code review suggestions --- .chloggen/fixmetricssourcetypeannotation.yaml | 2 +- docs/advanced-configuration.md | 3 ++- .../rendered_manifests/configmap-agent.yaml | 3 +++ .../configmap-cluster-receiver.yaml | 3 +++ .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 3 +++ .../configmap-cluster-receiver.yaml | 3 +++ .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 3 +++ .../configmap-cluster-receiver.yaml | 3 +++ .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 3 +++ .../configmap-cluster-receiver.yaml | 3 +++ .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../templates/config/_common.tpl | 24 ++++++++++++++++--- .../templates/config/_otel-agent.tpl | 9 +++++++ .../templates/config/_otel-collector.tpl | 9 +++++++ .../_otel-k8s-cluster-receiver-config.tpl | 12 ++++++++++ test/test_setup.yaml | 1 + 23 files changed, 87 insertions(+), 13 deletions(-) diff --git a/.chloggen/fixmetricssourcetypeannotation.yaml b/.chloggen/fixmetricssourcetypeannotation.yaml index a7f31d1de7..85a1c37fc6 100644 --- a/.chloggen/fixmetricssourcetypeannotation.yaml +++ b/.chloggen/fixmetricssourcetypeannotation.yaml @@ -5,7 +5,7 @@ component: other # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). note: Fixed updating metrics' sourcetype with annotations # One or more tracking issues related to the change -issues: [] +issues: [1375] # (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. diff --git a/docs/advanced-configuration.md b/docs/advanced-configuration.md index c16cf15f4f..7c555f178e 100644 --- a/docs/advanced-configuration.md +++ b/docs/advanced-configuration.md @@ -564,7 +564,8 @@ Manage Splunk OTel Collector Logging with these supported annotations. * Filter logs using pod and/or namespace annotation * If `logsCollection.containers.useSplunkIncludeAnnotation` is `false` (default: false), set `splunk.com/exclude` annotation to `true` on pod and/or namespace to exclude its logs from ingested. * If `logsCollection.containers.useSplunkIncludeAnnotation` is `true` (default: false), set `splunk.com/include` annotation to `true` on pod and/or namespace to only include its logs from ingested. All other logs will be ignored. -* Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME` for logs and defaults to "httpevent" for metrics. +* For logs, use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME`. +* For metrics, use the `splunk.com/sourcetype` annotation on the namespace to override the sourcetype field. If not set, it defaults to `httpevent`. ### Performance of native OpenTelemetry logs collection 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 3cd681076d..57b31106d7 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -165,6 +165,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype 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 08ca70f273..7b89f46ffe 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 @@ -50,6 +50,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index b3f2fbb34e..eb1632fae7 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: 8cf566b711b895e8209d8c055fc25b2245e74abe84743cf64655a07cb78fee92 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..97d49e26a4 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: 130873286d49dc56b755805d556b3094fcb6696ce4e9326408389c58942d46db 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 66b408a401..887cc626b5 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -165,6 +165,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype 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 08ca70f273..7b89f46ffe 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,6 +50,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index a90d194015..e2a6044fff 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: 07fe1f32f371cae54b4ed702d65fd1a60a134f0c4d8b66dcfec1eb81ed1907bc 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..97d49e26a4 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: 130873286d49dc56b755805d556b3094fcb6696ce4e9326408389c58942d46db 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 3fc8c55f88..332bc8a97e 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -137,6 +137,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 08ca70f273..7b89f46ffe 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,6 +50,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index abe7bd8296..0c79cc9b63 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: 03163bd786efbdb0c43d07cb64eb17cf6cd9595af1c5db2ccf2c4c84615a2dfb 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..97d49e26a4 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: 130873286d49dc56b755805d556b3094fcb6696ce4e9326408389c58942d46db 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 18aca72b33..d0c7df2ac4 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -110,6 +110,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype 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 08ca70f273..7b89f46ffe 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -50,6 +50,9 @@ data: k8sattributes/metrics: extract: annotations: + - from: namespace + key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype - from: pod key: splunk.com/sourcetype tag_name: com.splunk.sourcetype diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 386aeb8542..fc8119acfe 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: c3dbc1971b6dfeee15734ef1758d5b78e03f60fa6ce35f5d58b4df90ea71c24d 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..97d49e26a4 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: 130873286d49dc56b755805d556b3094fcb6696ce4e9326408389c58942d46db spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index fd709415d2..1409739c36 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -232,6 +232,10 @@ k8sattributes/clusterReceiver: {{- if eq (include "splunk-otel-collector.splunkPlatformEnabled" .) "true"}} annotations: - key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype + from: namespace + - key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype from: pod - key: splunk.com/index tag_name: com.splunk.index @@ -265,6 +269,9 @@ k8sattributes/metrics: extract: metadata: [] annotations: + - key: splunk.com/sourcetype + tag_name: com.splunk.sourcetype + from: namespace - key: splunk.com/sourcetype tag_name: com.splunk.sourcetype from: pod @@ -339,6 +346,20 @@ resource/logs: {{- end }} {{- end }} +{{/* +Resource processor for metrics manipulations +*/}} +{{- define "splunk-otel-collector.resourceMetricsProcessor" -}} +resource/metrics: + attributes: + {{- if .Values.splunkPlatform.sourcetype }} + # Insert the sourcetype value from values.yaml if it has not already been set through annotations. + - key: com.splunk.sourcetype + value: "{{.Values.splunkPlatform.sourcetype }}" + action: insert + {{- end }} +{{- end }} + {{/* The transform processor adds service.name attribute to logs the same way as it's done by istio for the generated traces https://github.com/istio/istio/blob/6237cb4e63cf9a332327cc0a815d6b46257e6f8a/pkg/config/analysis/analyzers/testdata/common/sidecar-injector-configmap.yaml#L110-L115 @@ -436,9 +457,6 @@ splunk_hec/platform_metrics: token: "${SPLUNK_PLATFORM_HEC_TOKEN}" index: {{ .Values.splunkPlatform.metricsIndex | quote }} source: {{ .Values.splunkPlatform.source | quote }} - {{- if .Values.splunkPlatform.sourcetype }} - sourcetype: {{ .Values.splunkPlatform.sourcetype | quote }} - {{- end }} max_idle_conns: {{ .Values.splunkPlatform.maxConnections }} max_idle_conns_per_host: {{ .Values.splunkPlatform.maxConnections }} disable_compression: {{ .Values.splunkPlatform.disableCompression }} diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl index 501cb27717..b069d45a05 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -648,6 +648,9 @@ processors: {{- include "splunk-otel-collector.k8sAttributesSplunkPlatformMetrics" . | nindent 2 }} filter: node_from_env_var: K8S_NODE_NAME + {{- if .Values.splunkPlatform.sourcetype }} + {{- include "splunk-otel-collector.resourceMetricsProcessor" . | nindent 2 }} + {{- end }} {{- end }} {{- if eq .Values.logsEngine "fluentd" }} @@ -1026,6 +1029,9 @@ service: {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} exporters: {{- if $gatewayEnabled }} @@ -1052,6 +1058,9 @@ service: - resource {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} exporters: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl index 16a31b00c6..682df4a33f 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -33,6 +33,9 @@ processors: {{- include "splunk-otel-collector.k8sAttributesSplunkPlatformMetrics" . | nindent 2 }} filter: node_from_env_var: K8S_NODE_NAME + {{- if .Values.splunkPlatform.sourcetype }} + {{- include "splunk-otel-collector.resourceMetricsProcessor" . | nindent 2 }} + {{- end }} {{- end }} {{- include "splunk-otel-collector.resourceLogsProcessor" . | nindent 2 }} @@ -207,6 +210,9 @@ service: {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} exporters: {{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }} @@ -261,6 +267,9 @@ service: {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} exporters: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} 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 56df2992e5..3286ba7dab 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 @@ -79,6 +79,9 @@ processors: {{- include "splunk-otel-collector.k8sAttributesSplunkPlatformMetrics" . | nindent 2 }} filter: node_from_env_var: K8S_NODE_NAME + {{- if .Values.splunkPlatform.sourcetype }} + {{- include "splunk-otel-collector.resourceMetricsProcessor" . | nindent 2 }} + {{- end }} {{- end }} batch: @@ -237,6 +240,9 @@ service: - resource {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} - resource/k8s_cluster exporters: @@ -259,6 +265,9 @@ service: - resource {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} exporters: {{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }} @@ -280,6 +289,9 @@ service: - resource {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }} - k8sattributes/metrics + {{- if .Values.splunkPlatform.sourcetype }} + - resource/metrics + {{- end }} {{- end }} exporters: {{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }} diff --git a/test/test_setup.yaml b/test/test_setup.yaml index 82434fa2d4..ce45e8446d 100644 --- a/test/test_setup.yaml +++ b/test/test_setup.yaml @@ -26,6 +26,7 @@ metadata: name: default annotations: splunk.com/metricsIndex: test_metrics + splunk.com/sourcetype: sourcetype-anno --- apiVersion: batch/v1 kind: Job From 175321bc7f712d3c939b0c5693d01f1bbc4cf36f Mon Sep 17 00:00:00 2001 From: Maciek Stopa Date: Wed, 12 Mar 2025 17:02:56 +0000 Subject: [PATCH 8/9] re-render examples --- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../enable-persistence-queue/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- examples/multi-metrics/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../only-metrics-platform/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 6d0876b4ae..6ae1371e99 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: 2ec1c7329487d2d512b428c60b4250ab94617daac606d6743bf55d1d12ba4612 + checksum/config: e2dd00b071f073e9a34cf91692e448859d2411b6cc37c8aef56e01ec66a7f241 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 b591c9d641..21b5802142 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: bc14c64fe9c32c4096cd0e0df15b75d79d168de86101cd6805367a5acc1333c3 + checksum/config: 28e46c5046b15065a3b498e52faef708337d402885225a0de09f290a9e1da1e9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index ccdf4a18e1..6c5ea2121e 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: f9c882714a6a5086b2f406ad5bd7bc97e6e101d22dc24632acbcbd3985d32e0f + checksum/config: 65e1add475e3e56be5f06e7396676f3488a53f49569179de7e8c56f300eaa2a7 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 b591c9d641..21b5802142 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: bc14c64fe9c32c4096cd0e0df15b75d79d168de86101cd6805367a5acc1333c3 + checksum/config: 28e46c5046b15065a3b498e52faef708337d402885225a0de09f290a9e1da1e9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index e78e242d3a..bc1783e699 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: 30b7626f53600444b8fd92d896123901004a4070e673276e68046fbf33149280 + checksum/config: 8745d73647576685177b6fbd0d78c980ad9113d44a008f9414cc8ab4adddff3d 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 b591c9d641..21b5802142 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: bc14c64fe9c32c4096cd0e0df15b75d79d168de86101cd6805367a5acc1333c3 + checksum/config: 28e46c5046b15065a3b498e52faef708337d402885225a0de09f290a9e1da1e9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 4d2c324377..253b5fd941 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: d54094aac0f8b04d578e2d8ba3b5a5dcda52b09208458de4e9ea58a942dc6355 + checksum/config: c977b9304cb278d5df51904fe83364224322d0b2a033bf0b718f86ccb45b6d3e 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 b591c9d641..21b5802142 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: bc14c64fe9c32c4096cd0e0df15b75d79d168de86101cd6805367a5acc1333c3 + checksum/config: 28e46c5046b15065a3b498e52faef708337d402885225a0de09f290a9e1da1e9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: From 8e1ec6249cf65cc29f2d408b903fe592caaf1bc9 Mon Sep 17 00:00:00 2001 From: Maciek Stopa Date: Mon, 17 Mar 2025 16:37:18 +0000 Subject: [PATCH 9/9] Remove unnecessary if clause --- helm-charts/splunk-otel-collector/templates/config/_common.tpl | 2 -- 1 file changed, 2 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 079d5884c6..40ce7d58c0 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -355,12 +355,10 @@ Resource processor for metrics manipulations {{- define "splunk-otel-collector.resourceMetricsProcessor" -}} resource/metrics: attributes: - {{- if .Values.splunkPlatform.sourcetype }} # Insert the sourcetype value from values.yaml if it has not already been set through annotations. - key: com.splunk.sourcetype value: "{{.Values.splunkPlatform.sourcetype }}" action: insert - {{- end }} {{- end }} {{/*