Ensure correct attributes and order of processors for `k8s.deployment…

….name` workaround (#325) * Adjust values Signed-off-by: Matej Gera <[email protected]> * Bump chart and update CHANGELOG Signed-off-by: Matej Gera <[email protected]> --------- Signed-off-by: Matej Gera <[email protected]>
coralogix · Nov 6, 2023 · a990636 · a990636
1 parent ee2d380
commit a990636
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 ## OpenTelemtry-Integration
 
-### v0.0.31 / 2023-11-03
+### v0.0.32 / 2023-11-03
+* [FIX] Ensure correct order of processors for k8s deployment attributes.
 
+### v0.0.31 / 2023-11-03
 * [FIX] Fix scraping Kube State Metrics
 * [CHORE] Update Collector to 0.88.0 (v0.76.0)
 * [FIX] Fix consistent k8s.deployment.name attribute

diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: otel-integration
 description: OpenTelemetry Integration
-version: 0.0.31
+version: 0.0.32
 keywords:
   - OpenTelemetry Collector
   - OpenTelemetry Agent
@@ -11,17 +11,17 @@ keywords:
 dependencies:
   - name: opentelemetry-collector
     alias: opentelemetry-agent
-    version: "0.76.2"
+    version: "0.76.3"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-agent-windows
-    version: "0.76.2"
+    version: "0.76.3"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent-windows.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-cluster-collector
-    version: "0.76.2"
+    version: "0.76.3"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-cluster-collector.enabled
   - name: kube-state-metrics

diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml
@@ -143,7 +143,8 @@ opentelemetry-agent:
         extract:
           metadata:
             - "k8s.namespace.name"
-            - "k8s.deployment.name"
+            # replace the below by `k8s.deployment.name` after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23067
+            - "k8s.replicaset.name"
             - "k8s.statefulset.name"
             - "k8s.daemonset.name"
             - "k8s.cronjob.name"
@@ -153,7 +154,8 @@ opentelemetry-agent:
       spanmetrics:
         metrics_exporter: coralogix
         dimensions:
-          - name: "k8s.deployment.name"
+          # replace the below by `k8s.deployment.name` after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23067
+          - name: "k8s.replicaset.name"
           - name: "k8s.statefulset.name"
           - name: "k8s.daemonset.name"
           - name: "k8s.cronjob.name"
@@ -342,7 +344,8 @@ opentelemetry-cluster-collector:
         extract:
           metadata:
             - "k8s.namespace.name"
-            - "k8s.deployment.name"
+            # replace the below by `k8s.deployment.name` after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23067
+            - "k8s.replicaset.name"
             - "k8s.statefulset.name"
             - "k8s.daemonset.name"
             - "k8s.cronjob.name"