Merge pull request #18 from lightstep/mohosman/LS-44100/remove-service-name-relabeling

LS-44100:(helm): remove service.name relabeling from resource attributes

Author: moh-osman3

charts/collector-k8s/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: otelcollector
 description: Chart for using the OpenTelemetry Collector to scape static or dynamic metric targets.
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: 0.61.0
 dependencies:
 # cert manager must be manually installed because it has CRDs

charts/collector-k8s/values-daemonset.yaml

@@ -35,26 +35,6 @@ collectors:
           send_batch_size: 1000
           timeout: 1s
           send_batch_max_size: 1500
-        resource:
-          attributes:
-          - key: job
-            from_attribute: service.name
-            action: insert
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.daemonset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.replicaset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.statefulset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.job.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.cronjob.name
 
       exporters:
         otlp:
@@ -66,7 +46,7 @@ collectors:
         pipelines:
           metrics:
             receivers: [prometheus]
-            processors: [memory_limiter, resourcedetection/gke, resource, batch]
+            processors: [memory_limiter, resourcedetection/gke, batch]
             exporters: [otlp]
 
   # The daemonset collector should be configured to scrape general app metrics that contains `prometheus.io/scrape: true` annotation.
@@ -106,26 +86,6 @@ collectors:
           send_batch_size: 1000
           timeout: 1s
           send_batch_max_size: 1500
-        resource:
-          attributes:
-          - key: job
-            from_attribute: service.name
-            action: insert
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.daemonset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.replicaset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.statefulset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.job.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.cronjob.name
 
       exporters:
         otlp:
@@ -137,5 +97,5 @@ collectors:
         pipelines:
           metrics:
             receivers: [prometheus]
-            processors: [memory_limiter, resourcedetection/gke, resource, batch]
+            processors: [memory_limiter, resourcedetection/gke, batch]
             exporters: [otlp]

charts/collector-k8s/values-statefulset.yaml

@@ -43,24 +43,6 @@ collectors:
           send_batch_max_size: 1500
         resource:
           attributes:
-          - key: job
-            from_attribute: service.name
-            action: insert
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.daemonset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.replicaset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.statefulset.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.job.name
-          - key: service.name
-            action: upsert
-            from_attribute: k8s.cronjob.name
           - key: collector.name
             value: "${KUBE_POD_NAME}"
             action: insert

charts/kube-otel-stack/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kube-otel-stack
 description: Chart for sending Kubernetes metrics to Lightstep using the OpenTelemetry Operator.
 type: application
-version: 0.2.6
+version: 0.2.7
 appVersion: 0.70.0
 dependencies:
 # cert manager must be manually installed because it has CRDs

charts/kube-otel-stack/values.yaml

@@ -150,24 +150,6 @@ metricsCollector:
         send_batch_max_size: 1500
       resource:
         attributes:
-        - key: job
-          from_attribute: service.name
-          action: insert
-        - key: service.name
-          action: upsert
-          from_attribute: k8s.daemonset.name
-        - key: service.name
-          action: upsert
-          from_attribute: k8s.replicaset.name
-        - key: service.name
-          action: upsert
-          from_attribute: k8s.statefulset.name
-        - key: service.name
-          action: upsert
-          from_attribute: k8s.job.name
-        - key: service.name
-          action: upsert
-          from_attribute: k8s.cronjob.name
         - key: collector.name
           value: "${KUBE_POD_NAME}"
           action: insert