Skip to content

Commit f829245

Browse files
Merge pull request #4040 from qclaogui/add-missing-config-in-tempo-gateway
[tempo-distributed] Add tempo-gateway (nginx) config in tempo-distributed to enable TraceQL streaming
2 parents e5edbec + 5b9edb7 commit f829245

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
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.58.0
5+
version: 1.58.1
66
appVersion: 2.9.0
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

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

55
Grafana Tempo in MicroService mode
66

@@ -988,6 +988,7 @@ The memcached default args are removed and should be provided manually. The sett
988988
| storage.trace.pool.max_workers | int | `400` | Total number of workers pulling jobs from the queue |
989989
| storage.trace.pool.queue_depth | int | `20000` | Length of job queue. imporatant for querier as it queues a job for every block it has to search |
990990
| storage.trace.search.prefetch_trace_count | int | `1000` | Number of traces to prefetch while scanning blocks. Increasing this value can improve trace search performance at the cost of memory. |
991+
| streamOverHTTPEnabled | bool | `false` | Enable streaming over HTTP for tempo and Tempo gateway(nginx) |
991992
| tempo.image.pullPolicy | string | `"IfNotPresent"` | |
992993
| tempo.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` |
993994
| tempo.image.registry | string | `"docker.io"` | The Docker registry |

charts/tempo-distributed/values.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ externalConfigVersion: '0'
5959
# -- If true, Tempo will report anonymous usage data about the shape of a deployment to Grafana Labs
6060
reportingEnabled: true
6161

62+
# -- Enable streaming over HTTP for tempo and Tempo gateway(nginx)
63+
streamOverHTTPEnabled: false
64+
6265
tempo:
6366
image:
6467
# -- The Docker registry
@@ -1331,6 +1334,8 @@ memberlist:
13311334
config: |
13321335
multitenancy_enabled: {{ .Values.multitenancyEnabled }}
13331336
1337+
stream_over_http_enabled: {{ .Values.streamOverHTTPEnabled }}
1338+
13341339
usage_report:
13351340
reporting_enabled: {{ .Values.reportingEnabled }}
13361341
@@ -2242,6 +2247,14 @@ gateway:
22422247
server {
22432248
listen 8080;
22442249
2250+
{{- if .Values.streamOverHTTPEnabled }}
2251+
http2 on;
2252+
location /tempopb.StreamingQuerier/ {
2253+
set $query_frontend {{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
2254+
grpc_pass grpc://$query_frontend:3200;
2255+
}
2256+
{{- end }}
2257+
22452258
{{- if .Values.gateway.basicAuth.enabled }}
22462259
auth_basic "Tempo";
22472260
auth_basic_user_file /etc/nginx/secrets/.htpasswd;

0 commit comments

Comments
 (0)