diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 07:26:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 07:26:08 +0000 |
| commit | 96c4a15eae9b93a2bfb512309e860da50d2e2636 (patch) | |
| tree | cf5f4cf12ae735bfdb1891fafd94d851322c42eb /doc | |
| parent | 9bc176b2c39f1c27ce8ed4c13cf06e53331c16c9 (diff) | |
| parent | b5aac468693f6ffaada170aebedc623768ce87d4 (diff) | |
| download | gitlab-ce-96c4a15eae9b93a2bfb512309e860da50d2e2636.tar.gz | |
Merge branch 'master' into 'sh-augment-lograge-output'
# Conflicts:
# config/initializers/lograge.rb
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/environments.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index df5c66a4c85..6a7f694d705 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -607,8 +607,7 @@ exist, you should see something like: - With GitLab 9.2, all deployments to an environment are shown directly on the monitoring dashboard -If your application is deployed on Kubernetes and you have enabled Prometheus -collecting metrics, you can monitor the performance behavior of your app +If you have enabled Prometheus for collecting metrics, you can monitor the performance behavior of your app through the environments. Once configured, GitLab will attempt to retrieve performance metrics for any |