fix(metrics/collector): disabling kubelet and cAdvisor metrics

SumoLogic · Jul 6, 2023 · 1767f8c · 1767f8c
1 parent f4e7ce3
commit 1767f8c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/3133.added.txt b/.changelog/3133.added.txt
@@ -0,0 +1 @@
+feat(metrics/collector): allow disabling cadvisor and kubelet metrics
diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml
@@ -39,7 +39,8 @@ receivers:
     config:
       global:
         scrape_interval: 30s
-      scrape_configs:
+      ## As of right now, if scrape_configs is empty, it needs to be an empty list, otherwise otel-operator rejects it
+      scrape_configs: {{ not (or .Values.sumologic.metrics.collector.otelcol.kubelet.enabled .Values.sumologic.metrics.collector.otelcol.cAdvisor.enabled) | ternary "[]" "" }}
 {{- if .Values.sumologic.metrics.collector.otelcol.kubelet.enabled }}
         ## These scrape configs are for kubelet metrics
         ## Prometheus operator does this by manually maintaining a Service with Endpoints for all Nodes

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
@@ -94,7 +94,8 @@ spec:
         config:
           global:
             scrape_interval: 30s
-          scrape_configs:
+          ## As of right now, if scrape_configs is empty, it needs to be an empty list, otherwise otel-operator rejects it
+          scrape_configs: 
             ## These scrape configs are for kubelet metrics
             ## Prometheus operator does this by manually maintaining a Service with Endpoints for all Nodes
             ## We don't have that capability, so we need to use a static configuration

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
@@ -116,7 +116,8 @@ spec:
         config:
           global:
             scrape_interval: 30s
-          scrape_configs:
+          ## As of right now, if scrape_configs is empty, it needs to be an empty list, otherwise otel-operator rejects it
+          scrape_configs: []
         target_allocator:
           endpoint: http://RELEASE-NAME-sumologic-metrics-targetallocator
           interval: 30s
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		feat(metrics/collector): allow disabling cadvisor and kubelet metrics