From 0af99fac51424d0e5bb19e0da25a7750d3062f42 Mon Sep 17 00:00:00 2001 From: Robert Lankford Date: Mon, 26 Aug 2024 09:11:29 -0700 Subject: [PATCH] [grafana-sampling] set resource_metrics_key_attributes to match dimensions in spanmetrics connector (#3279) * set resource_metrics_key_attributes to match dimensions in spanmetrics connector --------- Signed-off-by: Robbie Lankford Co-authored-by: MH --- charts/grafana-sampling/Chart.yaml | 2 +- charts/grafana-sampling/README.md | 2 +- .../templates/_otelcol_connector_spanmetrics.alloy.txt | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml index 00abebbde7..e6e44c81da 100644 --- 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 index 3ead959cc8..81e00e5800 100644 --- 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 index f66f5bd860..29aead33aa 100644 --- 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 }}