diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-21 09:17:16 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-21 09:17:16 -0500 |
| commit | c0a029bd10d077e9f0030ff41e2b92fb5a1d77b3 (patch) | |
| tree | f80e6b32360de8e071b1dc504e9850d2d55bb9a6 /doc/administration | |
| parent | 7d224dfafd4b04abdc2f1391fcd165cd3af862f9 (diff) | |
| parent | 592b8d716f77944e61a7b532028ccf27c8401755 (diff) | |
| download | gitlab-ce-c0a029bd10d077e9f0030ff41e2b92fb5a1d77b3.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/monitoring/prometheus/gitlab_metrics.md | 4 | ||||
| -rw-r--r-- | doc/administration/monitoring/prometheus/index.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index 69600cad25c..411a0fae93f 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -1,7 +1,7 @@ # GitLab Prometheus metrics >**Note:** -Available since [Omnibus GitLab 9.3][29118]. Currently experimental. For +Available since [Omnibus GitLab 9.3][29118]. For installations from source you'll have to configure it yourself. To enable the GitLab Prometheus metrics: @@ -24,7 +24,7 @@ server, because the embedded server configuration is overwritten once every ## Metrics available -In this experimental phase, only a few metrics are available: +The following metrics are available: | Metric | Type | Since | Description | |:--------------------------------- |:--------- |:----- |:----------- | diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 3d24812c66a..f47add48345 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -120,7 +120,7 @@ To disable the monitoring of Kubernetes: ## GitLab Prometheus metrics -> Introduced as an experimental feature in GitLab 9.3. +> Introduced in GitLab 9.3. GitLab monitors its own internal service metrics, and makes them available at the `/-/metrics` endpoint. Unlike other exporters, this endpoint requires authentication as it is available on the same URL and port as user traffic. |