summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-02-09 10:28:12 +0100
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-02-09 10:31:02 +0100
commit6ad99168332370008e8c55fd3587af3ae1d07ab0 (patch)
tree78485a08044846b243ea056aede1adf986a29f43 /doc
parent52313cfb14063cdec5872c908f328fcb8fefd470 (diff)
downloadgitlab-ce-6ad99168332370008e8c55fd3587af3ae1d07ab0.tar.gz
Consider existing installations where the setting is not in gitlab.rb
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md2
-rw-r--r--doc/administration/monitoring/prometheus/index.md4
-rw-r--r--doc/administration/monitoring/prometheus/node_exporter.md2
-rw-r--r--doc/administration/monitoring/prometheus/redis_exporter.md2
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md b/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md
index 5e7d9b6ab89..86ef9d167e2 100644
--- a/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md
+++ b/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md
@@ -10,7 +10,7 @@ To enable the GitLab monitor exporter:
1. [Enable Prometheus](index.md#configuring-prometheus)
1. Edit `/etc/gitlab/gitlab.rb`
-1. 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 `true`:
```ruby
gitlab_monitor_exporter['enable'] = true
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index b8ba8fee878..3a394c561db 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -32,7 +32,7 @@ have to install and configure it yourself.
To enable Prometheus:
1. Edit `/etc/gitlab/gitlab.rb`
-1. 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 `true`:
```ruby
prometheus['enable'] = true
@@ -57,7 +57,7 @@ server. Proceed at your own risk.
To change the address/port that Prometheus listens on:
1. Edit `/etc/gitlab/gitlab.rb`
-1. Find and add/uncomment the following line:
+1. Add or find and uncomment the following line:
```ruby
prometheus['listen_address'] = 'localhost:9090'
diff --git a/doc/administration/monitoring/prometheus/node_exporter.md b/doc/administration/monitoring/prometheus/node_exporter.md
index 513621df9fd..aef7758a88f 100644
--- a/doc/administration/monitoring/prometheus/node_exporter.md
+++ b/doc/administration/monitoring/prometheus/node_exporter.md
@@ -11,7 +11,7 @@ To enable the node exporter:
1. [Enable Prometheus](index.md#configuring-prometheus)
1. Edit `/etc/gitlab/gitlab.rb`
-1. 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 `true`:
```ruby
node_exporter['enable'] = true
diff --git a/doc/administration/monitoring/prometheus/redis_exporter.md b/doc/administration/monitoring/prometheus/redis_exporter.md
index 9d3702fa182..d54d409dbb6 100644
--- a/doc/administration/monitoring/prometheus/redis_exporter.md
+++ b/doc/administration/monitoring/prometheus/redis_exporter.md
@@ -11,7 +11,7 @@ To enable the Redis exporter:
1. [Enable Prometheus](index.md#configuring-prometheus)
1. Edit `/etc/gitlab/gitlab.rb`
-1. 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 `true`:
```ruby
redis_exporter['enable'] = true