Merge branch 'russell/edit-prometheus-ui-text' into 'master'

Edit Prometheus UI text

See merge request gitlab-org/gitlab!66702

app/views/admin/application_settings/_prometheus.html.haml

@@ -2,26 +2,23 @@
   = form_errors(@application_setting)
 
   %fieldset
-    %p
-      - link_to_restart = link_to(_('restart'), help_page_path('administration/restart_gitlab'))
-      = _('Enable a Prometheus metrics endpoint at %{metrics_path} to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available %{link}.').html_safe % { metrics_path: "<code>#{metrics_path}</code>".html_safe, link: link_to(_('here'), admin_health_check_path) }
-      = _('This setting requires a %{link_to_restart} to take effect.').html_safe % { link_to_restart: link_to_restart }
-      = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/index')
     .form-group
       .form-check
         = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
         = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
-          = _("Enable Prometheus Metrics")
+          = _("Enable health and performance metrics endpoint")
+        .form-text.text-muted
+          = _('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_to _('Learn More.'), help_page_path('administration/monitoring/prometheus/gitlab_metrics.md'), target: '_blank'
         - unless Gitlab::Metrics.metrics_folder_present?
           .form-text.text-muted
             %strong.cred= _("WARNING:")
             = _("Environment variable %{code_start}%{environment_variable}%{code_end} does not exist or is not pointing to a valid directory.").html_safe % { environment_variable: prometheus_multiproc_dir, code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
             = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
     .form-group
-      = f.label :metrics_method_call_threshold, _('Method Call Threshold (ms)'), class: 'label-bold'
+      = f.label :metrics_method_call_threshold, _('Method call threshold (ms)'), class: 'label-bold'
       = f.number_field :metrics_method_call_threshold, class: 'form-control gl-form-input'
       .form-text.text-muted
-        A method call is only tracked when it takes longer to complete than
-        the given amount of milliseconds.
+        Only track method calls that take longer to complete than the given duration.
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

app/views/admin/application_settings/metrics_and_profiling.html.haml

@@ -11,7 +11,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Enable and configure Prometheus metrics.')
+      = _('Monitor the health and performance of GitLab with Prometheus.')
   .settings-content
     = render 'prometheus'
 

doc/administration/monitoring/prometheus/gitlab_metrics.md

@@ -8,10 +8,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 To enable the GitLab Prometheus metrics:
 
-1. Log into GitLab as a user with [administrator permissions](../../../user/permissions.md).
+1. Log in to GitLab as a user with [administrator permissions](../../../user/permissions.md).
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
 1. On the left sidebar, select **Settings > Metrics and profiling**.
-1. Find the **Metrics - Prometheus** section, and click **Enable Prometheus Metrics**.
+1. Find the **Metrics - Prometheus** section, and select **Add link to Prometheus**.
 1. [Restart GitLab](../../restart_gitlab.md#omnibus-gitlab-restart) for the changes to take effect.
 
 For installations from source you must configure it yourself.

locale/gitlab.pot

@@ -12118,9 +12118,6 @@ msgstr ""
 msgid "Enable PlantUML"
 msgstr ""
 
-msgid "Enable Prometheus Metrics"
-msgstr ""
-
 msgid "Enable Pseudonymizer data collection"
 msgstr ""
 
@@ -12142,15 +12139,12 @@ msgstr ""
 msgid "Enable What's new: Current tier only"
 msgstr ""
 
-msgid "Enable a Prometheus metrics endpoint at %{metrics_path} to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available %{link}."
+msgid "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."
 msgstr ""
 
 msgid "Enable access to the performance bar for non-administrators in a given group."
 msgstr ""
 
-msgid "Enable and configure Prometheus metrics."
-msgstr ""
-
 msgid "Enable and disable Service Desk. Some additional configuration might be required. %{link_start}Learn more%{link_end}."
 msgstr ""
 
@@ -12184,6 +12178,9 @@ msgstr ""
 msgid "Enable header and footer in emails"
 msgstr ""
 
+msgid "Enable health and performance metrics endpoint"
+msgstr ""
+
 msgid "Enable in-product marketing emails"
 msgstr ""
 
@@ -19260,6 +19257,9 @@ msgstr ""
 msgid "Learn More"
 msgstr ""
 
+msgid "Learn More."
+msgstr ""
+
 msgid "Learn how to %{link_start}contribute to the built-in templates%{link_end}"
 msgstr ""
 
@@ -20723,7 +20723,7 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
-msgid "Method Call Threshold (ms)"
+msgid "Method call threshold (ms)"
 msgstr ""
 
 msgid "Metric was successfully added."
@@ -21354,6 +21354,9 @@ msgstr ""
 msgid "Monitor Settings"
 msgstr ""
 
+msgid "Monitor the health and performance of GitLab with Prometheus."
+msgstr ""
+
 msgid "Monitor your errors by integrating with Sentry."
 msgstr ""
 
@@ -33816,9 +33819,6 @@ msgstr ""
 msgid "This setting can be overridden in each project."
 msgstr ""
 
-msgid "This setting requires a %{link_to_restart} to take effect."
-msgstr ""
-
 msgid "This subscription is for"
 msgstr ""
 
@@ -38867,9 +38867,6 @@ msgstr ""
 msgid "help"
 msgstr ""
 
-msgid "here"
-msgstr ""
-
 msgid "http:"
 msgstr ""
 
@@ -39610,9 +39607,6 @@ msgstr ""
 msgid "reset it."
 msgstr ""
 
-msgid "restart"
-msgstr ""
-
 msgid "revised"
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -490,7 +490,7 @@ RSpec.describe 'Admin updates settings' do
 
       it 'change Prometheus settings' do
         page.within('.as-prometheus') do
-          check 'Enable Prometheus Metrics'
+          check 'Enable health and performance metrics endpoint'
           click_button 'Save changes'
         end