Merge branch 'main' into mcp-grafana

Author: jkroepke

charts/grafana/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 9.2.3
-appVersion: 12.0.1
+version: 9.2.6
+appVersion: 12.0.1-security-01
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com

charts/grafana/templates/_pod.tpl

@@ -1330,21 +1330,25 @@ volumes:
   {{- end }}
   {{- if .Values.sidecar.alerts.enabled }}
   - name: sc-alerts-volume
+    {{- if .Values.sidecar.alerts.sizeLimit }}
     emptyDir:
       {{- with .Values.sidecar.alerts.sizeLimit }}
       sizeLimit: {{ . }}
-      {{- else }}
-      {}
       {{- end }}
+    {{- else }}
+    emptyDir: {}
+    {{- end }}
   {{- end }}
   {{- if .Values.sidecar.dashboards.enabled }}
   - name: sc-dashboard-volume
+    {{- if .Values.sidecar.dashboards.sizeLimit }}
     emptyDir:
       {{- with .Values.sidecar.dashboards.sizeLimit }}
       sizeLimit: {{ . }}
-      {{- else }}
-      {}
       {{- end }}
+    {{- else }}
+    emptyDir: {}
+    {{- end }}
   {{- if .Values.sidecar.dashboards.SCProvider }}
   - name: sc-dashboard-provider
     configMap:
@@ -1353,30 +1357,36 @@ volumes:
   {{- end }}
   {{- if .Values.sidecar.datasources.enabled }}
   - name: sc-datasources-volume
+    {{- if .Values.sidecar.datasources.sizeLimit }}
     emptyDir:
       {{- with .Values.sidecar.datasources.sizeLimit }}
       sizeLimit: {{ . }}
-      {{- else }}
-      {}
       {{- end }}
+    {{- else }}
+    emptyDir: {}
+    {{- end }}
   {{- end }}
   {{- if .Values.sidecar.plugins.enabled }}
   - name: sc-plugins-volume
+    {{- if .Values.sidecar.plugins.sizeLimit }}
     emptyDir:
       {{- with .Values.sidecar.plugins.sizeLimit }}
       sizeLimit: {{ . }}
-      {{- else }}
-      {}
       {{- end }}
+    {{- else }}
+    emptyDir: {}
+    {{- end }}
   {{- end }}
   {{- if .Values.sidecar.notifiers.enabled }}
   - name: sc-notifiers-volume
+    {{- if .Values.sidecar.notifiers.sizeLimit }}
     emptyDir:
       {{- with .Values.sidecar.notifiers.sizeLimit }}
       sizeLimit: {{ . }}
-      {{- else }}
-      {}
       {{- end }}
+    {{- else }}
+    emptyDir: {}
+    {{- end }}
   {{- end }}
   {{- range .Values.extraSecretMounts }}
   {{- if .secretName }}
@@ -1429,4 +1439,4 @@ volumes:
   {{- with .Values.extraContainerVolumes }}
   {{- tpl (toYaml .) $root | nindent 2 }}
   {{- end }}
-{{- end }}
+{{- end }}

charts/grafana/templates/route.yaml

@@ -32,6 +32,8 @@ spec:
     - backendRefs:
         - name: {{ include "grafana.fullname" $ }}
           port: {{ $.Values.service.port }}
+          group: ''
+          kind: Service
       {{- with $route.filters }}
       filters:
         {{- toYaml . | nindent 8 }}

charts/grafana/values.yaml

@@ -1063,7 +1063,7 @@ sidecar:
     # Additional alerts sidecar volume mounts
     extraMounts: []
     # Sets the size limit of the alert sidecar emptyDir volume
-    sizeLimit: {}
+    sizeLimit: ""
   dashboards:
     enabled: false
     # Additional environment variables for the dashboards sidecar
@@ -1167,7 +1167,7 @@ sidecar:
     # Additional dashboards sidecar volume mounts
     extraMounts: []
     # Sets the size limit of the dashboard sidecar emptyDir volume
-    sizeLimit: {}
+    sizeLimit: ""
   datasources:
     enabled: false
     # Additional environment variables for the datasourcessidecar
@@ -1248,7 +1248,7 @@ sidecar:
     # Additional datasources sidecar volume mounts
     extraMounts: []
     # Sets the size limit of the datasource sidecar emptyDir volume
-    sizeLimit: {}
+    sizeLimit: ""
   plugins:
     enabled: false
     # Additional environment variables for the plugins sidecar
@@ -1316,7 +1316,7 @@ sidecar:
     # Additional plugins sidecar volume mounts
     extraMounts: []
     # Sets the size limit of the plugin sidecar emptyDir volume
-    sizeLimit: {}
+    sizeLimit: ""
   notifiers:
     enabled: false
     # Additional environment variables for the notifierssidecar
@@ -1384,7 +1384,7 @@ sidecar:
     # Additional notifiers sidecar volume mounts
     extraMounts: []
     # Sets the size limit of the notifier sidecar emptyDir volume
-    sizeLimit: {}
+    sizeLimit: ""
 
 ## Override the deployment namespace
 ##

charts/tempo-distributed/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.42.1
+version: 1.42.2
 appVersion: 2.8.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.42.1](https://img.shields.io/badge/Version-1.42.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
+![Version: 1.42.2](https://img.shields.io/badge/Version-1.42.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

charts/tempo-distributed/values.yaml

@@ -1445,6 +1445,7 @@ config: |
     search:
       target_bytes_per_job: {{ .Values.queryFrontend.config.search.target_bytes_per_job }}
       concurrent_jobs: {{ .Values.queryFrontend.config.search.concurrent_jobs }}
+      max_spans_per_span_set: {{ .Values.queryFrontend.config.search.max_spans_per_span_set }}
     trace_by_id:
       query_shards: {{ .Values.queryFrontend.config.trace_by_id.query_shards }}
     metrics: