diff options
author | Reuben Pereira <rpereira@gitlab.com> | 2019-08-02 07:22:41 +0000 |
---|---|---|
committer | rpereira2 <rpereira@gitlab.com> | 2019-08-02 15:38:15 +0530 |
commit | 8d07a39fdaaf958e2d2429b4a435a8263b5c5806 (patch) | |
tree | 666d627f5c2eaf58754f31924baa258893b07125 | |
parent | aa64ab509cdadd1d56c5db3dbf0f60c23819328e (diff) | |
download | gitlab-ce-ce-62234-custom-metrics-help-text.tar.gz |
Apply suggestion to doc/user/project/integrations/prometheus.mdce-62234-custom-metrics-help-text
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 83c91cb0524..44439b59e77 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -98,15 +98,10 @@ You can view the performance dashboard for an environment by [clicking on the mo > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3799) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.6. -Custom metrics can be monitored by adding them on the Prometheus integration page. Once saved, they will be displayed on the environment performance dashboard. +Custom metrics can be monitored by adding them on the Prometheus integration page. Once saved, they will be displayed on the environment performance dashboard provided that either: -#### Requirements - -- A [connected Kubernetes cluster](../clusters/index.md#adding-and-removing-clusters) with *environment_scope* `*` and with [Prometheus installed](#enabling-prometheus-integration) - - **OR** - -- A [manually configured Prometheus](#manual-configuration-of-prometheus) +- A [connected Kubernetes cluster](../clusters/index.md#adding-and-removing-clusters) with the environment scope of `*` is used and [Prometheus installed on the cluster](#enabling-prometheus-integration), or +- Prometheus is [manually configured](#manual-configuration-of-prometheus). ![Add New Metric](img/prometheus_add_metric.png) |