From f10c1a9dc80da6370ce5f0c02831405857d318f2 Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Tue, 23 Jan 2024 11:49:36 +0900 Subject: [PATCH 1/7] Update values.yaml Signed-off-by: Brent Villanueva --- charts/tempo-distributed/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index faf845caf6..cc6e87c984 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -692,6 +692,9 @@ queryFrontend: config: # -- Number of times to retry a request sent to a querier max_retries: 2 + + # -- Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429. + max_outstanding_per_tenant: 2000 search: # -- The number of concurrent jobs to execute when searching the backend concurrent_jobs: 1000 @@ -1190,6 +1193,7 @@ config: | {{- end }} max_concurrent_queries: {{ .Values.querier.config.max_concurrent_queries }} query_frontend: + max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }} max_retries: {{ .Values.queryFrontend.config.max_retries }} search: target_bytes_per_job: {{ .Values.queryFrontend.config.search.target_bytes_per_job }} From fba2ed27c3ff5e7eaaf633cf2103413605d7b412 Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Tue, 23 Jan 2024 12:00:26 +0900 Subject: [PATCH 2/7] remove space Signed-off-by: Brent Villanueva --- charts/tempo-distributed/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index cc6e87c984..4492d6aae7 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -692,7 +692,6 @@ queryFrontend: config: # -- Number of times to retry a request sent to a querier max_retries: 2 - # -- Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429. max_outstanding_per_tenant: 2000 search: From afc3b5d1bb689bb9cf3bc14fbf06d707d6957fcf Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Tue, 23 Jan 2024 12:04:45 +0900 Subject: [PATCH 3/7] reverse the order Signed-off-by: Brent Villanueva --- charts/tempo-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 4492d6aae7..a9002202a0 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1192,8 +1192,8 @@ config: | {{- end }} max_concurrent_queries: {{ .Values.querier.config.max_concurrent_queries }} query_frontend: - max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }} max_retries: {{ .Values.queryFrontend.config.max_retries }} + max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }} search: target_bytes_per_job: {{ .Values.queryFrontend.config.search.target_bytes_per_job }} concurrent_jobs: {{ .Values.queryFrontend.config.search.concurrent_jobs }} From eb1f69b45584726e1cc883ef5f3a060f74cfc834 Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Wed, 31 Jan 2024 11:25:15 +0900 Subject: [PATCH 4/7] add doc Signed-off-by: Brent Villanueva --- charts/tempo-distributed/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index d4a202c2a2..f76163e0c7 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -662,6 +662,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.autoscaling.targetCPUUtilizationPercentage | int | `60` | Target CPU utilisation percentage for the query-frontend | | queryFrontend.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage for the query-frontend | | queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier | +| queryFrontend.config.max_outstanding_per_tenant | int | `2000` | Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429. | | queryFrontend.config.search.concurrent_jobs | int | `1000` | The number of concurrent jobs to execute when searching the backend | | queryFrontend.config.search.target_bytes_per_job | int | `104857600` | The target number of bytes for each job to handle when performing a backend search | | queryFrontend.config.trace_by_id | object | `{"hedge_requests_at":"2s","hedge_requests_up_to":2,"query_shards":50}` | Trace by ID lookup configuration | From 438bf586a6b97bbb3ea4b81a34b0159810ffa2ab Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Wed, 31 Jan 2024 11:32:56 +0900 Subject: [PATCH 5/7] bump version Signed-off-by: Brent Villanueva --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 3bc746d689..97d9d2b5fd 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.0 +version: 1.8.3 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index f76163e0c7..df1471c60c 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 669c95c1ec9acb40af5d0bfc8aadcd309c6c193f Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Thu, 1 Feb 2024 16:41:17 +0900 Subject: [PATCH 6/7] ran helm-docs Signed-off-by: Brent Villanueva --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index df1471c60c..5c36890382 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -661,8 +661,8 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.autoscaling.minReplicas | int | `1` | Minimum autoscaling replicas for the query-frontend | | queryFrontend.autoscaling.targetCPUUtilizationPercentage | int | `60` | Target CPU utilisation percentage for the query-frontend | | queryFrontend.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage for the query-frontend | -| queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier | | queryFrontend.config.max_outstanding_per_tenant | int | `2000` | Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429. | +| queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier | | queryFrontend.config.search.concurrent_jobs | int | `1000` | The number of concurrent jobs to execute when searching the backend | | queryFrontend.config.search.target_bytes_per_job | int | `104857600` | The target number of bytes for each job to handle when performing a backend search | | queryFrontend.config.trace_by_id | object | `{"hedge_requests_at":"2s","hedge_requests_up_to":2,"query_shards":50}` | Trace by ID lookup configuration | From 5988b4743d2e16c75554d411d14c8141d3b800ea Mon Sep 17 00:00:00 2001 From: Brent Villanueva Date: Thu, 1 Feb 2024 16:43:53 +0900 Subject: [PATCH 7/7] alphabetical order on config Signed-off-by: Brent Villanueva --- charts/tempo-distributed/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index a9002202a0..72fe8868c2 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -690,10 +690,10 @@ queryFrontend: # hostnames: # - domain.tld config: - # -- Number of times to retry a request sent to a querier - max_retries: 2 # -- Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429. max_outstanding_per_tenant: 2000 + # -- Number of times to retry a request sent to a querier + max_retries: 2 search: # -- The number of concurrent jobs to execute when searching the backend concurrent_jobs: 1000 @@ -1192,8 +1192,8 @@ config: | {{- end }} max_concurrent_queries: {{ .Values.querier.config.max_concurrent_queries }} query_frontend: - max_retries: {{ .Values.queryFrontend.config.max_retries }} max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }} + max_retries: {{ .Values.queryFrontend.config.max_retries }} search: target_bytes_per_job: {{ .Values.queryFrontend.config.search.target_bytes_per_job }} concurrent_jobs: {{ .Values.queryFrontend.config.search.concurrent_jobs }}