Merge "Add alert templates via alertmanager's values.yaml file"

2017-12-19 06:16:28 +00:00 · 2017-12-19 06:16:28 +00:00 · 1545482b8b
commit 1545482b8b
parent e963c8fc9d 917865ed97
3 changed files with 7 additions and 0 deletions
--- a/prometheus-alertmanager/templates/configmap-etc.yaml
+++ b/prometheus-alertmanager/templates/configmap-etc.yaml
@ -24,4 +24,6 @@ metadata:
 data:
  alertmanager.yml:
 {{- toYaml .Values.conf.alertmanager | indent 4 }}
+  alert-templates.tmpl:
+{{- toYaml .Values.conf.alert_templates | indent 4 }}
 {{- end }}
--- a/prometheus-alertmanager/templates/statefulset.yaml
+++ b/prometheus-alertmanager/templates/statefulset.yaml
@ -77,6 +77,10 @@ spec:
          volumeMounts:
            - name: etc-alertmanager
              mountPath: /etc/config
+            - name: alertmanager-etc
+              mountPath: /etc/alertmanager/template/alert-templates.tmpl
+              subPath: alert-templates.tmpl
+              readOnly: true
            - name: alertmanager-etc
              mountPath: /etc/config/alertmanager.yml
              subPath: alertmanager.yml
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@ -270,3 +270,4 @@ conf:
        room_id: 85
        message_format: html
        notify: true
+  alertmanager_templates: null