diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-21 13:48:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-21 13:48:55 +0000 |
| commit | 8548aaa08d226478bdb07bea9c36d821694dcae8 (patch) | |
| tree | 6e30e5b71cc4d064c36fd7b06b6793f6351fb9bd | |
| parent | b3d77dba602e32e15dd4594f73df16de2b88486d (diff) | |
| parent | 57a6edd19fe1ade4bdd9391a164639d04b54bb68 (diff) | |
| download | gitlab-ce-8548aaa08d226478bdb07bea9c36d821694dcae8.tar.gz | |
Merge branch '29618-clarify-help-text-on-prometheus-integration-page' into 'master'
Clarify help text on Prometheus Integration Page
Closes #29618
See merge request !10034
| -rw-r--r-- | app/models/project_services/prometheus_service.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index 375966b9efc..4d7c81a721f 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -30,7 +30,14 @@ class PrometheusService < MonitoringService end def help - 'Retrieves `container_cpu_usage_seconds_total` and `container_memory_usage_bytes` from the configured Prometheus server. An `environment` label is required on each metric to identify the Environment.' + <<-MD.strip_heredoc + Retrieves the Kubernetes node metrics `container_cpu_usage_seconds_total` + and `container_memory_usage_bytes` from the configured Prometheus server. + + If you are not using [Auto-Deploy](https://docs.gitlab.com/ee/ci/autodeploy/index.html) + or have set up your own Prometheus server, an `environment` label is required on each metric to + [identify the Environment](https://docs.gitlab.com/ce/user/project/integrations/prometheus.html#metrics-and-labels). + MD end def self.to_param |