diff options
| author | Peter Leitzen <pleitzen@gitlab.com> | 2018-10-25 12:36:38 +0200 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2018-10-25 13:45:46 +0200 |
| commit | bc8ced6287dd50fee4c4c2eca682c71c3fc80698 (patch) | |
| tree | 197001252c569d12f4f7bfd885c2b384c547ff5d | |
| parent | 379b4d8a96dbdb3f9f7d16002f76218800b17ae2 (diff) | |
| download | gitlab-ce-pl-uprade-prometheus-alertmanager.tar.gz | |
Upgrade Prometheus and alertmanagerpl-uprade-prometheus-alertmanager
Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
| -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: {} |