openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Prometheus-alertmanager: modify wrong variables"

Browse Source
This commit is contained in:
Zuul 2018-09-04 16:45:34 +00:00 committed by Gerrit Code Review
commit d119744c6e
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl
View File

@ -21,7 +21,7 @@ COMMAND="${@:-start}"
function start () { function start () {
exec /bin/alertmanager \ exec /bin/alertmanager \
-config.file=/etc/config/alertmanager.yml \ -config.file=/etc/alertmanager/config.yml \
-storage.path={{ .Values.conf.command_flags.storage.path }} \ -storage.path={{ .Values.conf.command_flags.storage.path }} \
-mesh.listen-address={{ .Values.conf.command_flags.mesh.listen_address }} \ -mesh.listen-address={{ .Values.conf.command_flags.mesh.listen_address }} \
$(generate_peers) $(generate_peers)

6
prometheus-alertmanager/templates/configmap-etc.yaml
View File

@ -22,8 +22,10 @@ kind: ConfigMap
metadata: metadata:
name: alertmanager-etc name: alertmanager-etc
data: data:
alertmanager.yml: | config.yml: |
{{ toYaml .Values.conf.alertmanager | indent 4 }} {{ toYaml .Values.conf.alertmanager | indent 4 }}
alert-templates.tmpl: | alert-templates.tmpl: |
{{ toYaml .Values.conf.alert_templates | indent 4 }} {{- if .Values.conf.alert_templates }}
{{ .Values.conf.alert_templates | indent 4 }}
{{- end }}
{{- end }} {{- end }}

4
prometheus-alertmanager/templates/statefulset.yaml
View File

@ -101,8 +101,8 @@ spec:
subPath: alert-templates.tmpl subPath: alert-templates.tmpl
readOnly: true readOnly: true
- name: alertmanager-etc - name: alertmanager-etc
mountPath: /etc/config/alertmanager.yml mountPath: /etc/alertmanager/config.yml
subPath: alertmanager.yml subPath: config.yml
readOnly: true readOnly: true
- name: alertmanager-bin - name: alertmanager-bin
mountPath: /tmp/alertmanager.sh mountPath: /tmp/alertmanager.sh

2
prometheus-alertmanager/values.yaml
View File

@ -297,4 +297,4 @@ conf:
room_id: 85 room_id: 85
message_format: html message_format: html
notify: true notify: true
alertmanager_templates: null alert_templates: null