Disable logs by default for Splunk Observability destination (#325)

According to Splunk [GDI Specification](https://github.com/signalfx/gdi-specification/blob/main/specification/configuration.md#kubernetes-package-management-solutions)
signalfx · Nov 30, 2021 · 12eb054 · 12eb054
1 parent 3e343f7
commit 12eb054
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 532 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +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
 
 - Upgrade splunk-otel-collector image to 0.39.0 (#322)
+- [BREAKING CHANGE] Logs collection is now disabled by default for Splunk
+  Observability destination (#325)
 
 ## [0.38.0] - 2021-11-19
 

diff --git 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=true \
 		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
@@ -1,5 +1,19 @@
 # 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 enable logs.
+Use `--set="splunkObservability.logsEnabled=true"` argument with helm
+install/upgrade command, or add the following line to your custom values.yaml:
+
+```yaml
+splunkObservability:
+  logsEnabled: 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
@@ -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
@@ -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
@@ -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
@@ -97,10 +97,10 @@ splunkObservability:
   # "https://api.<realm>.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
@@ -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
diff --git a/rendered/manifests/agent-only/configmap-fluentd-json.yaml b/rendered/manifests/agent-only/configmap-fluentd-json.yaml