feat: Make the metrics level in service telemetry configurable

SumoLogic · Feb 4, 2025 · 89564e0 · 89564e0
1 parent 6a24d77
commit 89564e0
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 13 deletions.
diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml
@@ -93,7 +93,7 @@ service:
     logs:
       level: {{ .Values.otelevents.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.otelevents.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml
@@ -203,7 +203,7 @@ service:
     logs:
       level: {{ .Values.otelcolInstrumentation.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.otelcolInstrumentation.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml
@@ -74,7 +74,7 @@ service:
     logs:
       level: {{ .Values.tracesGateway.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.tracesGateway.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml
@@ -105,7 +105,7 @@ service:
     logs:
       level: {{ .Values.tracesSampler.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.tracesSampler.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml
@@ -104,7 +104,7 @@ service:
     logs:
       level: {{ .Values.otellogs.logLevel | quote }}
     metrics:
-      level: normal
+      level: {{ .Values.otellogs.metricsLevel | quote }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml
@@ -154,7 +154,7 @@ service:
     logs:
       level: {{ .Values.otellogs.logLevel | quote }}
     metrics:
-      level: normal
+      level: {{ .Values.otellogs.metricsLevel | quote }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml
@@ -54,7 +54,7 @@ service:
     logs:
       level: {{ .Values.otellogswindows.logLevel | quote }}
     metrics:
-      level: normal
+      level: {{ .Values.otellogswindows.metricsLevel | quote }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml
@@ -627,7 +627,7 @@ service:
     logs:
       level: {{ .Values.metadata.logs.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.metadata.logs.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml
@@ -67,7 +67,7 @@ service:
     logs:
       level: {{ .Values.metadata.metrics.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.metadata.metrics.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/config.yaml
@@ -57,7 +57,7 @@ service:
     logs:
       level: {{ .Values.metadata.metrics.logLevel }}
     metrics:
-      level: normal
+      level: {{ .Values.metadata.metrics.metricsLevel }}
       readers:
         - pull:
             exporter:

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -1449,6 +1449,8 @@ otelcolInstrumentation:
 
   ## Log Level
   logLevel: info
+  ## Metrics Level (basic, normal, detailed)
+  metricsLevel: normal
 
   config:
     ## Directly alter the OT configuration. The value of this key should be a dictionary, that will
@@ -1518,7 +1520,8 @@ tracesSampler:
 
   ## Log Level
   logLevel: info
-
+  ## Metrics Level (basic, normal, detailed)
+  metricsLevel: normal
   ## Customize the Opentelemetry Collector configuration beyond the exposed options
   config:
     ## Directly alter the OT configuration. The value of this key should be a dictionary, that will
@@ -1588,6 +1591,8 @@ metadata:
   metrics:
     enabled: true
     logLevel: info
+    ## Metrics Level (basic, normal, detailed)
+    metricsLevel: normal
     config:
       ## Directly alter the OT configuration. The value of this key should be a dictionary, that will
       ## be directly merged with the generated configuration, overriding existing values.
@@ -1692,6 +1697,8 @@ metadata:
   logs:
     enabled: true
     logLevel: info
+    ## Metrics Level (basic, normal, detailed)
+    metricsLevel: normal
     config:
       ## Directly alter the OT configuration. The value of this key should be a dictionary, that will
       ## be directly merged with the generated configuration, overriding existing values.
@@ -1865,6 +1872,8 @@ tracesGateway:
 
   ## Log Level
   logLevel: info
+  ## Metrics Level (basic, normal, detailed)
+  metricsLevel: normal
 
   ## Customize the Opentelemetry Collector configuration beyond the exposed options
   config:
@@ -1896,6 +1905,8 @@ otelevents:
     pullPolicy: IfNotPresent
 
   logLevel: info
+  ## Metrics Level (basic, normal, detailed)
+  metricsLevel: normal
 
   ## Customize the Opentelemetry Collector configuration beyond the exposed options
   config:
@@ -2042,6 +2053,8 @@ otellogs:
     pullPolicy: IfNotPresent
 
   logLevel: info
+  ## Metrics Level (basic, normal, detailed)
+  metricsLevel: normal
 
   config:
     ## Directly alter the OT configuration. The value of this key should be a dictionary, that will
@@ -2192,6 +2205,8 @@ otellogswindows:
     pullPolicy: IfNotPresent
 
   logLevel: info
+  ## Metrics Level (basic, normal, detailed)
+  metricsLevel: normal
 
   config:
     ## Directly alter the OT configuration. The value of this key should be a dictionary, that will

diff --git a/tests/helm/testdata/goldenfile/events_otc/options.input.yaml b/tests/helm/testdata/goldenfile/events_otc/options.input.yaml
@@ -1,5 +1,6 @@
 otelevents:
   logLevel: debug
+  metricsLevel: detailed
 
 sumologic:
   clusterName: testCluster

diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml
@@ -69,7 +69,7 @@ data:
         logs:
           level: debug
         metrics:
-          level: normal
+          level: detailed
           readers:
           - pull:
               exporter:

diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.input.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.input.yaml
@@ -12,3 +12,4 @@ sumologic:
 
 otellogs:
   logLevel: debug
+  metricsLevel: detailed
diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml
@@ -124,7 +124,7 @@ data:
         logs:
           level: debug
         metrics:
-          level: normal
+          level: detailed
           readers:
           - pull:
               exporter:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ sumologic:

		otellogs:
		logLevel: debug
		metricsLevel: detailed