From 0ac690778c69f0fc0237b0314a835e078848cecb Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Thu, 16 Mar 2017 22:06:47 +0000 Subject: [PATCH] Fix config option to disable Prometheus --- doc/administration/monitoring/prometheus/index.md | 4 ++-- 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