From 17ea39db4da504549fb77c66e490211ec396e074 Mon Sep 17 00:00:00 2001 From: Maxime Laboissonniere Date: Wed, 5 Feb 2025 16:44:52 +0100 Subject: [PATCH] fix --- .../templates/_otelcol_connector_servicegraph.alloy.txt | 2 +- .../templates/_otelcol_connector_spanmetrics.alloy.txt | 5 ++++- charts/grafana-sampling/values.yaml | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.alloy.txt b/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.alloy.txt index 1b8fe65b8a..951e6366e5 100644 --- a/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.alloy.txt +++ b/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.alloy.txt @@ -6,7 +6,7 @@ otelcol.connector.servicegraph "default" { {{ . | quote }}, {{- end }} ] - latency_histogram_buckets = ["0s", "0.005s", "0.01s", "0.025s", "0.05s", "0.075s", "0.1s", "0.25s", "0.5s", "0.75s", "1s", "2.5s", "5s", "7.5s", "10s"] + latency_histogram_buckets = buckets = [{{- join ", " .Values.metricsGeneration.buckets }}] store { ttl = "2s" diff --git a/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.alloy.txt b/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.alloy.txt index 29aead33aa..a8b832e904 100644 --- a/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.alloy.txt +++ b/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.alloy.txt @@ -21,11 +21,14 @@ otelcol.connector.spanmetrics "default" { namespace = "traces.spanmetrics" {{- end }} + metrics_expiration = {{ .Values.metricsGeneration.expiration }} + metrics_flush_interval = {{ .Values.metricsGeneration.flushInterval }} + histogram { unit = "s" explicit { - buckets = ["0s", "0.005s", "0.01s", "0.025s", "0.05s", "0.075s", "0.1s", "0.25s", "0.5s", "0.75s", "1s", "2.5s", "5s", "7.5s", "10s"] + buckets = [{{- join ", " .Values.metricsGeneration.buckets }}] } } diff --git a/charts/grafana-sampling/values.yaml b/charts/grafana-sampling/values.yaml index f5d6e07ba8..17a5f29959 100644 --- a/charts/grafana-sampling/values.yaml +++ b/charts/grafana-sampling/values.yaml @@ -3,6 +3,12 @@ metricsGeneration: enabled: true # -- Use legacy metric names that match those used by the Tempo metrics generator. legacy: true + # -- How often to flush generated metrics. + flushInterval: "15s" + # -- Time period after which metrics are considered stale and are removed from the cache. + expiration: "0s" + # -- List of histogram buckets. + buckets: ["0s", "0.005s", "0.01s", "0.025s", "0.05s", "0.075s", "0.1s", "0.25s", "0.5s", "0.75s", "1s", "2.5s", "5s", "7.5s", "10s"] # -- Additional dimensions to add to generated metrics. dimensions: - service.namespace