Skip to content

Commit

Permalink
Remove tempo serverless config options
Browse files Browse the repository at this point in the history
  • Loading branch information
electron0zero committed Jan 23, 2025
1 parent 6eecb00 commit 9ff0554
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 31 deletions.
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.31.0
version: 1.32.0
appVersion: 2.7.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
8 changes: 1 addition & 7 deletions charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![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)
![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)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -737,12 +737,6 @@ The memcached default args are removed and should be provided manually. The sett
| querier.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage for the querier |
| querier.config.frontend_worker.grpc_client_config | object | `{}` | grpc client configuration |
| 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. |
| querier.config.search.external_backend | string | `""` | credentials when querying the external backend. |
| querier.config.search.external_endpoints | list | `[]` | A list of external endpoints that the querier will use to offload backend search requests |
| 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. |
| 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. |
| querier.config.search.google_cloud_run | object | `{}` | external_backend is "google_cloud_run". |
| 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. |
| querier.config.search.query_timeout | string | `"30s"` | Timeout for search requests |
| querier.config.trace_by_id.query_timeout | string | `"10s"` | Timeout for trace lookup requests |
| querier.extraArgs | list | `[]` | Additional CLI args for the querier |
Expand Down
23 changes: 0 additions & 23 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -810,20 +810,6 @@ querier:
search:
# -- Timeout for search requests
query_timeout: 30s
# -- 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.
prefer_self: 10
# -- 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.
external_hedge_requests_at: 8s
# -- The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set.
external_hedge_requests_up_to: 2
# -- A list of external endpoints that the querier will use to offload backend search requests
external_endpoints: []
# -- The serverless backend to use. The default value of "" omits
# -- credentials when querying the external backend.
external_backend: ""
# -- Google Cloud Run configuration. Will be used only if the value of
# -- external_backend is "google_cloud_run".
google_cloud_run: {}
# -- 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.
max_concurrent_queries: 20

Expand Down Expand Up @@ -1409,16 +1395,7 @@ config: |
trace_by_id:
query_timeout: {{ .Values.querier.config.trace_by_id.query_timeout }}
search:
external_endpoints: {{- toYaml .Values.querier.config.search.external_endpoints | nindent 6 }}
query_timeout: {{ .Values.querier.config.search.query_timeout }}
prefer_self: {{ .Values.querier.config.search.prefer_self }}
external_hedge_requests_at: {{ .Values.querier.config.search.external_hedge_requests_at }}
external_hedge_requests_up_to: {{ .Values.querier.config.search.external_hedge_requests_up_to }}
external_backend: {{ .Values.querier.config.search.external_backend }}
{{- if .Values.querier.config.search.google_cloud_run }}
google_cloud_run:
{{- toYaml .Values.querier.config.search.google_cloud_run | nindent 6 }}
{{- end }}
max_concurrent_queries: {{ .Values.querier.config.max_concurrent_queries }}
query_frontend:
max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }}
Expand Down

0 comments on commit 9ff0554

Please sign in to comment.