diff options
| author | Paul Gier <pgier@redhat.com> | 2018-02-01 08:58:30 -0600 |
|---|---|---|
| committer | Paul Gier <pgier@redhat.com> | 2018-02-05 13:39:13 -0600 |
| commit | 4edcb3af15857f8b971e79bdde58224d115fd926 (patch) | |
| tree | ea2757e33ef30c9b1819d42b0f6dd6c427160ecf | |
| parent | 90f577883066f7213afca2a1159c69cabece57dc (diff) | |
| download | openshift-4edcb3af15857f8b971e79bdde58224d115fd926.tar.gz openshift-4edcb3af15857f8b971e79bdde58224d115fd926.tar.bz2 openshift-4edcb3af15857f8b971e79bdde58224d115fd926.tar.xz openshift-4edcb3af15857f8b971e79bdde58224d115fd926.zip | |
bug 1540799: openshift_prometheus: update alertmanager config file flag
Prometheus alertmanager as of 0.13.0 requires double dashes (posix) for
command line flags. The double dashes should be backwards compat
with earlier versions of alertmanager.
| -rw-r--r-- | roles/openshift_prometheus/templates/prometheus.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_prometheus/vars/default_images.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_prometheus/templates/prometheus.j2 b/roles/openshift_prometheus/templates/prometheus.j2 index c0abd483b..e86de1eab 100644 --- a/roles/openshift_prometheus/templates/prometheus.j2 +++ b/roles/openshift_prometheus/templates/prometheus.j2 @@ -219,7 +219,7 @@ spec: - name: alertmanager args: - - -config.file=/etc/alertmanager/alertmanager.yml + - --config.file=/etc/alertmanager/alertmanager.yml image: "{{ l_openshift_prometheus_alertmanager_image_prefix }}prometheus-alertmanager:{{ l_openshift_prometheus_alertmanager_image_version }}" imagePullPolicy: IfNotPresent resources: diff --git a/roles/openshift_prometheus/vars/default_images.yml b/roles/openshift_prometheus/vars/default_images.yml index 31f6c1bb1..2c46b5700 100644 --- a/roles/openshift_prometheus/vars/default_images.yml +++ b/roles/openshift_prometheus/vars/default_images.yml @@ -8,5 +8,5 @@ l_openshift_prometheus_alertbuffer_image_prefix: "{{ openshift_prometheus_alertb # image version defaults l_openshift_prometheus_image_version: "{{ openshift_prometheus_image_version | default('v2.0.0') }}" l_openshift_prometheus_proxy_image_version: "{{ openshift_prometheus_proxy_image_version | default('v1.0.0') }}" -l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default('v0.9.1') }}" +l_openshift_prometheus_alertmanager_image_version: "{{ openshift_prometheus_alertmanager_image_version | default('v0.13.0') }}" l_openshift_prometheus_alertbuffer_image_version: "{{ openshift_prometheus_alertbuffer_image_version | default('v0.0.2') }}" |