Internal metrics, only if metrics are enabled (signalfx#537)

fvaliquette-splunk · Sep 22, 2022 · 64d907d · 64d907d
1 parent f008069
commit 64d907d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
@@ -239,7 +239,7 @@ service:
         {{- end }}
     {{- end }}
 
-    {{- if or (eq (include "splunk-otel-collector.splunkO11yEnabled" $) "true") (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }}
+    {{- if and (or (eq (include "splunk-otel-collector.splunkO11yEnabled" $) "true") (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true")) (or (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true")) }}
     # Pipeline for metrics collected about the collector pod itself.
     metrics/collector:
       receivers: [prometheus/collector]
@@ -250,7 +250,7 @@ service:
         - resourcedetection
         - resource/add_cluster_name
       exporters:
-        {{- if (eq (include "splunk-otel-collector.o11yMetricsEnabled" .) "true") }}
+        {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
         - signalfx
         {{- end }}
         {{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }}