diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-20 11:15:35 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-20 11:15:35 +0000 |
| commit | 83a23297bdeb5086ecc96d86b2e264dd3591022d (patch) | |
| tree | 4b0dc5cac73ef9c23311583b98fedc442ff3cf35 /doc/administration | |
| parent | d83e5740e83bbee963279c9af85fb585517cb643 (diff) | |
| parent | c2f79ab2ad216f25f07d232bc691a9b3bc11b981 (diff) | |
| download | gitlab-ce-83a23297bdeb5086ecc96d86b2e264dd3591022d.tar.gz | |
Merge branch 'jl-unicorn-defaulted-on-docs' into 'master'
Update docs to indicate unicorn metrics are automatically scraped
See merge request gitlab-org/gitlab-ce!25406
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/monitoring/prometheus/gitlab_metrics.md | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index 6ea0ac0d495..08cd23682d1 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -17,10 +17,7 @@ GitLab monitors its own internal service metrics, and makes them available at th `/-/metrics` endpoint. Unlike other [Prometheus] exporters, in order to access it, the client IP needs to be [included in a whitelist][whitelist]. -Currently the embedded Prometheus server is not automatically configured to -collect metrics from this endpoint. We recommend setting up another Prometheus -server, because the embedded server configuration is overwritten once every -[reconfigure of GitLab][reconfigure]. In the future this will not be required. +For Omnibus and Chart installations, these metrics are automatically enabled and collected as of [GitLab 9.4](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1702). For source installations or earlier verisons, these metrics will need to be enabled manually and collected by a Prometheus server. ## Unicorn Metrics available |