Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorReuben Pereira <rpereira@gitlab.com>2019-08-05 16:32:20 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-05 16:32:20 +0300
commit279bad2efb07d5a8dad1c1e5559c701ca816e751 (patch)
treebb62df92292127fd155c03a03a4728760f4ab2ee /doc
parent113696b1945788ee92b995f8a1e433d7a9ee5a9c (diff)
Add help text next to Custom Metrics section
- Also add requirements to the docs for custom metrics.
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/integrations/prometheus.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index e609fe43507..44439b59e77 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -98,7 +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.
-Additional 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:
+
+- 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)