From 18ba051820887c3018d5bcc77e6ded73d4a5fe47 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 19 Dec 2022 18:26:01 -0800 Subject: [PATCH] Temporary disable compression in Splunk logs exporter until 0.68.0 (#610) to workaround a compression bug --- CHANGELOG.md | 2 ++ .../splunk-otel-collector/templates/config/_otel-agent.tpl | 2 ++ .../splunk-otel-collector/templates/config/_otel-collector.tpl | 2 ++ .../templates/config/_otel-k8s-cluster-receiver-config.tpl | 2 ++ rendered/manifests/logs-only/configmap-agent.yaml | 1 + rendered/manifests/logs-only/daemonset.yaml | 2 +- rendered/manifests/otel-logs/configmap-agent.yaml | 1 + rendered/manifests/otel-logs/daemonset.yaml | 2 +- 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b9c12fb08..bf8bd01c36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Make sure the daemonset can start in GKE Autopiot (#608) - Make containerd engine default in for fluentd logs and use always use it in GKE Autopiot (#609) +- Temporary disable compression in Splunk Observability logs exporter until + 0.68.0 to workaround a compression bug (#610) ## [0.66.1] - 2022-12-08 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 54d9b62a85..0641329948 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -579,6 +579,8 @@ exporters: token: "${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}" log_data_enabled: {{ .Values.splunkObservability.logsEnabled }} profiling_data_enabled: {{ .Values.splunkObservability.profilingEnabled }} + # Temporary disable compression until 0.68.0 to workaround a compression bug + disable_compression: true {{- end }} {{- if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") }} {{- include "splunk-otel-collector.splunkPlatformLogsExporter" . | nindent 2 }} 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 393cb1919f..3dddda329c 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -152,6 +152,8 @@ exporters: profiling_data_enabled: {{ .Values.splunkObservability.profilingEnabled }} sending_queue: num_consumers: 32 + # Temporary disable compression until 0.68.0 to workaround a compression bug + disable_compression: true {{- end }} {{- if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "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 97cfe23e30..d687dfbeb0 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 @@ -164,6 +164,8 @@ exporters: token: "${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}" log_data_enabled: true profiling_data_enabled: false + # Temporary disable compression until 0.68.0 to workaround a compression bug + disable_compression: true {{- end }} {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" .) "true") }} diff --git a/rendered/manifests/logs-only/configmap-agent.yaml b/rendered/manifests/logs-only/configmap-agent.yaml index 896ab1701d..52d797f019 100644 --- a/rendered/manifests/logs-only/configmap-agent.yaml +++ b/rendered/manifests/logs-only/configmap-agent.yaml @@ -24,6 +24,7 @@ data: ingest_url: https://ingest.CHANGEME.signalfx.com sync_host_metadata: true splunk_hec/o11y: + disable_compression: true endpoint: https://ingest.CHANGEME.signalfx.com/v1/log log_data_enabled: true profiling_data_enabled: false diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml index 27f9274eef..4dba3ef1b9 100644 --- a/rendered/manifests/logs-only/daemonset.yaml +++ b/rendered/manifests/logs-only/daemonset.yaml @@ -30,7 +30,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 0dd2001a5452e85b22ed2a419f03895f9b0a0382fb9d035be838299393f6080b + checksum/config: 6ec60fb5f051a41efb84465b07fd45a0b086efcc46c2d1ab2d791b9d1c7f8dc7 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/rendered/manifests/otel-logs/configmap-agent.yaml b/rendered/manifests/otel-logs/configmap-agent.yaml index 8977a24ad9..ddae1b9a17 100644 --- a/rendered/manifests/otel-logs/configmap-agent.yaml +++ b/rendered/manifests/otel-logs/configmap-agent.yaml @@ -27,6 +27,7 @@ data: ingest_url: https://ingest.CHANGEME.signalfx.com sync_host_metadata: true splunk_hec/o11y: + disable_compression: true endpoint: https://ingest.CHANGEME.signalfx.com/v1/log log_data_enabled: true profiling_data_enabled: false diff --git a/rendered/manifests/otel-logs/daemonset.yaml b/rendered/manifests/otel-logs/daemonset.yaml index d573c98b5c..0a2fe9440f 100644 --- a/rendered/manifests/otel-logs/daemonset.yaml +++ b/rendered/manifests/otel-logs/daemonset.yaml @@ -29,7 +29,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 8d58214e201cd190b4f1eadfc34a0baba2efe9ca5b16e1efe158e5ed2f30b2e2 + checksum/config: af8cd684d7e9d2b64258ed6a0995fa489141434f635ab4391c436cf42fc56a80 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true