summaryrefslogtreecommitdiff
path: root/doc/ci/environments.md
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-08-15 14:25:08 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-08-15 14:25:08 +0000
commit35659da185e3c6ec2862884b4e9e19dd20445957 (patch)
tree4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /doc/ci/environments.md
parent1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff)
parentfe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff)
downloadgitlab-ce-fix-btn-alignment.tar.gz
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts: # app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'doc/ci/environments.md')
-rw-r--r--doc/ci/environments.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index 6a7f694d705..28b27921f8b 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -607,10 +607,9 @@ exist, you should see something like:
- With GitLab 9.2, all deployments to an environment are shown directly on the
monitoring dashboard
-If you have enabled Prometheus for collecting metrics, you can monitor the performance behavior of your app
-through the environments.
+If you have enabled [Prometheus for monitoring system and response metrics](https://docs.gitlab.com/ee/user/project/integrations/prometheus.html), you can monitor the performance behavior of your app running in each environment.
-Once configured, GitLab will attempt to retrieve performance metrics 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
successfully retrieved, a Monitoring button will appear on the environment's
detail page.