From 994f736526512db3c479b01fc828563510749574 Mon Sep 17 00:00:00 2001 From: Eyal Maderer Date: Thu, 24 Feb 2022 15:02:09 -0800 Subject: [PATCH] set profilingEnabled to default false (#388) * set profilingEnabled to default false * Update CHANGELOG.md * make render --- CHANGELOG.md | 4 ++++ helm-charts/splunk-otel-collector/values.yaml | 2 +- .../manifests/agent-only/configmap-agent.yaml | 16 ---------------- rendered/manifests/agent-only/daemonset.yaml | 2 +- .../manifests/eks-fargate/configmap-gateway.yaml | 14 -------------- .../eks-fargate/deployment-gateway.yaml | 2 +- .../gateway-only/configmap-gateway.yaml | 14 -------------- .../gateway-only/deployment-gateway.yaml | 2 +- .../manifests/metrics-only/configmap-agent.yaml | 16 ---------------- rendered/manifests/metrics-only/daemonset.yaml | 2 +- .../manifests/traces-only/configmap-agent.yaml | 16 ---------------- rendered/manifests/traces-only/daemonset.yaml | 2 +- 12 files changed, 10 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45788319dc..38eb53907d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Changed + +- [BREAKING CHANGE] Set `profilingEnabled` to default false (#388) + ## [0.43.3] - 2022-02-24 ### Added diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index c084d7bcd3..9e76f55f95 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -106,7 +106,7 @@ splunkObservability: # There is no active collection of profiling data. # Instrumentation libraries must be configured to send it to the collector. # If you don't use AlwaysOn Profiling for Splunk APM, you can disable it. - profilingEnabled: true + profilingEnabled: false ################################################################################ # Logs collection engine: diff --git a/rendered/manifests/agent-only/configmap-agent.yaml b/rendered/manifests/agent-only/configmap-agent.yaml index 32f23e85f7..feab5eb4ab 100644 --- a/rendered/manifests/agent-only/configmap-agent.yaml +++ b/rendered/manifests/agent-only/configmap-agent.yaml @@ -26,9 +26,6 @@ data: correlation: null ingest_url: https://ingest.CHANGEME.signalfx.com sync_host_metadata: true - splunk_hec/o11y: - endpoint: https://ingest.CHANGEME.signalfx.com/v1/log - token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} extensions: health_check: null k8s_observer: @@ -233,19 +230,6 @@ data: - memory_ballast - zpages pipelines: - logs: - exporters: - - splunk_hec/o11y - processors: - - memory_limiter - - k8sattributes - - batch - - filter/logs - - resource/logs - - resourcedetection - - resource - receivers: - - otlp metrics: exporters: - signalfx diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml index 581779d8d5..285c6fce7b 100644 --- a/rendered/manifests/agent-only/daemonset.yaml +++ b/rendered/manifests/agent-only/daemonset.yaml @@ -27,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: f9103e7924f0b80f4ccc2f3fee79732f3d414bc12e8e1fefede50b8327173e65 + checksum/config: 9c4d63bb0932c0b10b1acd6095f17bd6931333d615af9ffe79a33c2831d3f059 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/rendered/manifests/eks-fargate/configmap-gateway.yaml b/rendered/manifests/eks-fargate/configmap-gateway.yaml index 83900d9cdc..bd8927cd1c 100644 --- a/rendered/manifests/eks-fargate/configmap-gateway.yaml +++ b/rendered/manifests/eks-fargate/configmap-gateway.yaml @@ -24,9 +24,6 @@ data: access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} api_url: https://api.CHANGEME.signalfx.com ingest_url: https://ingest.CHANGEME.signalfx.com - splunk_hec/o11y: - endpoint: https://ingest.CHANGEME.signalfx.com/v1/log - token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} extensions: health_check: null http_forwarder: @@ -150,17 +147,6 @@ data: - zpages - http_forwarder pipelines: - logs: - exporters: - - splunk_hec/o11y - processors: - - memory_limiter - - k8sattributes - - batch - - filter/logs - - resource/logs - receivers: - - otlp logs/signalfx-events: exporters: - signalfx diff --git a/rendered/manifests/eks-fargate/deployment-gateway.yaml b/rendered/manifests/eks-fargate/deployment-gateway.yaml index 79d58ace15..62edb9f873 100644 --- a/rendered/manifests/eks-fargate/deployment-gateway.yaml +++ b/rendered/manifests/eks-fargate/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: cfc04dde71dbb4d35f357e6788ce5751ca96025636552a98dc94411ab14727f7 + checksum/config: 93b279f78edffda76b24c1baa7f30d2ead7b3d97a927cfb0a6c57123106f5426 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/rendered/manifests/gateway-only/configmap-gateway.yaml b/rendered/manifests/gateway-only/configmap-gateway.yaml index 293c9edee4..1ba1d7f015 100644 --- a/rendered/manifests/gateway-only/configmap-gateway.yaml +++ b/rendered/manifests/gateway-only/configmap-gateway.yaml @@ -24,9 +24,6 @@ data: access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} api_url: https://api.CHANGEME.signalfx.com ingest_url: https://ingest.CHANGEME.signalfx.com - splunk_hec/o11y: - endpoint: https://ingest.CHANGEME.signalfx.com/v1/log - token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} extensions: health_check: null http_forwarder: @@ -148,17 +145,6 @@ data: - zpages - http_forwarder pipelines: - logs: - exporters: - - splunk_hec/o11y - processors: - - memory_limiter - - k8sattributes - - batch - - filter/logs - - resource/logs - receivers: - - otlp logs/signalfx-events: exporters: - signalfx diff --git a/rendered/manifests/gateway-only/deployment-gateway.yaml b/rendered/manifests/gateway-only/deployment-gateway.yaml index 1532e8d7e0..ead4c182a6 100644 --- a/rendered/manifests/gateway-only/deployment-gateway.yaml +++ b/rendered/manifests/gateway-only/deployment-gateway.yaml @@ -30,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: bff594ff742861fb8867ee95261f30bd744bd16faa6b1a37dd428f43a96eb7d3 + checksum/config: eb018efb705a632ce951872aa2f798d8aa25bfd9c99e4380178b35466fa2397d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/rendered/manifests/metrics-only/configmap-agent.yaml b/rendered/manifests/metrics-only/configmap-agent.yaml index b4322149a2..f41c5bd8d9 100644 --- a/rendered/manifests/metrics-only/configmap-agent.yaml +++ b/rendered/manifests/metrics-only/configmap-agent.yaml @@ -23,9 +23,6 @@ data: correlation: null ingest_url: https://ingest.CHANGEME.signalfx.com sync_host_metadata: true - splunk_hec/o11y: - endpoint: https://ingest.CHANGEME.signalfx.com/v1/log - token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} extensions: health_check: null k8s_observer: @@ -219,19 +216,6 @@ data: - memory_ballast - zpages pipelines: - logs: - exporters: - - splunk_hec/o11y - processors: - - memory_limiter - - k8sattributes - - batch - - filter/logs - - resource/logs - - resourcedetection - - resource - receivers: - - otlp metrics: exporters: - signalfx diff --git a/rendered/manifests/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/daemonset.yaml index fcf3673f9a..bdee087de9 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: 9df08643b7161e4ef163b43284622caa3b3ac04c43674d846f6826c60464aad6 + checksum/config: f4fcd9fd8c48ac1ed30a4adce30ab6bc04496ae147ac9c674c471c6e20598146 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/rendered/manifests/traces-only/configmap-agent.yaml b/rendered/manifests/traces-only/configmap-agent.yaml index 376f1c42d7..a50d9a1cef 100644 --- a/rendered/manifests/traces-only/configmap-agent.yaml +++ b/rendered/manifests/traces-only/configmap-agent.yaml @@ -26,9 +26,6 @@ data: correlation: null ingest_url: https://ingest.CHANGEME.signalfx.com sync_host_metadata: true - splunk_hec/o11y: - endpoint: https://ingest.CHANGEME.signalfx.com/v1/log - token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN} extensions: health_check: null k8s_observer: @@ -166,19 +163,6 @@ data: - memory_ballast - zpages pipelines: - logs: - exporters: - - splunk_hec/o11y - processors: - - memory_limiter - - k8sattributes - - batch - - filter/logs - - resource/logs - - resourcedetection - - resource - receivers: - - otlp metrics/agent: exporters: - signalfx diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index ba908d0a3b..fbcd3285f2 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: c7717dd7d62ce89c7235c82166884195d6f4e8e5ad18ba215580d9c46bfafe06 + checksum/config: de056beb4a49ea00e4ba0774cea762e7a2a10984a61d179e78a5a086eeb5cdfd kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true