fix

solarwinds · Jan 6, 2025 · f5329b2 · f5329b2
1 parent 7c9fe34
commit f5329b2
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 15 deletions.
diff --git a/deploy/helm/events-collector-config.yaml b/deploy/helm/events-collector-config.yaml
@@ -100,6 +100,9 @@ processors:
           - delete_key(resource.attributes, "k8s.job.name") where resource.attributes["sw.k8s.job.found"] == "false"
           - delete_key(resource.attributes, "k8s.cronjob.name") where resource.attributes["sw.k8s.cronjob.found"] == "false"
           - delete_key(resource.attributes, "k8s.node.name") where resource.attributes["sw.k8s.node.found"] == "false"
+          - delete_key(resource.attributes, "k8s.persistentvolume.name") where resource.attributes["sw.k8s.persistentvolume.found"] == "false"
+          - delete_key(resource.attributes, "k8s.persistentvolumeclaim.name") where resource.attributes["sw.k8s.persistentvolumeclaim.found"] == "false"
+          - delete_key(resource.attributes, "k8s.service.name") where resource.attributes["sw.k8s.service.found"] == "false"
           - delete_key(resource.attributes, "sw.k8s.pod.found")
           - delete_key(resource.attributes, "sw.k8s.deployment.found")
           - delete_key(resource.attributes, "sw.k8s.statefulset.found")
@@ -108,6 +111,9 @@ processors:
           - delete_key(resource.attributes, "sw.k8s.job.found")
           - delete_key(resource.attributes, "sw.k8s.cronjob.found")
           - delete_key(resource.attributes, "sw.k8s.node.found")
+          - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
+          - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
+          - delete_key(resource.attributes, "sw.k8s.service.found")
 
   transform/stringify_body:
     error_mode: ignore

diff --git a/deploy/helm/metrics-collector-config.yaml b/deploy/helm/metrics-collector-config.yaml
@@ -751,9 +751,6 @@ processors:
           - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
           - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
           - delete_key(resource.attributes, "sw.k8s.service.found")
-          - delete_key(resource.attributes, "sw.k8s.job.found")
-          - delete_key(resource.attributes, "sw.k8s.cronjob.found")
-          - delete_key(resource.attributes, "sw.k8s.node.found")
 
   attributes/remove_prometheus_attributes_endpoint:
     exclude:

diff --git a/deploy/helm/tests/__snapshot__/events-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/events-collector-config-map_test.yaml.snap
@@ -241,6 +241,12 @@ Custom events filter with new syntax:
               == "false"
             - delete_key(resource.attributes, "k8s.node.name") where resource.attributes["sw.k8s.node.found"]
               == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolume.name") where resource.attributes["sw.k8s.persistentvolume.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolumeclaim.name") where resource.attributes["sw.k8s.persistentvolumeclaim.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.service.name") where resource.attributes["sw.k8s.service.found"]
+              == "false"
             - delete_key(resource.attributes, "sw.k8s.pod.found")
             - delete_key(resource.attributes, "sw.k8s.deployment.found")
             - delete_key(resource.attributes, "sw.k8s.statefulset.found")
