summaryrefslogtreecommitdiff
path: root/app/models/project_services/prometheus_service.rb
diff options
context:
space:
mode:
authorkushalpandya <kushal@gitlab.com>2017-06-01 13:25:16 +0530
committerkushalpandya <kushal@gitlab.com>2017-06-01 13:25:16 +0530
commitb83a40483ad5f87b3e08c3ed2d090b5d87bdac27 (patch)
treed844b5650221a476fec722bc34c3ec2937bf910e /app/models/project_services/prometheus_service.rb
parent85b6b9b6aa3f76bd7e6ea764a49829afbfba9de8 (diff)
downloadgitlab-ce-b83a40483ad5f87b3e08c3ed2d090b5d87bdac27.tar.gz
Remove service help, add URL field help
Diffstat (limited to 'app/models/project_services/prometheus_service.rb')
-rw-r--r--app/models/project_services/prometheus_service.rb14
1 files changed, 2 insertions, 12 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index d3f43d66937..d4d6611fd3b 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -28,17 +28,6 @@ class PrometheusService < MonitoringService
'Prometheus monitoring'
end
- def help
- <<-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
'prometheus'
end
@@ -49,7 +38,8 @@ class PrometheusService < MonitoringService
type: 'text',
name: 'api_url',
title: 'API URL',
- placeholder: 'Prometheus API Base URL, like http://prometheus.example.com/'
+ placeholder: 'Prometheus API Base URL, like http://prometheus.example.com/',
+ help: 'By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server.'
}
]
end