summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-06 09:07:41 +0000
committerRémy Coutable <remy@rymai.me>2018-04-06 09:07:41 +0000
commit6cad73439b3850e2ed7e5f09357cff43f73e47fb (patch)
tree5b49b50493df94904157ec6614ac5fc91959df32 /doc/administration
parentfdffe54b30eb1d5b06f88f282eab236602858ee0 (diff)
parent33c163b347ca37ae91240be40a05c881c89c7135 (diff)
downloadgitlab-ce-6cad73439b3850e2ed7e5f09357cff43f73e47fb.tar.gz
Merge branch 'nathan.jones/gitlab-ce-patch-24' into 'master'
Update index.md to describe leaving out the host in prometheus['listen_address']… See merge request gitlab-org/gitlab-ce!18207
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/monitoring/prometheus/index.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index f43c89dad87..3d24812c66a 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -62,7 +62,14 @@ To change the address/port that Prometheus listens on:
```
Replace `localhost:9090` with the address/port you want Prometheus to
- listen on.
+ listen on. If you would like to allow access to Prometheus to hosts other
+ than `localhost`, leave out the host, or use `0.0.0.0` to allow public access:
+
+ ```ruby
+ prometheus['listen_address'] = ':9090'
+ # or
+ prometheus['listen_address'] = '0.0.0.0:9090'
+ ```
1. Save the file and [reconfigure GitLab][reconfigure] for the changes to
take effect