diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-07 07:52:17 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-07 07:52:17 +0000 |
| commit | b9027887835e8498cb4b735b91d3cd9b04401489 (patch) | |
| tree | a1a9309f800dbb8d00f4045e03970670f4fb5dfd /doc | |
| parent | 6ea35f98241b351747dd445738be58e3d65cafa2 (diff) | |
| parent | 506d20974668fb8280e625a684e821bd03b2cf46 (diff) | |
| download | gitlab-ce-b9027887835e8498cb4b735b91d3cd9b04401489.tar.gz | |
Merge branch '30575-update-prometheus-integration-documentation-for-9-1' into 'master'
Update Prometheus documentation for 9.1
See merge request !10516
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/integrations/img/prometheus_environment_detail_with_metrics.png | bin | 113092 -> 120479 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 10 |
2 files changed, 3 insertions, 7 deletions
diff --git a/doc/user/project/integrations/img/prometheus_environment_detail_with_metrics.png b/doc/user/project/integrations/img/prometheus_environment_detail_with_metrics.png Binary files differindex 1f5a44f8820..214b10624a9 100644 --- a/doc/user/project/integrations/img/prometheus_environment_detail_with_metrics.png +++ b/doc/user/project/integrations/img/prometheus_environment_detail_with_metrics.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 12d7700176c..a74014b6b2f 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -160,23 +160,19 @@ The queries utilized by GitLab are shown in the following table. Once configured, GitLab will attempt to retrieve performance metrics for any environment which has had a successful deployment. If monitoring data was -successfully retrieved, a metrics button will appear on the environment's +successfully retrieved, a Monitoring button will appear on the environment's detail page.  -Clicking on the metrics button will display a new page, showing up to the last +Clicking on the Monitoring button will display a new page, showing up to the last 8 hours of performance data. It may take a minute or two for data to appear after initial deployment. ## Troubleshooting -If the metrics button is not appearing, then one of a few issues may be -occurring: +If the "Attempting to load performance data" screen continues to appear, it could be due to: -- GitLab is not able to reach the Prometheus server. A test request can be sent - to the Prometheus server from the [Prometheus Service](#configuration-in-gitlab) - configuration screen. - No successful deployments have occurred to this environment. - Prometheus does not have performance data for this environment, or the metrics are not labeled correctly. To test this, connect to the Prometheus server and |
