Skip to content

Commit 16af43e

Browse files
committed
Remove tempo serverless config options
Signed-off-by: Suraj Nath <[email protected]>
1 parent 6eecb00 commit 16af43e

File tree

3 files changed

+2
-31
lines changed

3 files changed

+2
-31
lines changed

charts/tempo-distributed/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.31.0
5+
version: 1.32.0
66
appVersion: 2.7.0
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.31.0](https://img.shields.io/badge/Version-1.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
3+
![Version: 1.32.0](https://img.shields.io/badge/Version-1.32.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

@@ -737,12 +737,6 @@ The memcached default args are removed and should be provided manually. The sett
737737
| querier.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage for the querier |
738738
| querier.config.frontend_worker.grpc_client_config | object | `{}` | grpc client configuration |
739739
| querier.config.max_concurrent_queries | int | `20` | This value controls the overall number of simultaneous subqueries that the querier will service at once. It does not distinguish between the types of queries. |
740-
| querier.config.search.external_backend | string | `""` | credentials when querying the external backend. |
741-
| querier.config.search.external_endpoints | list | `[]` | A list of external endpoints that the querier will use to offload backend search requests |
742-
| querier.config.search.external_hedge_requests_at | string | `"8s"` | If set to a non-zero value a second request will be issued at the provided duration. Recommended to be set to p99 of external search requests to reduce long tail latency. |
743-
| querier.config.search.external_hedge_requests_up_to | int | `2` | The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. |
744-
| querier.config.search.google_cloud_run | object | `{}` | external_backend is "google_cloud_run". |
745-
| querier.config.search.prefer_self | int | `10` | If search_external_endpoints is set then the querier will primarily act as a proxy for whatever serverless backend you have configured. This setting allows the operator to have the querier prefer itself for a configurable number of subqueries. |
746740
| querier.config.search.query_timeout | string | `"30s"` | Timeout for search requests |
747741
| querier.config.trace_by_id.query_timeout | string | `"10s"` | Timeout for trace lookup requests |
748742
| querier.extraArgs | list | `[]` | Additional CLI args for the querier |

charts/tempo-distributed/values.yaml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -810,20 +810,6 @@ querier:
810810
search:
811811
# -- Timeout for search requests
812812
query_timeout: 30s
813-
# -- If search_external_endpoints is set then the querier will primarily act as a proxy for whatever serverless backend you have configured. This setting allows the operator to have the querier prefer itself for a configurable number of subqueries.
814-
prefer_self: 10
815-
# -- If set to a non-zero value a second request will be issued at the provided duration. Recommended to be set to p99 of external search requests to reduce long tail latency.
816-
external_hedge_requests_at: 8s
817-
# -- The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set.
818-
external_hedge_requests_up_to: 2
819-
# -- A list of external endpoints that the querier will use to offload backend search requests
820-
external_endpoints: []
821-
# -- The serverless backend to use. The default value of "" omits
822-
# -- credentials when querying the external backend.
823-
external_backend: ""
824-
# -- Google Cloud Run configuration. Will be used only if the value of
825-
# -- external_backend is "google_cloud_run".
826-
google_cloud_run: {}
827813
# -- This value controls the overall number of simultaneous subqueries that the querier will service at once. It does not distinguish between the types of queries.
828814
max_concurrent_queries: 20
829815

@@ -1409,16 +1395,7 @@ config: |
14091395
trace_by_id:
14101396
query_timeout: {{ .Values.querier.config.trace_by_id.query_timeout }}
14111397
search:
1412-
external_endpoints: {{- toYaml .Values.querier.config.search.external_endpoints | nindent 6 }}
14131398
query_timeout: {{ .Values.querier.config.search.query_timeout }}
1414-
prefer_self: {{ .Values.querier.config.search.prefer_self }}
1415-
external_hedge_requests_at: {{ .Values.querier.config.search.external_hedge_requests_at }}
1416-
external_hedge_requests_up_to: {{ .Values.querier.config.search.external_hedge_requests_up_to }}
1417-
external_backend: {{ .Values.querier.config.search.external_backend }}
1418-
{{- if .Values.querier.config.search.google_cloud_run }}
1419-
google_cloud_run:
1420-
{{- toYaml .Values.querier.config.search.google_cloud_run | nindent 6 }}
1421-
{{- end }}
14221399
max_concurrent_queries: {{ .Values.querier.config.max_concurrent_queries }}
14231400
query_frontend:
14241401
max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }}

0 commit comments

Comments
 (0)