fix(metrics/collector): drop k8s labels

SumoLogic · Jul 10, 2023 · 33fae07 · 33fae07
1 parent 45e96fb
commit 33fae07
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/.changelog/3141.fixed.txt b/.changelog/3141.fixed.txt
@@ -0,0 +1 @@
+fix(metrics/collector): drop k8s labels
diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml
@@ -21,12 +21,16 @@ processors:
   transform/drop_unnecessary_attributes:
     error_mode: ignore
     metric_statements:
-      - context: datapoint
+      - context: resource
         statements:
-          - delete_key(resource.attributes, "http.scheme")
-          - delete_key(resource.attributes, "net.host.name")
-          - delete_key(resource.attributes, "net.host.port")
-          - delete_key(resource.attributes, "service.instance.id")
+          - delete_key(attributes, "http.scheme")
+          - delete_key(attributes, "net.host.name")
+          - delete_key(attributes, "net.host.port")
+          - delete_key(attributes, "service.instance.id")
+          # prometheus receiver adds these automatically
+          # we drop them to make the rest of our pipeline easier to reason about
+          # after the collector and metadata are merged, consider using them instead of k8sattributes processor
+          - delete_matching_keys(attributes, "k8s.*")
 
   filter/drop_unnecessary_metrics:
     error_mode: ignore

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
@@ -76,12 +76,16 @@ spec:
       transform/drop_unnecessary_attributes:
         error_mode: ignore
         metric_statements:
-          - context: datapoint
+          - context: resource
             statements:
-              - delete_key(resource.attributes, "http.scheme")
-              - delete_key(resource.attributes, "net.host.name")
-              - delete_key(resource.attributes, "net.host.port")
-              - delete_key(resource.attributes, "service.instance.id")
+              - delete_key(attributes, "http.scheme")
+              - delete_key(attributes, "net.host.name")
+              - delete_key(attributes, "net.host.port")
+              - delete_key(attributes, "service.instance.id")
+              # prometheus receiver adds these automatically
+              # we drop them to make the rest of our pipeline easier to reason about
+              # after the collector and metadata are merged, consider using them instead of k8sattributes processor
+              - delete_matching_keys(attributes, "k8s.*")
 
       filter/drop_unnecessary_metrics:
         error_mode: ignore

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
@@ -98,12 +98,16 @@ spec:
       transform/drop_unnecessary_attributes:
         error_mode: ignore
         metric_statements:
-          - context: datapoint
+          - context: resource
             statements:
-              - delete_key(resource.attributes, "http.scheme")
-              - delete_key(resource.attributes, "net.host.name")
-              - delete_key(resource.attributes, "net.host.port")
-              - delete_key(resource.attributes, "service.instance.id")
+              - delete_key(attributes, "http.scheme")
+              - delete_key(attributes, "net.host.name")
+              - delete_key(attributes, "net.host.port")
+              - delete_key(attributes, "service.instance.id")
+              # prometheus receiver adds these automatically
+              # we drop them to make the rest of our pipeline easier to reason about
+              # after the collector and metadata are merged, consider using them instead of k8sattributes processor
+              - delete_matching_keys(attributes, "k8s.*")
 
       filter/drop_unnecessary_metrics:
         error_mode: ignore