Merge branch 'main' into chore/tempo-helm/memcached-v1639

Signed-off-by: Fabian <[email protected]>

Author: fabian-woelk-el

charts/grafana-mcp/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana-mcp
-version: 0.1.2
+version: 0.1.3
 appVersion: latest
 kubeVersion: "^1.8.0-0"
 description: MCP server for Grafana.

charts/grafana-mcp/templates/deployment.yaml

@@ -101,7 +101,8 @@ spec:
           env:
             - name: GRAFANA_URL
               value: {{ .Values.grafana.url | quote }}
-            - name: GRAFANA_API_KEY
+            {{- if or .Values.grafana.apiKey .Values.grafana.apiKeySecret.name }}
+            - name: GRAFANA_SERVICE_ACCOUNT_TOKEN
               valueFrom:
                 secretKeyRef:
                   {{- if .Values.grafana.apiKey }}
@@ -111,6 +112,7 @@ spec:
                   name: {{ .Values.grafana.apiKeySecret.name }}
                   key: {{ .Values.grafana.apiKeySecret.key }}
                   {{- end }}
+            {{- end }}
             {{- range $key, $value := .Values.env }}
             - name: {{ $key | quote }}
               value: {{ $value | quote }}

charts/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 9.4.4
+version: 10.0.0
 appVersion: 12.1.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

charts/grafana/README.md

@@ -53,6 +53,16 @@ to `global.imageRegistry`. If you were not previously setting `global.image.regi
 is required on upgrade. If you were previously setting `global.image.registry`, you will
 need to instead set `global.imageRegistry`.
 
+### To 10.0.0
+
+Static alerting resources now support Helm templating. This means that alerting resources loaded from external files (`alerting.*.files`) are now processed by the Helm template engine.
+
+If you already use template expressions intended for Alertmanager (for example, `{{ $labels.instance }}`), these must now be escaped to avoid unintended Helm evaluation. To escape them, wrap the braces with an extra layer like this:
+
+`{{ "{{" }} $labels.instance {{ "}}" }}`
+
+This ensures the expressions are preserved for Alertmanager instead of being rendered by Helm.
+
 ## Configuration
 
 | Parameter                                 | Description                                   | Default                                                 |
@@ -681,7 +691,7 @@ The two possibilities for static alerting resource provisioning are:
 * The format of the files is defined in the [Grafana documentation](https://grafana.com/docs/grafana/next/alerting/set-up/provision-alerting-resources/file-provisioning/) on file provisioning.
 * The chart supports importing YAML and JSON files.
 * The filename must be unique, otherwise one volume mount will overwrite the other.
-* In case of inlining, double curly braces that arise from the Grafana configuration format and are not intended as templates for the chart must be escaped.
+* Alerting configurations support Helm templating. Double curly braces that arise from the Grafana configuration format and are not intended as templates for the chart must be escaped.
 * The number of total files under `alerting:` is not limited. Each file will end up as a volume mount in the corresponding provisioning folder of the deployed Grafana instance.
 * The file size for each import is limited by what the function `.Files.Get` can handle, which suffices for most cases.
 

charts/grafana/templates/_config.tpl

@@ -55,8 +55,8 @@ grafana.ini: |
 
 {{- range $key, $value := .Values.alerting }}
 {{- if (hasKey $value "file") }}
-{{ $key }}:
-{{- toYaml ( $files.Get $value.file ) | nindent 2 }}
+{{ $key }}: |
+{{- tpl ($files.Get $value.file) $root | nindent 2 }}
 {{- else if (or (hasKey $value "secret") (hasKey $value "secretFile"))}}
 {{/*  will be stored inside secret generated by "configSecret.yaml"*/}}
 {{- else }}

charts/grafana/values.yaml

@@ -569,7 +569,7 @@ envFromSecrets: []
 ##   prefix: prefix
 ##   optional: true
 
-## The names of conifgmaps in the same kubernetes namespace which contain values to be added to the environment
+## The names of configmaps in the same kubernetes namespace which contain values to be added to the environment
 ## Each entry should contain a name key, and can optionally specify whether the configmap must be defined with an optional key.
 ## Name is templated.
 ## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapenvsource-v1-core

charts/tempo-distributed/Chart.yaml

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

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.47.2](https://img.shields.io/badge/Version-1.47.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
+![Version: 1.47.4](https://img.shields.io/badge/Version-1.47.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -372,6 +372,7 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.config.log_discarded_spans.include_all_attributes | bool | `false` |  |
 | distributor.config.log_received_spans | object | `{"enabled":false,"filter_by_status_error":false,"include_all_attributes":false}` | Enable to log every received span to help debug ingestion or calculate span error distributions using the logs |
 | distributor.config.log_received_traces | string | `nil` | WARNING: Deprecated. Use log_received_spans instead. |
+| distributor.config.max_attribute_bytes | int | `0` | Trace Attribute bytes limit. This is the maximum number of bytes that can be used in a trace.0 for no limit. |
 | distributor.extraArgs | list | `[]` | Additional CLI args for the distributor |
 | distributor.extraContainers | list | `[]` | Containers to add to the distributor pod |
 | distributor.extraEnv | list | `[]` | Environment variables to add to the distributor pods |
@@ -384,6 +385,7 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.image.repository | string | `nil` | Docker image repository for the distributor image. Overrides `tempo.image.repository` |
 | distributor.image.tag | string | `nil` | Docker image tag for the distributor image. Overrides `tempo.image.tag` |
 | distributor.initContainers | list | `[]` | Init containers to add to the distributor pods |
+| distributor.lifecycle | object | `{}` | Container lifecycle hooks for the distributor |
 | distributor.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
 | distributor.minReadySeconds | int | `10` | Minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing/terminating |
 | distributor.nodeSelector | object | `{}` | Node selector for distributor pods |

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

@@ -146,6 +146,10 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.distributor.lifecycle }}
+          lifecycle:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - mountPath: /conf
               name: config

charts/tempo-distributed/values.yaml

@@ -553,6 +553,8 @@ distributor:
   resources: {}
   # -- Grace period to allow the distributor to shutdown before it is killed
   terminationGracePeriodSeconds: 30
+  # -- Container lifecycle hooks for the distributor
+  lifecycle: {}
   # -- topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string
   # @default -- Defaults to allow skew no more then 1 node per AZ
   topologySpreadConstraints: |
@@ -610,6 +612,8 @@ distributor:
       filter_by_status_error: false
     # -- Disables write extension with inactive ingesters
     extend_writes: null
+    # -- Trace Attribute bytes limit. This is the maximum number of bytes that can be used in a trace.0 for no limit.
+    max_attribute_bytes: 0
     # Configures usage trackers in the distributor which expose metrics of ingested traffic grouped by configurable
     # attributes exposed on /usage_metrics.
     cost_attribution:
@@ -1453,6 +1457,9 @@ config: |
     {{- if .Values.distributor.config.extend_writes }}
     extend_writes: {{ .Values.distributor.config.extend_writes }}
     {{- end }}
+    {{- if .Values.distributor.config.max_attribute_bytes }}
+    max_attribute_bytes: {{ .Values.distributor.config.max_attribute_bytes }}
+    {{- end }}
   querier:
     frontend_worker:
       frontend_address: {{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend-discovery") }}:9095