summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-20 09:24:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-20 09:24:38 +0000
commit898e2cc1dfa88b4ac39cb4b35011f61b37f57b51 (patch)
treec6524edb6c9a43cccf93be05c36883fde1a53ee4 /vendor
parentb5571e6e22cdacc81f78eff5943d68c8ba220fbb (diff)
downloadgitlab-ce-898e2cc1dfa88b4ac39cb4b35011f61b37f57b51.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r--vendor/prometheus/values.yaml4
1 files changed, 0 insertions, 4 deletions
diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml
index be79a0c5380..25384b088a2 100644
--- a/vendor/prometheus/values.yaml
+++ b/vendor/prometheus/values.yaml
@@ -1,7 +1,5 @@
alertmanager:
enabled: false
- image:
- tag: v0.15.2
kubeStateMetrics:
enabled: true
@@ -14,8 +12,6 @@ pushgateway:
server:
fullnameOverride: "prometheus-prometheus-server"
- image:
- tag: v2.4.3
serverFiles:
alerts: {}