summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-03-16 22:06:47 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-03-16 22:06:47 +0000
commit0ac690778c69f0fc0237b0314a835e078848cecb (patch)
tree4b55f11dc32b371fb32b131575ef99e34dc106e1
parentc2d3ea04f6a4b6393cc1cb3c44ffa21f0cee1e51 (diff)
downloadgitlab-ce-0ac690778c69f0fc0237b0314a835e078848cecb.tar.gz
Fix config option to disable Prometheus
-rw-r--r--doc/administration/monitoring/prometheus/index.md4
-rw-r--r--doc/install/requirements.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index 2a690dd28d4..69b16b7c483 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -35,10 +35,10 @@ monitoring target for Prometheus, unless individually disabled.
To disable Prometheus and all of its exporters, as well as any added in the future:
1. Edit `/etc/gitlab/gitlab.rb`
-1. Add or find and uncomment the following line, making sure it's set to `true`:
+1. Add or find and uncomment the following line, making sure it's set to `false`:
```ruby
- prometheus['disable_all'] = true
+ prometheus_monitoring['enable'] = false
```
1. Save the file and [reconfigure GitLab][reconfigure] for the changes to
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index c2d5be2caeb..7b586138f42 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -162,4 +162,4 @@ about it, check the [Prometheus documentation](../administration/monitoring/prom
We support the current and the previous major release of Firefox, Chrome/Chromium, Safari and Microsoft browsers (Microsoft Edge and Internet Explorer 11).
-Each time a new browser version is released, we begin supporting that version and stop supporting the third most recent version.
+Each time a new browser version is released, we begin supporting that version and stop supporting the third most recent version. \ No newline at end of file