From 39cea7785af44ab3d682272e33e8d69c53175cf4 Mon Sep 17 00:00:00 2001 From: Alex Bikfalvi Date: Tue, 12 Nov 2024 20:59:30 -0500 Subject: [PATCH 1/2] docs: Remove duplicated examples (#4295) This removes duplicates examples from the Configure TraceQL metrics page. Signed-off-by: Alex Bikfalvi (cherry picked from commit 8ba6c50a2132c64580307968ce9e818d58225855) --- .../tempo/operations/traceql-metrics.md | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/docs/sources/tempo/operations/traceql-metrics.md b/docs/sources/tempo/operations/traceql-metrics.md index c0eb42ea557..d925f682f2f 100644 --- a/docs/sources/tempo/operations/traceql-metrics.md +++ b/docs/sources/tempo/operations/traceql-metrics.md @@ -82,48 +82,11 @@ metrics_generator: Setting `flush_to_storage` to `true` ensures that metrics blocks are flushed to storage so TraceQL metrics queries against historical data. -For more information about overrides, refer to [Standard overrides](https://grafana.com/docs/tempo//configuration/#standard-overrides). - - ```yaml - overrides: - 'tenantID': - metrics_generator_processors: - - local-blocks - ``` - -By default, for all tenants in the main configuration: - - ```yaml - overrides: - defaults: - metrics_generator: - processors: [local-blocks] - ``` - -Add this configuration to run TraceQL metrics queries against all spans (and not just server spans): - -```yaml -metrics_generator: - processor: - local_blocks: - filter_server_spans: false -``` - If you configured Tempo using the `tempo-distributed` Helm chart, you can also set `traces_storage` using your `values.yaml` file. Refer to the [Helm chart for an example](https://github.com/grafana/helm-charts/blob/559ecf4a9c9eefac4521454e7a8066778e4eeff7/charts/tempo-distributed/values.yaml#L362). -```yaml -metrics_generator: - processor: - local_blocks: - flush_to_storage: true -``` - -Setting `flush_to_storage` to `true` ensures that metrics blocks are flushed to storage so TraceQL metrics queries against historical data. - For more information about overrides, refer to [Standard overrides](https://grafana.com/docs/tempo//configuration/#standard-overrides). - ## Evaluate query timeouts Because of their expensive nature, these queries can take a long time to run. From c5aec8563139109189d037c0976c6746b829dd66 Mon Sep 17 00:00:00 2001 From: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com> Date: Thu, 14 Nov 2024 01:01:25 -0500 Subject: [PATCH 2/2] Update docs/sources/tempo/operations/traceql-metrics.md --- docs/sources/tempo/operations/traceql-metrics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/tempo/operations/traceql-metrics.md b/docs/sources/tempo/operations/traceql-metrics.md index d925f682f2f..f7854856176 100644 --- a/docs/sources/tempo/operations/traceql-metrics.md +++ b/docs/sources/tempo/operations/traceql-metrics.md @@ -84,7 +84,7 @@ Setting `flush_to_storage` to `true` ensures that metrics blocks are flushed to If you configured Tempo using the `tempo-distributed` Helm chart, you can also set `traces_storage` using your `values.yaml` file. Refer to the [Helm chart for an example](https://github.com/grafana/helm-charts/blob/559ecf4a9c9eefac4521454e7a8066778e4eeff7/charts/tempo-distributed/values.yaml#L362). - + For more information about overrides, refer to [Standard overrides](https://grafana.com/docs/tempo//configuration/#standard-overrides). ## Evaluate query timeouts