Commit 578064df authored by Douwe Maan's avatar Douwe Maan

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
parents 238d9d38 bc8ced62
---
title: Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
merge_request: 22600
author:
type: other
alertmanager: alertmanager:
enabled: false enabled: false
image:
tag: v0.15.2
kubeStateMetrics: kubeStateMetrics:
enabled: true enabled: true
...@@ -16,7 +18,7 @@ rbac: ...@@ -16,7 +18,7 @@ rbac:
server: server:
fullnameOverride: "prometheus-prometheus-server" fullnameOverride: "prometheus-prometheus-server"
image: image:
tag: v2.1.0 tag: v2.4.3
serverFiles: serverFiles:
alerts: {} alerts: {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment