[grafana] Add alerting.configMapName (#20623)

Signed-off-by: Andrew Melnick <meln5674@kettering.edu>
Signed-off-by: Alberto Otero <lorenzoa@vmware.com>
Co-authored-by: Alberto Otero <lorenzoa@vmware.com>

bitnami/grafana/Chart.yaml

@@ -31,4 +31,4 @@ maintainers:
 name: grafana
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana
-version: 9.5.6
+version: 9.6.0

bitnami/grafana/README.md

@@ -216,6 +216,7 @@ This solution allows to easily deploy multiple Grafana instances compared to the
 | `datasources.secretName`           | The name of an externally-managed secret containing custom datasource files.                                                                         | `""`                              |
 | `datasources.secretDefinition`     | The contents of a secret defining a custom datasource file. Only used if datasources.secretName is empty or not defined.                             | `{}`                              |
 | `notifiers.configMapName`          | Name of a ConfigMap containing Grafana notifiers configuration                                                                                       | `""`                              |
+| `alerting.configMapName`           | Name of a ConfigMap containing Grafana alerting configuration                                                                                        | `""`                              |
 
 ### Grafana Deployment parameters
 

bitnami/grafana/templates/deployment.yaml

@@ -195,6 +195,10 @@ spec:
             - name: notifiers
               mountPath: /opt/bitnami/grafana/conf/provisioning/notifiers
             {{- end }}
+            {{- if .Values.alerting.configMapName }}
+            - name: alerting
+              mountPath: /opt/bitnami/grafana/conf/provisioning/alerting
+            {{- end }}
             {{- if .Values.ldap.enabled }}
             - name: ldap
               mountPath: /opt/bitnami/grafana/conf/ldap.toml
@@ -320,6 +324,11 @@ spec:
           configMap:
             name: {{ .Values.notifiers.configMapName }}
         {{- end }}
+        {{- if .Values.alerting.configMapName }}
+        - name: alerting
+          configMap:
+            name: {{ .Values.alerting.configMapName }}
+        {{- end }}
         {{- if .Values.config.useGrafanaIniFile }}
         - name: grafana-ini
           {{- if .Values.config.grafanaIniConfigMap }}

bitnami/grafana/values.yaml

@@ -278,6 +278,12 @@ datasources:
 notifiers:
   configMapName: ""
 
+## Create alerting rules, contact points, notification policies, templates, and mute timings from a configMap
+## @param alerting.configMapName Name of a ConfigMap containing Grafana alerting configuration
+##
+alerting:
+  configMapName: ""
+
 ## @section Grafana Deployment parameters
 
 grafana: