diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml index 59681c0278e467ed80d31ebf24250c0eb7ed9ad6..982531e9a2f8bf08b01594bb0fae7dac0c552589 100644 --- a/app/views/admin/application_settings/_prometheus.html.haml +++ b/app/views/admin/application_settings/_prometheus.html.haml @@ -6,8 +6,8 @@ - prometheus_help_link_url = help_page_path('administration/monitoring/prometheus/gitlab_metrics') - prometheus_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: prometheus_help_link_url } = f.gitlab_ui_checkbox_component :prometheus_metrics_enabled, - _('Enable health and performance metrics endpoint'), - help_text: s_('AdminSettings|Enable a Prometheus endpoint that exposes health and performance statistics. The Health Check menu item appears in the Monitoring section of the Admin Area. Restart required. %{link_start}Learn more.%{link_end}').html_safe % { link_start: prometheus_help_link_start, link_end: '</a>'.html_safe } + _('Enable GitLab Prometheus metrics endpoint'), + help_text: s_('AdminSettings|Enable collection of application metrics. Restart required. %{link_start}Learn how to export metrics to Prometheus%{link_end}.').html_safe % { link_start: prometheus_help_link_start, link_end: '</a>'.html_safe } .form-text.gl-text-gray-500.gl-pl-6 - unless Gitlab::Metrics.metrics_folder_present? - icon_link = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory'), target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/admin/application_settings/metrics_and_profiling.html.haml b/app/views/admin/application_settings/metrics_and_profiling.html.haml index d4476bf838a13b41e67069c817053705a0426b0a..b79b189e9cf4be2214c8ea859d86e13c6896ed78 100644 --- a/app/views/admin/application_settings/metrics_and_profiling.html.haml +++ b/app/views/admin/application_settings/metrics_and_profiling.html.haml @@ -11,7 +11,7 @@ = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Monitor the health and performance of GitLab with Prometheus.') + = _('Monitor GitLab with Prometheus.') .settings-content = render 'prometheus' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d88d610b7f991366fdeb5b6b0eefe606beb132f2..2c61122a503199a8955e471e55bd486d8b105d49 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2721,7 +2721,7 @@ msgstr "" msgid "AdminSettings|Enable Service Ping" msgstr "" -msgid "AdminSettings|Enable a Prometheus endpoint that exposes health and performance statistics. The Health Check menu item appears in the Monitoring section of the Admin Area. Restart required. %{link_start}Learn more.%{link_end}" +msgid "AdminSettings|Enable collection of application metrics. Restart required. %{link_start}Learn how to export metrics to Prometheus%{link_end}." msgstr "" msgid "AdminSettings|Enable kuromoji custom analyzer: Indexing" @@ -14454,6 +14454,9 @@ msgstr "" msgid "Enable GitLab Error Tracking" msgstr "" +msgid "Enable GitLab Prometheus metrics endpoint" +msgstr "" + msgid "Enable Gitpod" msgstr "" @@ -14538,9 +14541,6 @@ msgstr "" msgid "Enable header and footer in emails" msgstr "" -msgid "Enable health and performance metrics endpoint" -msgstr "" - msgid "Enable in-product marketing emails" msgstr "" @@ -25657,10 +25657,10 @@ msgstr "" msgid "Monitor" msgstr "" -msgid "Monitor Settings" +msgid "Monitor GitLab with Prometheus." msgstr "" -msgid "Monitor the health and performance of GitLab with Prometheus." +msgid "Monitor Settings" msgstr "" msgid "Monitor your errors by integrating with Sentry." diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 0f5d9892e668af959f5376eeaff5ea221aaa8055..a5df142d188bcb246405f0e0f2b5829789524a8f 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -562,7 +562,7 @@ it 'change Prometheus settings' do page.within('.as-prometheus') do - check 'Enable health and performance metrics endpoint' + check 'Enable GitLab Prometheus metrics endpoint' click_button 'Save changes' end