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

Edit Grafana UI text

See merge request gitlab-org/gitlab!66405

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

@@ -2,16 +2,16 @@
   = form_errors(@application_setting)
 
   %fieldset
-    %p
-      = _("Add a Grafana button in the admin sidebar, monitoring section, to access a variety of statistics on the health and performance of GitLab.")
-      = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/performance/grafana_configuration.md')
     .form-group
       .form-check
         = f.check_box :grafana_enabled, class: 'form-check-input'
         = f.label :grafana_enabled, class: 'form-check-label' do
-          = _('Enable access to Grafana')
+          = _("Add a link to Grafana")
+        .form-text.text-muted
+          = _("A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area.")
     .form-group
       = f.label :grafana_url, _('Grafana URL'), class: 'label-bold'
       = f.text_field :grafana_url, class: 'form-control gl-form-input', placeholder: '/-/grafana'
+      %span.form-text.text-muted#support_help_block= _('URL of the Grafana instance to link to from the Metrics Dashboard menu item.')
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

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

@@ -22,7 +22,9 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Enable and configure Grafana.')
+      = _('Link to your Grafana instance.')
+      = link_to s_('Learn more.'), help_page_path('administration/monitoring/performance/grafana_configuration.md'), target: '_blank', rel: 'noopener noreferrer'
+
   .settings-content
     = render 'grafana'
 

doc/administration/monitoring/performance/grafana_configuration.md

@@ -65,12 +65,12 @@ GitLab sidebar:
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
 1. On the left sidebar, select **Settings > Metrics and profiling**
    and expand **Metrics - Grafana**.
-1. Check the **Enable access to Grafana** checkbox.
+1. Select the **Add a link to Grafana** checkbox.
 1. Configure the **Grafana URL**:
    - *If Grafana is enabled through Omnibus GitLab and on the same server,*
      leave **Grafana URL** unchanged. It should be `/-/grafana`.
    - *Otherwise,* enter the full URL of the Grafana instance.
-1. Click **Save changes**.
+1. Select **Save changes**.
 
 GitLab displays your link in the **Menu > Admin > Monitoring > Metrics Dashboard**.
 

locale/gitlab.pot

@@ -1405,6 +1405,9 @@ msgstr ""
 msgid "A Let's Encrypt account will be configured for this GitLab installation using your email address. You will receive emails to warn of expiring certificates."
 msgstr ""
 
+msgid "A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area."
+msgstr ""
+
 msgid "A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages"
 msgstr ""
 
@@ -1897,9 +1900,6 @@ msgstr ""
 msgid "Add a GPG key"
 msgstr ""
 
-msgid "Add a Grafana button in the admin sidebar, monitoring section, to access a variety of statistics on the health and performance of GitLab."
-msgstr ""
-
 msgid "Add a Jaeger URL to replace this page with a link to your Jaeger server. You first need to %{link_start_tag}install Jaeger%{link_end_tag}."
 msgstr ""
 
@@ -1936,6 +1936,9 @@ msgstr ""
 msgid "Add a link"
 msgstr ""
 
+msgid "Add a link to Grafana"
+msgstr ""
+
 msgid "Add a new issue"
 msgstr ""
 
@@ -12085,18 +12088,12 @@ 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}."
 msgstr ""
 
-msgid "Enable access to Grafana"
-msgstr ""
-
 msgid "Enable access to the Performance Bar"
 msgstr ""
 
 msgid "Enable access to the Performance Bar for a given group."
 msgstr ""
 
-msgid "Enable and configure Grafana."
-msgstr ""
-
 msgid "Enable and configure Prometheus metrics."
 msgstr ""
 
@@ -19637,6 +19634,9 @@ msgstr ""
 msgid "Link to go to GitLab pipeline documentation"
 msgstr ""
 
+msgid "Link to your Grafana instance."
+msgstr ""
+
 msgid "Linked emails (%{email_count})"
 msgstr ""
 
@@ -34791,6 +34791,9 @@ msgstr ""
 msgid "URL must start with %{codeStart}http://%{codeEnd}, %{codeStart}https://%{codeEnd}, or %{codeStart}ftp://%{codeEnd}"
 msgstr ""
 
+msgid "URL of the Grafana instance to link to from the Metrics Dashboard menu item."
+msgstr ""
+
 msgid "URL of the external Spam Check endpoint"
 msgstr ""