@@ -249,6 +255,9 @@ Custom events filter with new syntax:
             - delete_key(resource.attributes, "sw.k8s.job.found")
             - delete_key(resource.attributes, "sw.k8s.cronjob.found")
             - delete_key(resource.attributes, "sw.k8s.node.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
+            - delete_key(resource.attributes, "sw.k8s.service.found")
         transform/entity_attributes:
           log_statements:
           - context: log
@@ -821,6 +830,12 @@ Custom events filter with old syntax:
               == "false"
             - delete_key(resource.attributes, "k8s.node.name") where resource.attributes["sw.k8s.node.found"]
               == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolume.name") where resource.attributes["sw.k8s.persistentvolume.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolumeclaim.name") where resource.attributes["sw.k8s.persistentvolumeclaim.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.service.name") where resource.attributes["sw.k8s.service.found"]
+              == "false"
             - delete_key(resource.attributes, "sw.k8s.pod.found")
             - delete_key(resource.attributes, "sw.k8s.deployment.found")
             - delete_key(resource.attributes, "sw.k8s.statefulset.found")
@@ -829,6 +844,9 @@ Custom events filter with old syntax:
             - delete_key(resource.attributes, "sw.k8s.job.found")
             - delete_key(resource.attributes, "sw.k8s.cronjob.found")
             - delete_key(resource.attributes, "sw.k8s.node.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
+            - delete_key(resource.attributes, "sw.k8s.service.found")
         transform/entity_attributes:
           log_statements:
           - context: log
@@ -1394,6 +1412,12 @@ Events config should match snapshot when using default values:
               == "false"
             - delete_key(resource.attributes, "k8s.node.name") where resource.attributes["sw.k8s.node.found"]
               == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolume.name") where resource.attributes["sw.k8s.persistentvolume.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolumeclaim.name") where resource.attributes["sw.k8s.persistentvolumeclaim.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.service.name") where resource.attributes["sw.k8s.service.found"]
+              == "false"
             - delete_key(resource.attributes, "sw.k8s.pod.found")
             - delete_key(resource.attributes, "sw.k8s.deployment.found")
             - delete_key(resource.attributes, "sw.k8s.statefulset.found")
@@ -1402,6 +1426,9 @@ Events config should match snapshot when using default values:
             - delete_key(resource.attributes, "sw.k8s.job.found")
             - delete_key(resource.attributes, "sw.k8s.cronjob.found")
             - delete_key(resource.attributes, "sw.k8s.node.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
+            - delete_key(resource.attributes, "sw.k8s.service.found")
         transform/entity_attributes:
           log_statements:
           - context: log
@@ -1966,6 +1993,12 @@ Events config should not contain manifest collection pipeline when disabled:
               == "false"
             - delete_key(resource.attributes, "k8s.node.name") where resource.attributes["sw.k8s.node.found"]
               == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolume.name") where resource.attributes["sw.k8s.persistentvolume.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.persistentvolumeclaim.name") where resource.attributes["sw.k8s.persistentvolumeclaim.found"]
+              == "false"
+            - delete_key(resource.attributes, "k8s.service.name") where resource.attributes["sw.k8s.service.found"]
+              == "false"
             - delete_key(resource.attributes, "sw.k8s.pod.found")
             - delete_key(resource.attributes, "sw.k8s.deployment.found")
             - delete_key(resource.attributes, "sw.k8s.statefulset.found")
@@ -1974,6 +2007,9 @@ Events config should not contain manifest collection pipeline when disabled:
             - delete_key(resource.attributes, "sw.k8s.job.found")
             - delete_key(resource.attributes, "sw.k8s.cronjob.found")
             - delete_key(resource.attributes, "sw.k8s.node.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
+            - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
+            - delete_key(resource.attributes, "sw.k8s.service.found")
         transform/entity_attributes:
           log_statements:
           - context: log

diff --git a/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap
@@ -1592,9 +1592,6 @@ Metrics config should match snapshot when using default values:
             - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
             - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
             - delete_key(resource.attributes, "sw.k8s.service.found")
-            - delete_key(resource.attributes, "sw.k8s.job.found")
-            - delete_key(resource.attributes, "sw.k8s.cronjob.found")
-            - delete_key(resource.attributes, "sw.k8s.node.found")
         transform/scope:
           metric_statements:
           - context: scope

diff --git a/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap
@@ -1592,9 +1592,6 @@ Metrics config should match snapshot when fargate is enabled:
             - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
             - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
             - delete_key(resource.attributes, "sw.k8s.service.found")
-            - delete_key(resource.attributes, "sw.k8s.job.found")
-            - delete_key(resource.attributes, "sw.k8s.cronjob.found")
-            - delete_key(resource.attributes, "sw.k8s.node.found")
         transform/scope:
           metric_statements:
           - context: scope
@@ -3454,9 +3451,6 @@ Metrics config should match snapshot when using Prometheus url with extra_scrape
             - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
             - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
             - delete_key(resource.attributes, "sw.k8s.service.found")
-            - delete_key(resource.attributes, "sw.k8s.job.found")
-            - delete_key(resource.attributes, "sw.k8s.cronjob.found")
-            - delete_key(resource.attributes, "sw.k8s.node.found")
         transform/scope:
           metric_statements:
           - context: scope
@@ -5258,9 +5252,6 @@ Metrics config should match snapshot when using default values:
             - delete_key(resource.attributes, "sw.k8s.persistentvolume.found")
             - delete_key(resource.attributes, "sw.k8s.persistentvolumeclaim.found")
             - delete_key(resource.attributes, "sw.k8s.service.found")
-            - delete_key(resource.attributes, "sw.k8s.job.found")
-            - delete_key(resource.attributes, "sw.k8s.cronjob.found")
-            - delete_key(resource.attributes, "sw.k8s.node.found")
         transform/scope:
           metric_statements:
           - context: scope