diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-10-17 10:33:06 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-10-17 10:48:32 +0300 |
| commit | 6ff9cea568a03437b669f9cf13b2f9f94a57ec6b (patch) | |
| tree | d86f3039dd9368f0862f21dc35601c958e0a3997 | |
| parent | 9642a472b67d46c230adf15ece8e79c850af99e4 (diff) | |
| download | gitlab-ce-6ff9cea568a03437b669f9cf13b2f9f94a57ec6b.tar.gz | |
Remove prometheus configuration help text
| -rw-r--r-- | app/models/project_services/prometheus_service.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/gt-remove-prometheus-configuration-help-text.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index f141502d5df..211e5c3fcbf 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -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 } ] diff --git a/changelogs/unreleased/gt-remove-prometheus-configuration-help-text.yml b/changelogs/unreleased/gt-remove-prometheus-configuration-help-text.yml new file mode 100644 index 00000000000..018686c0d47 --- /dev/null +++ b/changelogs/unreleased/gt-remove-prometheus-configuration-help-text.yml @@ -0,0 +1,5 @@ +--- +title: Remove prometheus configuration help text +merge_request: 22413 +author: George Tsiolis +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b8c4eddbec1..45efc65d015 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4905,9 +4905,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 "" |