fix(metrics)!: don't use _sumo_forward_

SumoLogic · Sep 19, 2023 · d406476 · d406476
1 parent 13dc67d
commit d406476
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml
@@ -169,12 +169,15 @@ routing:
         - sumologic/state
       value: /prometheus.metrics.state
     ## custom metrics
-    ## This entry is necessary due to a bug in routing processor that prevents the routing key from being deleted
+    ## These entries are necessary due to a bug in routing processor that prevents the routing key from being deleted
     ## if the default exporter is chosen
     ## See: https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24644
     - exporters:
         - sumologic/default
       value: /prometheus.metrics.applications.custom
+    - exporters:
+        - sumologic/default
+      value: /prometheus.metrics
 {{- end }}
 
 ## Configuration for Source Processor

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -1193,13 +1193,6 @@ kube-prometheus-stack:
               target_label: pod
               replacement: $1
               action: replace
-            ## Sets _sumo_forward_ label to true
-            - source_labels: [__name__]
-              separator: ;
-              regex: (.*)
-              target_label: _sumo_forward_
-              replacement: "true"
-              action: replace
       remoteWrite:
         ## infrastructure metrics
         - url: http://$(METADATA_METRICS_SVC).$(NAMESPACE).svc.cluster.local.:9888/prometheus.metrics

diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml
@@ -229,6 +229,9 @@ data:
         - exporters:
           - sumologic/default
           value: /prometheus.metrics.applications.custom
+        - exporters:
+          - sumologic/default
+          value: /prometheus.metrics
       source:
         collector: kubernetes
         exclude:

diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml
@@ -229,6 +229,9 @@ data:
         - exporters:
           - sumologic/default
           value: /prometheus.metrics.applications.custom
+        - exporters:
+          - sumologic/default
+          value: /prometheus.metrics
       source:
         collector: kubernetes
         exclude:

diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml
@@ -253,6 +253,9 @@ data:
         - exporters:
           - sumologic/default
           value: /prometheus.metrics.applications.custom
+        - exporters:
+          - sumologic/default
+          value: /prometheus.metrics
       source:
         collector: kubernetes
         exclude: