Commit 60be5132 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch '37896-minor-improvements-to-prometheus-docs' into 'master'

Minor improvements to prometheus docs

Closes #37896

See merge request gitlab-org/gitlab-ce!14288
parents ec3b3797 37e962ac
...@@ -598,7 +598,7 @@ exist, you should see something like: ...@@ -598,7 +598,7 @@ exist, you should see something like:
>**Notes:** >**Notes:**
> >
- For the monitor dashboard to appear, you need to: - For the monitoring dashboard to appear, you need to:
- Have enabled the [Prometheus integration][prom] - Have enabled the [Prometheus integration][prom]
- Configured Prometheus to collect at least one [supported metric](../user/project/integrations/prometheus_library/metrics.md) - Configured Prometheus to collect at least one [supported metric](../user/project/integrations/prometheus_library/metrics.md)
- With GitLab 9.2, all deployments to an environment are shown directly on the - With GitLab 9.2, all deployments to an environment are shown directly on the
...@@ -608,8 +608,7 @@ If you have enabled [Prometheus for monitoring system and response metrics](http ...@@ -608,8 +608,7 @@ If you have enabled [Prometheus for monitoring system and response metrics](http
Once configured, GitLab will attempt to retrieve [supported performance metrics](https://docs.gitlab.com/ee/user/project/integrations/prometheus_library/metrics.html) for any Once configured, GitLab will attempt to retrieve [supported performance metrics](https://docs.gitlab.com/ee/user/project/integrations/prometheus_library/metrics.html) for any
environment which has had a successful deployment. If monitoring data was environment which has had a successful deployment. If monitoring data was
successfully retrieved, a Monitoring button will appear on the environment's successfully retrieved, a Monitoring button will appear for each environment.
detail page.
![Environment Detail with Metrics](img/prometheus_environment_detail_with_metrics.png) ![Environment Detail with Metrics](img/prometheus_environment_detail_with_metrics.png)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment