diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f3329810..5499914e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +[Upgrade +guidelines](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0380-to-0390) + +### Changed + +- [BREAKING CHANGE] Logs collection is now disabled by default for Splunk + Observability destination (#325) + ## [0.38.0] - 2021-11-19 This release completes the addition of content and documentation to easily allow diff --git a/Makefile b/Makefile index 01d537793a..d8f94fb729 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ render: --namespace default \ --values rendered/values.yaml \ --output-dir "$$dir" \ - --set logsEngine=otel \ + --set logsEngine=otel,splunkObservability.logsEnabled=false \ default helm-charts/splunk-otel-collector; \ mv "$$dir"/splunk-otel-collector/templates/* "$$dir"; \ rm -rf "$$dir"/splunk-otel-collector diff --git a/UPGRADING.md b/UPGRADING.md index 19f7a7360b..d579111ed1 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,5 +1,13 @@ # Upgrade guidelines +## 0.38.0 to 0.39.0 + +(#325 Logs collection is now disabled by default for Splunk Observability +destination](https://github.com/signalfx/splunk-otel-collector-chart/pull/325) + +If you send logs to Splunk Observability destination, make sure to set +`splunkObservability.logsEnabled` to true. + ## 0.37.1 to 0.38.0 [#297](https://github.com/signalfx/splunk-otel-collector-chart/pull/297), diff --git a/helm-charts/splunk-otel-collector/ci/logs-only-otel-se-o11y-values.yaml b/helm-charts/splunk-otel-collector/ci/logs-only-otel-se-o11y-values.yaml index 8b38331fb9..fd199440d6 100644 --- a/helm-charts/splunk-otel-collector/ci/logs-only-otel-se-o11y-values.yaml +++ b/helm-charts/splunk-otel-collector/ci/logs-only-otel-se-o11y-values.yaml @@ -2,16 +2,14 @@ clusterName: fake-cluster splunkObservability: realm: fake-realm accessToken: fake-token - + logsEnabled: true tracesEnabled: false metricsEnabled: false splunkPlatform: endpoint: "fake-endpoint" token: "fake-token" - index: "main" - logsEnabled: true metricsEnabled: false diff --git a/helm-charts/splunk-otel-collector/ci/logs-only-values.yaml b/helm-charts/splunk-otel-collector/ci/logs-only-values.yaml index 9a67ce0853..13eb69bc13 100644 --- a/helm-charts/splunk-otel-collector/ci/logs-only-values.yaml +++ b/helm-charts/splunk-otel-collector/ci/logs-only-values.yaml @@ -2,6 +2,6 @@ clusterName: fake-cluster splunkObservability: realm: fake-realm accessToken: fake-token - + logsEnabled: true tracesEnabled: false metricsEnabled: false diff --git a/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml b/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml index 669885030e..98ed5d6ff0 100644 --- a/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml +++ b/helm-charts/splunk-otel-collector/ci/sampler-gateway-env-vars-java-logs-values.yaml @@ -2,6 +2,7 @@ clusterName: fake-cluster splunkObservability: realm: fake-realm accessToken: fake-token + logsEnabled: true agent: config: diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index e246b05d72..6d49817f8a 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -97,10 +97,10 @@ splunkObservability: # "https://api..signalfx.com". apiUrl: "" - # Options to disable particular telemetry data types. - logsEnabled: true + # Options to disable or enable particular telemetry data types. metricsEnabled: true tracesEnabled: true + logsEnabled: false ################################################################################ # Logs collection engine: diff --git a/rendered/manifests/agent-only/configmap-agent.yaml b/rendered/manifests/agent-only/configmap-agent.yaml index d31b6d7dc7..938498beed 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: @@ -133,8 +130,6 @@ data: override: false timeout: 10s receivers: - fluentforward: - endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s scrapers: @@ -194,21 +189,6 @@ data: - memory_ballast - zpages pipelines: - logs: - exporters: - - splunk_hec/o11y - processors: - - memory_limiter - - groupbyattrs/logs - - k8sattributes - - batch - - filter/logs - - resource - - resource/logs - - resourcedetection - receivers: - - fluentforward - - otlp metrics: exporters: - signalfx diff --git a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml deleted file mode 100644 index d12fdf5eb5..0000000000 --- a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -# Source: splunk-otel-collector/templates/configmap-fluentd-cri.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: default-splunk-otel-collector-fluentd-cri - labels: - app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.38.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.38.1" - app: splunk-otel-collector - chart: splunk-otel-collector-0.38.0 - release: default - heritage: Helm -data: - - source.containers.parse.conf: |- - @type regexp - expression /^(?