reverting helm changes

solarwinds · Jan 3, 2025 · 9a2c5ae · 9a2c5ae
1 parent 51fb718
commit 9a2c5ae
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 170 deletions.
diff --git a/deploy/helm/events-collector-config.yaml b/deploy/helm/events-collector-config.yaml
@@ -234,7 +234,6 @@ processors:
       - key: sw.k8s.log.type
         value: event
         action: insert
-
   resource/manifest:
     attributes:
       # Collector and Manifest version
@@ -258,38 +257,6 @@ processors:
       - key: sw.k8s.log.type
         value: manifest
         action: insert
-
-  resourcedetection/providers:
-    detectors: ["ec2","azure","openshift"]
-    timeout: 2s
-    override: false
-    azure:
-      resource_attributes:
-        azure.vm.scaleset.name:
-          enabled: false
-        azure.vm.size:
-          enabled: false
-        host.id:
-          enabled: false
-        host.name:
-          enabled: false
-    openshift:
-      resource_attributes:
-        k8s.cluster.name:
-          enabled: false
-    ec2:
-      resource_attributes:
-        cloud.availability_zone:
-          enabled: false
-        host.id:
-          enabled: false
-        host.image.id:
-          enabled: false
-        host.name:
-          enabled: false
-        host.type:
-          enabled: false
-
   batch:
 {{ toYaml .Values.otel.events.batch | indent 4 }}
   swk8sattributes:
@@ -360,7 +327,6 @@ service:
         - transform/set_labels_and_annotations_for_entities
         - transform/stringify_body
         - resource/manifest
-        - resourcedetection/providers
         - swk8sattributes
         - transform/cleanup_attributes_for_nonexisting_entities
 {{- if not (and .Values.otel.events.enabled .Values.otel.manifests.enabled) }}

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
@@ -91,39 +91,6 @@ Custom events filter with new syntax:
           - action: insert
             key: sw.k8s.log.type
             value: manifest
-        resourcedetection/providers:
-          azure:
-            resource_attributes:
-              azure.vm.scaleset.name:
-                enabled: false
-              azure.vm.size:
-                enabled: false
-              host.id:
-                enabled: false
-              host.name:
-                enabled: false
-          detectors:
-          - ec2
-          - azure
-          - openshift
-          ec2:
-            resource_attributes:
-              cloud.availability_zone:
-                enabled: false
-              host.id:
-                enabled: false
-              host.image.id:
-                enabled: false
-              host.name:
-                enabled: false
-              host.type:
-                enabled: false
-          openshift:
-            resource_attributes:
-              k8s.cluster.name:
-                enabled: false
-          override: false
-          timeout: 2s
         swk8sattributes:
           auth_type: serviceAccount
           cronjob:
@@ -561,7 +528,6 @@ Custom events filter with new syntax:
             - transform/set_labels_and_annotations_for_entities
             - transform/stringify_body
             - resource/manifest
-            - resourcedetection/providers
             - swk8sattributes
             - transform/cleanup_attributes_for_nonexisting_entities
             - transform/scope
@@ -669,39 +635,6 @@ Custom events filter with old syntax:
           - action: insert
             key: sw.k8s.log.type
             value: manifest
-        resourcedetection/providers:
-          azure:
-            resource_attributes:
-              azure.vm.scaleset.name:
-                enabled: false
-              azure.vm.size:
-                enabled: false
-              host.id:
-                enabled: false
-              host.name:
-                enabled: false
-          detectors:
-          - ec2
-          - azure
-          - openshift
-          ec2:
-            resource_attributes:
-              cloud.availability_zone:
-                enabled: false
-              host.id:
-                enabled: false
-              host.image.id:
-                enabled: false
-              host.name:
-                enabled: false
-              host.type:
-                enabled: false
-          openshift:
-            resource_attributes:
-              k8s.cluster.name:
-                enabled: false
-          override: false
-          timeout: 2s
         swk8sattributes:
           auth_type: serviceAccount
           cronjob:
@@ -1139,7 +1072,6 @@ Custom events filter with old syntax:
             - transform/set_labels_and_annotations_for_entities
             - transform/stringify_body
             - resource/manifest
-            - resourcedetection/providers
             - swk8sattributes
             - transform/cleanup_attributes_for_nonexisting_entities
             - transform/scope
@@ -1240,39 +1172,6 @@ Events config should match snapshot when using default values:
           - action: insert
             key: sw.k8s.log.type
             value: manifest
-        resourcedetection/providers:
-          azure:
-            resource_attributes:
-              azure.vm.scaleset.name:
-                enabled: false
-              azure.vm.size:
-                enabled: false
-              host.id:
-                enabled: false
-              host.name:
-                enabled: false
-          detectors:
-          - ec2
-          - azure
-          - openshift
-          ec2:
-            resource_attributes:
-              cloud.availability_zone:
-                enabled: false
-              host.id:
-                enabled: false
-              host.image.id:
-                enabled: false
-              host.name:
-                enabled: false
-              host.type:
-                enabled: false
-          openshift:
-            resource_attributes:
-              k8s.cluster.name:
-                enabled: false
-          override: false
-          timeout: 2s
         swk8sattributes:
           auth_type: serviceAccount
           cronjob:
@@ -1709,7 +1608,6 @@ Events config should match snapshot when using default values:
             - transform/set_labels_and_annotations_for_entities
             - transform/stringify_body
             - resource/manifest
-            - resourcedetection/providers
             - swk8sattributes
             - transform/cleanup_attributes_for_nonexisting_entities
             - transform/scope
@@ -1810,39 +1708,6 @@ Events config should not contain manifest collection pipeline when disabled:
           - action: insert
             key: sw.k8s.log.type
             value: manifest
-        resourcedetection/providers:
-          azure:
-            resource_attributes:
-              azure.vm.scaleset.name:
-                enabled: false
-              azure.vm.size:
-                enabled: false
-              host.id:
-                enabled: false
-              host.name:
-                enabled: false
-          detectors:
-          - ec2
-          - azure
-          - openshift
-          ec2:
-            resource_attributes:
-              cloud.availability_zone:
-                enabled: false
-              host.id:
-                enabled: false
-              host.image.id:
-                enabled: false
-              host.name:
-                enabled: false
-              host.type:
-                enabled: false
-          openshift:
-            resource_attributes:
-              k8s.cluster.name:
-                enabled: false
-          override: false
-          timeout: 2s
         swk8sattributes:
           auth_type: serviceAccount
           cronjob:
@@ -2219,7 +2084,6 @@ Events config should not contain manifest collection pipeline when disabled:
             - transform/set_labels_and_annotations_for_entities
             - transform/stringify_body
             - resource/manifest
-            - resourcedetection/providers
             - swk8sattributes
             - transform/cleanup_attributes_for_nonexisting_entities
             - filter/k8s_collector_config_include