Skip to content

Commit d86760d

Browse files
Merge pull request #4117 from grafana/remove_mcp_server_get
[tempo-distributed] remove mcp_server config for GET v2.8.x compatibility
2 parents afc9783 + de3711d commit d86760d

File tree

3 files changed

+4
-2
lines changed

3 files changed

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

charts/tempo-distributed/README.md

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

3-
![Version: 1.61.1](https://img.shields.io/badge/Version-1.61.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)
3+
![Version: 1.61.2](https://img.shields.io/badge/Version-1.61.2-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

charts/tempo-distributed/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,8 +1567,10 @@ config: |
15671567
query_timeout: {{ .Values.querier.config.search.query_timeout }}
15681568
max_concurrent_queries: {{ .Values.querier.config.max_concurrent_queries }}
15691569
query_frontend:
1570+
{{- if not .Values.enterprise.enabled }}
15701571
mcp_server:
15711572
enabled: {{ .Values.queryFrontend.mcp_server.enabled }}
1573+
{{- end }}
15721574
max_outstanding_per_tenant: {{ .Values.queryFrontend.config.max_outstanding_per_tenant }}
15731575
max_retries: {{ .Values.queryFrontend.config.max_retries }}
15741576
search:

0 commit comments

Comments
 (0)