diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-26 18:02:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-26 18:02:21 +0000 |
| commit | 578064df4d58fb0409fec51fe03c4b95181a5f5f (patch) | |
| tree | c1a76b1db27d25a38dbac0031f70815f74034e2f | |
| parent | 238d9d38621ee8628d7dbcf81a2ebef09ba3456b (diff) | |
| parent | bc8ced6287dd50fee4c4c2eca682c71c3fc80698 (diff) | |
| download | gitlab-ce-578064df4d58fb0409fec51fe03c4b95181a5f5f.tar.gz | |
Merge branch 'pl-uprade-prometheus-alertmanager' into 'master'
Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
See merge request gitlab-org/gitlab-ce!22600
| -rw-r--r-- | changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml | 5 | ||||
| -rw-r--r-- | vendor/prometheus/values.yaml | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml b/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml new file mode 100644 index 00000000000..d0c8ed8001d --- /dev/null +++ b/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2 +merge_request: 22600 +author: +type: other diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml index c432be72163..02ec3e2d9fe 100644 --- a/vendor/prometheus/values.yaml +++ b/vendor/prometheus/values.yaml @@ -1,5 +1,7 @@ alertmanager: enabled: false + image: + tag: v0.15.2 kubeStateMetrics: enabled: true @@ -16,7 +18,7 @@ rbac: server: fullnameOverride: "prometheus-prometheus-server" image: - tag: v2.1.0 + tag: v2.4.3 serverFiles: alerts: {} |