diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-06 07:41:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 07:41:07 -0800 |
| commit | a88f746600b1d38232630abef4ea0e83caae0ddb (patch) | |
| tree | 2860f1d944c73b6adba07cd8a5900b4f19953e71 | |
| parent | a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79 (diff) | |
| parent | 4edcb3af15857f8b971e79bdde58224d115fd926 (diff) | |
| download | openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.tar.gz openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.tar.bz2 openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.tar.xz openshift-a88f746600b1d38232630abef4ea0e83caae0ddb.zip | |
Merge pull request #6975 from pgier/bz1540799
Automatic merge from submit-queue.
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') }}" |