diff --git a/CHANGELOG.md b/CHANGELOG.md index 3791ad284..af3f4b960 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added - Add initContainer for log checkpoint migration from Fluentd to Otel agent (#253) +- Add index routing for Splunk Enterprise/Cloud customers (#256) ## [0.37.0] - 2021-10-26 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 b00cd8280..efcdc1043 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -276,6 +276,12 @@ processors: - key: splunk.com/exclude tag_name: splunk.com/exclude from: pod + - key: splunk.com/index + tag_name: com.splunk.index + from: namespace + - key: splunk.com/index + tag_name: com.splunk.index + from: pod {{- with .Values.extraAttributes.podLabels }} labels: {{- range . }} 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 c02006e09..46c59ada4 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -59,6 +59,12 @@ processors: - key: splunk.com/exclude tag_name: splunk.com/exclude from: pod + - key: splunk.com/index + tag_name: com.splunk.index + from: namespace + - key: splunk.com/index + tag_name: com.splunk.index + from: pod {{- with .Values.extraAttributes.podLabels }} labels: {{- range . }} diff --git a/rendered/manifests/agent-only/configmap-otel-agent.yaml b/rendered/manifests/agent-only/configmap-otel-agent.yaml index f3d635e9a..8066ce758 100644 --- a/rendered/manifests/agent-only/configmap-otel-agent.yaml +++ b/rendered/manifests/agent-only/configmap-otel-agent.yaml @@ -67,6 +67,12 @@ data: - from: pod key: splunk.com/exclude tag_name: splunk.com/exclude + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index labels: - key: app metadata: diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml index db5900b56..4db250127 100644 --- a/rendered/manifests/agent-only/daemonset.yaml +++ b/rendered/manifests/agent-only/daemonset.yaml @@ -28,7 +28,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 4ffcd6ad374bf3453a1bbfb00e3e479e5a7cf02fccda7ff775f910c4a5bbd14b + checksum/config: 20a1fd3f41ceed15707bd33502fd3f75ce1597d18af73ce912f4f439897ce980 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/rendered/manifests/gateway-only/configmap-otel-collector.yaml b/rendered/manifests/gateway-only/configmap-otel-collector.yaml index db274066b..3e31f1b85 100644 --- a/rendered/manifests/gateway-only/configmap-otel-collector.yaml +++ b/rendered/manifests/gateway-only/configmap-otel-collector.yaml @@ -54,6 +54,12 @@ data: - from: pod key: splunk.com/exclude tag_name: splunk.com/exclude + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index labels: - key: app metadata: diff --git a/rendered/manifests/gateway-only/deployment-collector.yaml b/rendered/manifests/gateway-only/deployment-collector.yaml index bdb972118..40e532c4e 100644 --- a/rendered/manifests/gateway-only/deployment-collector.yaml +++ b/rendered/manifests/gateway-only/deployment-collector.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 2963fe3886378456d19ca16255af597ead8a8107b61963c01031eed94a136639 + checksum/config: 6ddfa38dbe4dd50fd0ff81ab32a4119f9f886f0477d838bfdc89ae6af06dbd16 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/rendered/manifests/logs-only/configmap-otel-agent.yaml b/rendered/manifests/logs-only/configmap-otel-agent.yaml index 5d4face78..31e1e2990 100644 --- a/rendered/manifests/logs-only/configmap-otel-agent.yaml +++ b/rendered/manifests/logs-only/configmap-otel-agent.yaml @@ -64,6 +64,12 @@ data: - from: pod key: splunk.com/exclude tag_name: splunk.com/exclude + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index labels: - key: app metadata: diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml index 41eda12ff..48e8fdca9 100644 --- a/rendered/manifests/logs-only/daemonset.yaml +++ b/rendered/manifests/logs-only/daemonset.yaml @@ -28,7 +28,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 4328d5df45de1880b436838f5094a78a57b3bb464a6615053a5569acf2b963fb + checksum/config: 983ef6fe97ebf7e114e7702c2bbd0ba72194b668994a283d9fccef9bc9f559c9 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/rendered/manifests/metrics-only/configmap-otel-agent.yaml b/rendered/manifests/metrics-only/configmap-otel-agent.yaml index cef4dbc81..a8d0f8663 100644 --- a/rendered/manifests/metrics-only/configmap-otel-agent.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-agent.yaml @@ -61,6 +61,12 @@ data: - from: pod key: splunk.com/exclude tag_name: splunk.com/exclude + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index labels: - key: app metadata: diff --git a/rendered/manifests/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/daemonset.yaml index 35f93bdfa..9622be8b8 100644 --- a/rendered/manifests/metrics-only/daemonset.yaml +++ b/rendered/manifests/metrics-only/daemonset.yaml @@ -27,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 9c3e9e1d077cd5b6a4bbdf19c15b2a819cfeb0403e4d6c7e67f71d401b25df79 + checksum/config: 8c07d464239d90650b529646b44d241718a1dea4767be5c805ebde25e5b8ea42 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/rendered/manifests/traces-only/configmap-otel-agent.yaml b/rendered/manifests/traces-only/configmap-otel-agent.yaml index ef9dfe453..f9753e58b 100644 --- a/rendered/manifests/traces-only/configmap-otel-agent.yaml +++ b/rendered/manifests/traces-only/configmap-otel-agent.yaml @@ -64,6 +64,12 @@ data: - from: pod key: splunk.com/exclude tag_name: splunk.com/exclude + - from: namespace + key: splunk.com/index + tag_name: com.splunk.index + - from: pod + key: splunk.com/index + tag_name: com.splunk.index labels: - key: app metadata: diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index 55385fadf..9f605e92a 100644 --- a/rendered/manifests/traces-only/daemonset.yaml +++ b/rendered/manifests/traces-only/daemonset.yaml @@ -27,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: f13bd43848f30b76fe54b1069cc94749703ae49e278d4f875281d1f6ea85d8f0 + checksum/config: bdfe44006ba069e4375ed1dda455e6e3ce606f9cbbe0b1492c2a51706e12eb31 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true