Merge branch 'patch-12' into 'master'

correct the prometheus feature configuration according to https://gitlab.com/git… See merge request !8703

Merge branch 'patch-12' into 'master'
84d3133e · Achilleas Pipinellis · James Lopez · 98db0d42 · 84d3133e
Commit 84d3133e authored Jan 22, 2017 by Achilleas Pipinellis Committed by James Lopez Jan 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

prometheus.md doc/administration/monitoring/performance/prometheus.md +1 -1

No files found.
--- 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