kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'gt-remove-prometheus-configuration-help-text' into 'master' 

Remove prometheus configuration help text

Closes #52782

See merge request gitlab-org/gitlab-ce!22413
This commit is contained in:
Clement Ho 2018-10-17 16:33:25 +00:00
parent 34f89db608 6ff9cea568
commit ed499b38e2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/project_services/prometheus_service.rb
View File

@ -56,7 +56,6 @@ class PrometheusService < MonitoringService
name: 'api_url',
title: 'API URL',
placeholder: s_('PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/'),
help: s_('PrometheusService|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.'),
required: true
}
]

5
changelogs/unreleased/gt-remove-prometheus-configuration-help-text.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove prometheus configuration help text
merge_request: 22413
author: George Tsiolis
type: other

3
locale/gitlab.pot
View File

@ -4908,9 +4908,6 @@ msgstr ""
msgid "PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments"
msgstr ""
msgid "PrometheusService|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."
msgstr ""
msgid "PrometheusService|Common metrics"
msgstr ""