diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-17 01:06:48 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-17 06:35:24 +0300 |
commit | 9df22a18cea7bf796679473ba269cce3963835db (patch) | |
tree | 90c0f0e0bd6dbd7abbbd93fc666cbe4e205f99f6 /doc | |
parent | bd7dbd05577d1beb0c45083a8ee74a1ed9623805 (diff) |
Merge branch '29142-add-prometheus-integration-documentation' into 'master'
Fix config option to disable Prometheus
Closes #29142
See merge request !10019
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/monitoring/prometheus/index.md | 4 | ||||
-rw-r--r-- | doc/install/requirements.md | 2 |
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 |