summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-12-22 11:06:49 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-12-22 11:06:49 +0000
commit92e00ffb188455fffa34c0d95011e65485401d5d (patch)
tree02174587594f9fbda14d5108632debebcfb7c4d1
parentc88594446cbafc9917290cb778cdce6d7cd330a3 (diff)
parent66c03aaa4c5fd8902310740b229d9caf49d7bc25 (diff)
downloadgitlab-ce-92e00ffb188455fffa34c0d95011e65485401d5d.tar.gz
Merge branch 'patch-29' into 'master'
Fix prometheus arg in prometheus.yml See merge request gitlab-org/gitlab-ce!16075
-rw-r--r--doc/user/project/integrations/samples/prometheus.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/integrations/samples/prometheus.yml b/doc/user/project/integrations/samples/prometheus.yml
index 30b59e172a1..3a4735d282f 100644
--- a/doc/user/project/integrations/samples/prometheus.yml
+++ b/doc/user/project/integrations/samples/prometheus.yml
@@ -94,7 +94,7 @@ spec:
- name: prometheus
image: prom/prometheus:latest
args:
- - '-config.file=/prometheus-data/prometheus.yml'
+ - '--config.file=/prometheus-data/prometheus.yml'
ports:
- name: prometheus
containerPort: 9090