openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Add extensible command line flags to Alertmanager"

Browse Source
This commit is contained in:
Zuul 2020-10-06 19:32:03 +00:00 committed by Gerrit Code Review
commit f5caa0c7da
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus-alertmanager/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.20.0 appVersion: v0.20.0
description: OpenStack-Helm Alertmanager for Prometheus description: OpenStack-Helm Alertmanager for Prometheus
name: prometheus-alertmanager name: prometheus-alertmanager
version: 0.1.1 version: 0.1.2
home: https://prometheus.io/docs/alerting/alertmanager/ home: https://prometheus.io/docs/alerting/alertmanager/
sources: sources:
- https://github.com/prometheus/alertmanager - https://github.com/prometheus/alertmanager

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

@ -20,8 +20,10 @@ COMMAND="${@:-start}"
function start () { function start () {
exec /bin/alertmanager \ exec /bin/alertmanager \
--config.file=/etc/alertmanager/config.yml \ --config.file=/etc/alertmanager/config.yml \
--storage.path={{ .Values.conf.command_flags.alertmanager.storage.path }} \ {{- range $flag, $value := .Values.conf.command_flags.alertmanager }}
--cluster.listen-address={{ .Values.conf.command_flags.alertmanager.cluster.listen_address }} \ {{- $flag := $flag | replace "_" "-" }}
{{ printf "--%s=%s" $flag $value | indent 4 }} \
{{- end }}
$(generate_peers) $(generate_peers)
} }

6
prometheus-alertmanager/values.yaml
View File

@ -250,10 +250,8 @@ network_policy:
conf: conf:
command_flags: command_flags:
alertmanager: alertmanager:
storage: storage.path: /var/lib/alertmanager/data
path: /var/lib/alertmanager/data cluster.listen_address: "0.0.0.0:9094"
cluster:
listen_address: "0.0.0.0:9094"
snmpnotifier: snmpnotifier:
alert_default_severity: crititcal alert_default_severity: crititcal
alert_severities: "critical,warning,info,page" alert_severities: "critical,warning,info,page"