From 84a7da3fa1bada6cbb52fdcc5edd78c06829c23d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 9 Jul 2021 17:21:17 -0700 Subject: [PATCH] Fix generation of service.name log attribute in istio environment Istio has an involved logic for generating service name for traces. So we cannot just rely on "app" pod label. This commit adds the same logic to generate service.name logs attribute as istio uses for traces. It's needed to make correlation between logs and traces work OOTB in Splunk o11y suite. --- CHANGELOG.md | 6 ++++++ helm-charts/splunk-otel-collector/Chart.yaml | 2 +- .../templates/configmap-fluentd.yaml | 19 ++++++++++++++----- .../manifests/agent-only/clusterRole.yaml | 2 +- .../agent-only/clusterRoleBinding.yaml | 2 +- .../agent-only/configmap-fluentd-cri.yaml | 2 +- .../agent-only/configmap-fluentd-json.yaml | 2 +- .../agent-only/configmap-fluentd.yaml | 3 ++- .../agent-only/configmap-otel-agent.yaml | 2 +- .../configmap-otel-k8s-cluster-receiver.yaml | 2 +- rendered/manifests/agent-only/daemonset.yaml | 4 ++-- .../deployment-k8s-cluster-receiver.yaml | 4 ++-- rendered/manifests/agent-only/secret.yaml | 2 +- .../manifests/agent-only/serviceAccount.yaml | 2 +- .../manifests/gateway-only/clusterRole.yaml | 2 +- .../gateway-only/clusterRoleBinding.yaml | 2 +- .../configmap-otel-collector.yaml | 2 +- .../gateway-only/deployment-collector.yaml | 4 ++-- rendered/manifests/gateway-only/secret.yaml | 2 +- rendered/manifests/gateway-only/service.yaml | 2 +- .../gateway-only/serviceAccount.yaml | 2 +- rendered/manifests/logs-only/clusterRole.yaml | 2 +- .../logs-only/clusterRoleBinding.yaml | 2 +- .../logs-only/configmap-fluentd-cri.yaml | 2 +- .../logs-only/configmap-fluentd-json.yaml | 2 +- .../logs-only/configmap-fluentd.yaml | 3 ++- .../logs-only/configmap-otel-agent.yaml | 2 +- rendered/manifests/logs-only/daemonset.yaml | 4 ++-- rendered/manifests/logs-only/secret.yaml | 2 +- .../manifests/logs-only/serviceAccount.yaml | 2 +- .../manifests/metrics-only/clusterRole.yaml | 2 +- .../metrics-only/clusterRoleBinding.yaml | 2 +- .../metrics-only/configmap-otel-agent.yaml | 2 +- .../configmap-otel-k8s-cluster-receiver.yaml | 2 +- .../manifests/metrics-only/daemonset.yaml | 4 ++-- .../deployment-k8s-cluster-receiver.yaml | 4 ++-- rendered/manifests/metrics-only/secret.yaml | 2 +- .../metrics-only/serviceAccount.yaml | 2 +- .../manifests/traces-only/clusterRole.yaml | 2 +- .../traces-only/clusterRoleBinding.yaml | 2 +- .../traces-only/configmap-otel-agent.yaml | 2 +- rendered/manifests/traces-only/daemonset.yaml | 4 ++-- rendered/manifests/traces-only/secret.yaml | 2 +- .../manifests/traces-only/serviceAccount.yaml | 2 +- 44 files changed, 71 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d24ed85e3b..6f33db4010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +## [0.29.1] - 2021-07-08 + +### Fixed + +- Fix generation of service.name log attribute in istio environment (#176) + ## [0.29.0] - 2021-07-08 ### Changed diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml index 13a2e4b618..e4b0bce557 100644 --- a/helm-charts/splunk-otel-collector/Chart.yaml +++ b/helm-charts/splunk-otel-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: splunk-otel-collector -version: 0.29.0 +version: 0.29.1 description: Splunk OpenTelemetry Connector for Kubernetes icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png type: application diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index d11f52362d..1b6d89729a 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -210,14 +210,23 @@ data: k8s.pod.labels.{{ . }} ${record.dig("kubernetes","labels","{{ . }}")} {{- end }} - {{- if .Values.autodetect.istio }} - # Automaically compose service.name attribute the same way as done in istio for traces - service.name ${record.dig("kubernetes","labels","app")}.${record.dig("kubernetes","namespace_name")} - {{- end }} - denylist ${record.dig("kubernetes", "annotations", "splunk.com/exclude") ? record.dig("kubernetes", "annotations", "splunk.com/exclude") : record.dig("kubernetes", "namespace_annotations", "splunk.com/exclude") ? (record["kubernetes"]["namespace_annotations"]["splunk.com/exclude"]) : ("false")} + + {{- if .Values.autodetect.istio }} + # This filter adds "service.name" attribute, if it's not present, the same way as istio + # prepares service name for generated traces: + # https://github.com/istio/istio/blob/77e00b47a61f0e995a29b33438c9dae7e8aace82/galley/pkg/config/analysis/analyzers/testdata/common/sidecar-injector-configmap.yaml#L110-L115 + # Name of the k8s deployment (or another object owning the pod, if any) is taken from "k8s.pod.name" attribute + # using regex to filter out name suffix according to the k8s name generation rules: + # https://github.com/kubernetes/apimachinery/blob/ff522ab81c745a9ac5f7eeb7852fac134194a3b6/pkg/util/rand/rand.go#L92-L127 + + @type jq_transformer + jq '.record["service.name"] = (.record["service.name"] // (.record.kubernetes.labels.app // (.record["k8s.pod.name"] // "istio-proxy" | (capture("^(?.+?)-(?:(?:[0-9bcdf]+-)?[bcdfghjklmnpqrstvwxz2456789]{5}|[0-9]+)$") | .owner_obj) // .)) + "." + (.record["k8s.namespace.name"] // "default")) | .record' + + {{- end }} + # Exclude all logs that are denylisted @type grep diff --git a/rendered/manifests/agent-only/clusterRole.yaml b/rendered/manifests/agent-only/clusterRole.yaml index 9ea768fd9f..7a3a4e9fbd 100644 --- a/rendered/manifests/agent-only/clusterRole.yaml +++ b/rendered/manifests/agent-only/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm rules: diff --git a/rendered/manifests/agent-only/clusterRoleBinding.yaml b/rendered/manifests/agent-only/clusterRoleBinding.yaml index 730f8c86b8..ea788a31f2 100644 --- a/rendered/manifests/agent-only/clusterRoleBinding.yaml +++ b/rendered/manifests/agent-only/clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm roleRef: diff --git a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml index 0bf549268e..fba6cb6380 100644 --- a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml +++ b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-fluentd-cri labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/agent-only/configmap-fluentd-json.yaml b/rendered/manifests/agent-only/configmap-fluentd-json.yaml index 689c1935cc..835e20366b 100644 --- a/rendered/manifests/agent-only/configmap-fluentd-json.yaml +++ b/rendered/manifests/agent-only/configmap-fluentd-json.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-fluentd-json labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/agent-only/configmap-fluentd.yaml b/rendered/manifests/agent-only/configmap-fluentd.yaml index 2dec27b574..c018b35aad 100644 --- a/rendered/manifests/agent-only/configmap-fluentd.yaml +++ b/rendered/manifests/agent-only/configmap-fluentd.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-fluentd labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: @@ -268,6 +268,7 @@ data: denylist ${record.dig("kubernetes", "annotations", "splunk.com/exclude") ? record.dig("kubernetes", "annotations", "splunk.com/exclude") : record.dig("kubernetes", "namespace_annotations", "splunk.com/exclude") ? (record["kubernetes"]["namespace_annotations"]["splunk.com/exclude"]) : ("false")} + # Exclude all logs that are denylisted @type grep diff --git a/rendered/manifests/agent-only/configmap-otel-agent.yaml b/rendered/manifests/agent-only/configmap-otel-agent.yaml index d79b5c3992..a4216db253 100644 --- a/rendered/manifests/agent-only/configmap-otel-agent.yaml +++ b/rendered/manifests/agent-only/configmap-otel-agent.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml index 9e12e6d00b..bec574c87d 100644 --- a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-k8s-cluster-receiver labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml index ee5cec992a..c548f622a6 100644 --- a/rendered/manifests/agent-only/daemonset.yaml +++ b/rendered/manifests/agent-only/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm engine: fluentd @@ -23,7 +23,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: a1b886bef2816a9293cc136642338a78e7da0b2111f8ce66f47cd7937c298d16 + checksum/config: 826663a823f84bf1225877b27bffc55e8471bf244e93cc8ee5a441c3012a9f37 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml index c6e9ceb9f3..da9b22716c 100644 --- a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml @@ -7,7 +7,7 @@ metadata: labels: app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm spec: @@ -24,7 +24,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: d9c45723a74160ada19f7b91af3bcc935ebe526fd883fb977717297ca1c6d33f + checksum/config: 9be884aefa99593fd91546948340bf6a039d0b9bd4e5389da31226179262af90 spec: serviceAccountName: default-splunk-otel-collector containers: diff --git a/rendered/manifests/agent-only/secret.yaml b/rendered/manifests/agent-only/secret.yaml index 7462ca08f2..a31b5e4d4a 100644 --- a/rendered/manifests/agent-only/secret.yaml +++ b/rendered/manifests/agent-only/secret.yaml @@ -6,7 +6,7 @@ metadata: name: splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm type: Opaque diff --git a/rendered/manifests/agent-only/serviceAccount.yaml b/rendered/manifests/agent-only/serviceAccount.yaml index 435cbd6475..e285fe6bf8 100644 --- a/rendered/manifests/agent-only/serviceAccount.yaml +++ b/rendered/manifests/agent-only/serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm diff --git a/rendered/manifests/gateway-only/clusterRole.yaml b/rendered/manifests/gateway-only/clusterRole.yaml index 9ea768fd9f..7a3a4e9fbd 100644 --- a/rendered/manifests/gateway-only/clusterRole.yaml +++ b/rendered/manifests/gateway-only/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm rules: diff --git a/rendered/manifests/gateway-only/clusterRoleBinding.yaml b/rendered/manifests/gateway-only/clusterRoleBinding.yaml index 730f8c86b8..ea788a31f2 100644 --- a/rendered/manifests/gateway-only/clusterRoleBinding.yaml +++ b/rendered/manifests/gateway-only/clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm roleRef: diff --git a/rendered/manifests/gateway-only/configmap-otel-collector.yaml b/rendered/manifests/gateway-only/configmap-otel-collector.yaml index fd638e6f06..ec69dd3bee 100644 --- a/rendered/manifests/gateway-only/configmap-otel-collector.yaml +++ b/rendered/manifests/gateway-only/configmap-otel-collector.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/gateway-only/deployment-collector.yaml b/rendered/manifests/gateway-only/deployment-collector.yaml index c32f7fdce0..7ccf779d4e 100644 --- a/rendered/manifests/gateway-only/deployment-collector.yaml +++ b/rendered/manifests/gateway-only/deployment-collector.yaml @@ -7,7 +7,7 @@ metadata: labels: app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm spec: @@ -24,7 +24,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 74f33a1a30a2162f8a82b6b81efe14821cd6a270d8f41e13d80dd0df5c6d546f + checksum/config: c62bfb843e168c5ae848390a1f6de78823d8ea4259dc5817cd16c50b305267cf spec: serviceAccountName: default-splunk-otel-collector containers: diff --git a/rendered/manifests/gateway-only/secret.yaml b/rendered/manifests/gateway-only/secret.yaml index 7462ca08f2..a31b5e4d4a 100644 --- a/rendered/manifests/gateway-only/secret.yaml +++ b/rendered/manifests/gateway-only/secret.yaml @@ -6,7 +6,7 @@ metadata: name: splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm type: Opaque diff --git a/rendered/manifests/gateway-only/service.yaml b/rendered/manifests/gateway-only/service.yaml index 4d2667d141..d2a4a37f14 100644 --- a/rendered/manifests/gateway-only/service.yaml +++ b/rendered/manifests/gateway-only/service.yaml @@ -7,7 +7,7 @@ metadata: labels: app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm spec: diff --git a/rendered/manifests/gateway-only/serviceAccount.yaml b/rendered/manifests/gateway-only/serviceAccount.yaml index 435cbd6475..e285fe6bf8 100644 --- a/rendered/manifests/gateway-only/serviceAccount.yaml +++ b/rendered/manifests/gateway-only/serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm diff --git a/rendered/manifests/logs-only/clusterRole.yaml b/rendered/manifests/logs-only/clusterRole.yaml index 9ea768fd9f..7a3a4e9fbd 100644 --- a/rendered/manifests/logs-only/clusterRole.yaml +++ b/rendered/manifests/logs-only/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm rules: diff --git a/rendered/manifests/logs-only/clusterRoleBinding.yaml b/rendered/manifests/logs-only/clusterRoleBinding.yaml index 730f8c86b8..ea788a31f2 100644 --- a/rendered/manifests/logs-only/clusterRoleBinding.yaml +++ b/rendered/manifests/logs-only/clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm roleRef: diff --git a/rendered/manifests/logs-only/configmap-fluentd-cri.yaml b/rendered/manifests/logs-only/configmap-fluentd-cri.yaml index 0bf549268e..fba6cb6380 100644 --- a/rendered/manifests/logs-only/configmap-fluentd-cri.yaml +++ b/rendered/manifests/logs-only/configmap-fluentd-cri.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-fluentd-cri labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/logs-only/configmap-fluentd-json.yaml b/rendered/manifests/logs-only/configmap-fluentd-json.yaml index 689c1935cc..835e20366b 100644 --- a/rendered/manifests/logs-only/configmap-fluentd-json.yaml +++ b/rendered/manifests/logs-only/configmap-fluentd-json.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-fluentd-json labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/logs-only/configmap-fluentd.yaml b/rendered/manifests/logs-only/configmap-fluentd.yaml index 2dec27b574..c018b35aad 100644 --- a/rendered/manifests/logs-only/configmap-fluentd.yaml +++ b/rendered/manifests/logs-only/configmap-fluentd.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-fluentd labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: @@ -268,6 +268,7 @@ data: denylist ${record.dig("kubernetes", "annotations", "splunk.com/exclude") ? record.dig("kubernetes", "annotations", "splunk.com/exclude") : record.dig("kubernetes", "namespace_annotations", "splunk.com/exclude") ? (record["kubernetes"]["namespace_annotations"]["splunk.com/exclude"]) : ("false")} + # Exclude all logs that are denylisted @type grep diff --git a/rendered/manifests/logs-only/configmap-otel-agent.yaml b/rendered/manifests/logs-only/configmap-otel-agent.yaml index 7223698e83..ca9cb08b99 100644 --- a/rendered/manifests/logs-only/configmap-otel-agent.yaml +++ b/rendered/manifests/logs-only/configmap-otel-agent.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml index 9080044133..e46a7e41ba 100644 --- a/rendered/manifests/logs-only/daemonset.yaml +++ b/rendered/manifests/logs-only/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm engine: fluentd @@ -23,7 +23,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: ab8acc9c6f81b9179a4b9219de716d5f715bd13fcf693be3a8a08bb92621d426 + checksum/config: 45d855c74c87edf260c527d28e7acc8bb75d16a5d7c17ccf3b3c5290fae94003 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/logs-only/secret.yaml b/rendered/manifests/logs-only/secret.yaml index 7462ca08f2..a31b5e4d4a 100644 --- a/rendered/manifests/logs-only/secret.yaml +++ b/rendered/manifests/logs-only/secret.yaml @@ -6,7 +6,7 @@ metadata: name: splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm type: Opaque diff --git a/rendered/manifests/logs-only/serviceAccount.yaml b/rendered/manifests/logs-only/serviceAccount.yaml index 435cbd6475..e285fe6bf8 100644 --- a/rendered/manifests/logs-only/serviceAccount.yaml +++ b/rendered/manifests/logs-only/serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm diff --git a/rendered/manifests/metrics-only/clusterRole.yaml b/rendered/manifests/metrics-only/clusterRole.yaml index 9ea768fd9f..7a3a4e9fbd 100644 --- a/rendered/manifests/metrics-only/clusterRole.yaml +++ b/rendered/manifests/metrics-only/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm rules: diff --git a/rendered/manifests/metrics-only/clusterRoleBinding.yaml b/rendered/manifests/metrics-only/clusterRoleBinding.yaml index 730f8c86b8..ea788a31f2 100644 --- a/rendered/manifests/metrics-only/clusterRoleBinding.yaml +++ b/rendered/manifests/metrics-only/clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm roleRef: diff --git a/rendered/manifests/metrics-only/configmap-otel-agent.yaml b/rendered/manifests/metrics-only/configmap-otel-agent.yaml index e11fb168a5..ff2ba13805 100644 --- a/rendered/manifests/metrics-only/configmap-otel-agent.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-agent.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml index 9e12e6d00b..bec574c87d 100644 --- a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-k8s-cluster-receiver labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/daemonset.yaml index bfd18161ed..06888434e1 100644 --- a/rendered/manifests/metrics-only/daemonset.yaml +++ b/rendered/manifests/metrics-only/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm spec: @@ -22,7 +22,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: bf9ebe156eb421f3430803c320e9138f6fd47c775b362a7ba872b074ebdeb8b5 + checksum/config: 81f5de159129a1ac8223e1b2bc17f0544bc85a7d08604f83346be894eb743dfc spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml index c6e9ceb9f3..da9b22716c 100644 --- a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml @@ -7,7 +7,7 @@ metadata: labels: app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm spec: @@ -24,7 +24,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: d9c45723a74160ada19f7b91af3bcc935ebe526fd883fb977717297ca1c6d33f + checksum/config: 9be884aefa99593fd91546948340bf6a039d0b9bd4e5389da31226179262af90 spec: serviceAccountName: default-splunk-otel-collector containers: diff --git a/rendered/manifests/metrics-only/secret.yaml b/rendered/manifests/metrics-only/secret.yaml index 7462ca08f2..a31b5e4d4a 100644 --- a/rendered/manifests/metrics-only/secret.yaml +++ b/rendered/manifests/metrics-only/secret.yaml @@ -6,7 +6,7 @@ metadata: name: splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm type: Opaque diff --git a/rendered/manifests/metrics-only/serviceAccount.yaml b/rendered/manifests/metrics-only/serviceAccount.yaml index 435cbd6475..e285fe6bf8 100644 --- a/rendered/manifests/metrics-only/serviceAccount.yaml +++ b/rendered/manifests/metrics-only/serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm diff --git a/rendered/manifests/traces-only/clusterRole.yaml b/rendered/manifests/traces-only/clusterRole.yaml index 9ea768fd9f..7a3a4e9fbd 100644 --- a/rendered/manifests/traces-only/clusterRole.yaml +++ b/rendered/manifests/traces-only/clusterRole.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm rules: diff --git a/rendered/manifests/traces-only/clusterRoleBinding.yaml b/rendered/manifests/traces-only/clusterRoleBinding.yaml index 730f8c86b8..ea788a31f2 100644 --- a/rendered/manifests/traces-only/clusterRoleBinding.yaml +++ b/rendered/manifests/traces-only/clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm roleRef: diff --git a/rendered/manifests/traces-only/configmap-otel-agent.yaml b/rendered/manifests/traces-only/configmap-otel-agent.yaml index 3bbc9805c9..6fae520f7a 100644 --- a/rendered/manifests/traces-only/configmap-otel-agent.yaml +++ b/rendered/manifests/traces-only/configmap-otel-agent.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-otel-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm data: diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index 394b5f69f1..26c0eff824 100644 --- a/rendered/manifests/traces-only/daemonset.yaml +++ b/rendered/manifests/traces-only/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: default-splunk-otel-collector-agent labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm spec: @@ -22,7 +22,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 111c980b6d181d4c247dddb58c1d8571d39b6f8e9c09debd150b56431ae80fcf + checksum/config: 77b32076671999cc98988a884a739830771ee48638cce17715864dde26734962 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/traces-only/secret.yaml b/rendered/manifests/traces-only/secret.yaml index 7462ca08f2..a31b5e4d4a 100644 --- a/rendered/manifests/traces-only/secret.yaml +++ b/rendered/manifests/traces-only/secret.yaml @@ -6,7 +6,7 @@ metadata: name: splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm type: Opaque diff --git a/rendered/manifests/traces-only/serviceAccount.yaml b/rendered/manifests/traces-only/serviceAccount.yaml index 435cbd6475..e285fe6bf8 100644 --- a/rendered/manifests/traces-only/serviceAccount.yaml +++ b/rendered/manifests/traces-only/serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: name: default-splunk-otel-collector labels: app: splunk-otel-collector - chart: splunk-otel-collector-0.29.0 + chart: splunk-otel-collector-0.29.1 release: default heritage: Helm