Skip to content

Commit 20aa554

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20132 from pgier/upgrade-prometheus-alertmanager-to-0.15.0
examples/prometheus: upgrade alertmanager to 0.15.0
2 parents 7dec9a3 + 57bba06 commit 20aa554

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

‎examples/prometheus/prometheus-standalone.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
value: openshift/prometheus:v2.3.1
1818
- description: The location of the alertmanager image
1919
name: IMAGE_ALERTMANAGER
20-
value: openshift/prometheus-alertmanager:v0.14.0
20+
value: openshift/prometheus-alertmanager:v0.15.0
2121
- description: The location of alert-buffer image
2222
name: IMAGE_ALERT_BUFFER
2323
value: openshift/prometheus-alert-buffer:v0.0.2

‎examples/prometheus/prometheus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
value: openshift/prometheus:v2.3.1
2121
- description: The location of the alertmanager image
2222
name: IMAGE_ALERTMANAGER
23-
value: openshift/prometheus-alertmanager:v0.14.0
23+
value: openshift/prometheus-alertmanager:v0.15.0
2424
- description: The location of alert-buffer image
2525
name: IMAGE_ALERT_BUFFER
2626
value: openshift/prometheus-alert-buffer:v0.0.2

‎pkg/oc/clusterup/manifests/bindata.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/extended/testdata/bindata.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)