Merge pull request #3891 from waterdrag0n/enable_tpl_processing_alert_files

[grafana] Enable helm tpl for alert files

Author: Sheikh-Abubaker

charts/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 9.4.5
+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 }}