summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-09-15 06:42:08 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-09-15 06:42:08 +0000
commit60be5132fc1148310720ea72a4fd7c98d84a7d13 (patch)
tree8b1d052dc726f9cd3ec91a6c06b095f374715f19
parentec3b3797e789d82200de2694458cc7cde2093549 (diff)
parent37e962acc298951efb2626959afc547ec4f9b4c9 (diff)
downloadgitlab-ce-60be5132fc1148310720ea72a4fd7c98d84a7d13.tar.gz
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
-rw-r--r--doc/ci/environments.md5
-rw-r--r--doc/ci/img/environments_monitoring.pngbin243491 -> 76086 bytes
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index c1362b7bd5b..5bc37606a7f 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -598,7 +598,7 @@ exist, you should see something like:
>**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]
- 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
@@ -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
environment which has had a successful deployment. If monitoring data was
-successfully retrieved, a Monitoring button will appear on the environment's
-detail page.
+successfully retrieved, a Monitoring button will appear for each environment.
![Environment Detail with Metrics](img/prometheus_environment_detail_with_metrics.png)
diff --git a/doc/ci/img/environments_monitoring.png b/doc/ci/img/environments_monitoring.png
index d9c46ea4c95..dcffdd1fdb8 100644
--- a/doc/ci/img/environments_monitoring.png
+++ b/doc/ci/img/environments_monitoring.png
Binary files differ