Skip to content

Commit 6965eff

Browse files
authored
Merge branch 'main' into main
2 parents 0bd9066 + c9fdef2 commit 6965eff

19 files changed

+22
-8
lines changed

charts/grafana-mcp/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana-mcp
3-
version: 0.1.0
3+
version: 0.1.1
44
appVersion: latest
55
kubeVersion: "^1.8.0-0"
66
description: MCP server for Grafana.

charts/grafana-mcp/templates/ingress.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.ingress.enabled }}
12
{{- $fullName := include "grafana-mcp.fullname" . }}
23
{{- $svcPort := .Values.service.port }}
34
{{- if and .Values.ingress.className (not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class")) }}
@@ -45,3 +46,4 @@ spec:
4546
number: {{ $svcPort }}
4647
{{- end }}
4748
{{- end }}
49+
{{- end }}

charts/synthetic-monitoring-agent/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: v0.34.4
2+
appVersion: v0.38.3
33
description: Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets.
44
home: https://grafana.net
55
icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
@@ -14,4 +14,4 @@ name: synthetic-monitoring-agent
1414
sources:
1515
- https://github.com/grafana/synthetic-monitoring-agent
1616
type: application
17-
version: 1.0.0
17+
version: 1.1.0

charts/synthetic-monitoring-agent/README.md

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

3-
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.34.4](https://img.shields.io/badge/AppVersion-v0.34.4-informational?style=flat-square)
3+
![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.38.3](https://img.shields.io/badge/AppVersion-v0.38.3-informational?style=flat-square)
44

55
Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets.
66

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.46.0
5+
version: 1.46.2
66
appVersion: 2.8.1
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

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

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

55
Grafana Tempo in MicroService mode
66

@@ -408,7 +408,7 @@ The memcached default args are removed and should be provided manually. The sett
408408
| distributor.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string |
409409
| enterprise.enabled | bool | `false` | |
410410
| enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Traces container image repository. Note: for Grafana Tempo use the value 'image.repository' |
411-
| enterprise.image.tag | string | `"v2.6.1"` | Grafana Enterprise Traces container image tag. Note: for Grafana Tempo use the value 'image.tag' |
411+
| enterprise.image.tag | string | `"v2.8.1"` | Grafana Enterprise Traces container image tag. Note: for Grafana Tempo use the value 'image.tag' |
412412
| enterpriseFederationFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string |
413413
| enterpriseFederationFrontend.autoscaling.enabled | bool | `false` | Enable autoscaling for the federation-frontend |
414414
| enterpriseFederationFrontend.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the federation-frontend |

charts/tempo-distributed/templates/compactor/poddisruptionbudget-compactor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: {{ include "tempo.pdb.apiVersion" . }}
44
kind: PodDisruptionBudget
55
metadata:
66
name: {{ include "tempo.resourceName" $dict }}
7+
namespace: {{ .Release.Namespace }}
78
labels:
89
{{- include "tempo.labels" $dict | nindent 4 }}
910
spec:

charts/tempo-distributed/templates/compactor/service-compactor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
name: {{ template "tempo.resourceName" (dict "ctx" . "component" "compactor") }}
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
{{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }}
78
{{- with .Values.compactor.service.annotations }}

charts/tempo-distributed/templates/distributor/hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: {{ $apiVersion }}
44
kind: HorizontalPodAutoscaler
55
metadata:
66
name: {{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}
7+
namespace: {{ .Release.Namespace }}
78
labels:
89
{{- include "tempo.labels" (dict "ctx" . "component" "distributor") | nindent 4 }}
910
spec:

charts/tempo-distributed/templates/distributor/poddisruptionbudget-distributor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: {{ include "tempo.pdb.apiVersion" . }}
44
kind: PodDisruptionBudget
55
metadata:
66
name: {{ include "tempo.resourceName" $dict }}
7+
namespace: {{ .Release.Namespace }}
78
labels:
89
{{- include "tempo.labels" $dict | nindent 4 }}
910
spec:

0 commit comments

Comments
 (0)