summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-01-22 21:16:41 +0000
committerJames Lopez <james@jameslopez.es>2017-01-24 16:48:25 +0100
commit84d3133efc7549464767a96d586531d664032ac3 (patch)
tree29969822a57669706f442e55152ed762a5557ab8
parent98db0d42173e9da376aeb915dae1e439da887fb5 (diff)
downloadgitlab-ce-84d3133efc7549464767a96d586531d664032ac3.tar.gz
Merge branch 'patch-12' into 'master'
correct the prometheus feature configuration according to https://gitlab.com/git… See merge request !8703
-rw-r--r--doc/administration/monitoring/performance/prometheus.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/monitoring/performance/prometheus.md b/doc/administration/monitoring/performance/prometheus.md
index d8ca531649a..51c63325064 100644
--- a/doc/administration/monitoring/performance/prometheus.md
+++ b/doc/administration/monitoring/performance/prometheus.md
@@ -30,7 +30,7 @@ To enable Prometheus:
1. Find and uncomment the following line, making sure it's set to `true`:
```ruby
- node_exporter['enable'] = true
+ prometheus['enable'] = true
```
1. Save the file and [reconfigure GitLab][reconfigure] for the changes to