Merge branch 'main' into main

grafana · Aug 26, 2024 · 2dbb6d0 · 2dbb6d0
2 parents d111b38 + 0af99fa
commit 2dbb6d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: grafana-sampling
 description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline.
 type: application
-version: 1.0.0
+version: 1.0.1
 appVersion: "v1.3.0"
 sources:
   - https://github.com/grafana/alloy

diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md
@@ -1,6 +1,6 @@
 # grafana-sampling
 
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.0](https://img.shields.io/badge/AppVersion-v1.3.0-informational?style=flat-square)
+![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.0](https://img.shields.io/badge/AppVersion-v1.3.0-informational?style=flat-square)
 
 A Helm chart for a layered OTLP tail sampling and metrics generation pipeline.
 

diff --git a/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.alloy.txt b/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.alloy.txt
@@ -7,6 +7,16 @@ otelcol.connector.spanmetrics "default" {
   }
   {{- end }}
 
+  resource_metrics_key_attributes = [
+    "service.name",
+    "span.name",
+    "span.kind",
+    "status.code",
+    {{- range $.Values.metricsGeneration.dimensions }}
+    {{ . | quote }},
+    {{- end }}
+  ]
+
   {{ if .Values.metricsGeneration.legacy }}
   namespace = "traces.spanmetrics"
   {{- end }}