Merge branch 'mjang-okr-issue-300629' into 'master'

Update text in Alert integrations

See merge request gitlab-org/gitlab!58507

app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue

@@ -24,7 +24,7 @@ export const i18n = {
   deleteIntegration: s__('AlertSettings|Delete integration'),
   editIntegration: s__('AlertSettings|Edit integration'),
   title: s__('AlertsIntegrations|Current integrations'),
-  emptyState: s__('AlertsIntegrations|No integrations have been added yet'),
+  emptyState: s__('AlertsIntegrations|No integrations have been added yet.'),
   status: {
     enabled: {
       name: __('Enabled'),
@@ -213,7 +213,7 @@ export default {
       <gl-sprintf
         :message="
           s__(
-            'AlertsIntegrations|You have opted to delete the %{integrationName} integration. Do you want to proceed? It means you will no longer receive alerts from this endpoint in your alert list, and this action cannot be undone.',
+            'AlertsIntegrations|If you delete the %{integrationName} integration, alerts are no longer sent from this endpoint. This action cannot be undone.',
           )
         "
       >

app/assets/javascripts/alerts_settings/constants.js

@@ -10,7 +10,7 @@ export const i18n = {
     selectType: {
       label: s__('AlertSettings|Select integration type'),
       enterprise: s__(
-        'AlertSettings|In free versions of GitLab, only one integration for each type can be added. %{linkStart}Upgrade your subscription%{linkEnd} to add additional integrations.',
+        'AlertSettings|Free versions of GitLab are limited to one integration per type. To add more, %{linkStart}upgrade your subscription%{linkEnd}.',
       ),
     },
     nameIntegration: {
@@ -22,15 +22,15 @@ export const i18n = {
     enableIntegration: {
       label: s__('AlertSettings|Enable integration'),
       help: s__(
-        'AlertSettings|A webhook URL and authorization key will be generated for the integration. Both will be visible after saving the integration in the “View credentials” tab.',
+        'AlertSettings|A webhook URL and authorization key is generated for the integration. After you save the integration, both are visible under the “View credentials” tab.',
       ),
     },
     setupCredentials: {
       help: s__(
-        "AlertSettings|Utilize the URL and authorization key below to authorize an external service to send alerts to GitLab. Review your external service's documentation to learn where to add these details, and the %{linkStart}GitLab documentation%{linkEnd} to learn more about configuring your endpoint.",
+        'AlertSettings|Use the URL and authorization key below to configure how an external service sends alerts to GitLab. %{linkStart}How do I configure the endpoint?%{linkEnd}',
       ),
       prometheusHelp: s__(
-        'AlertSettings|Utilize the URL and authorization key below to authorize Prometheus to send alerts to GitLab. Review the Prometheus documentation to learn where to add these details, and the %{linkStart}GitLab documentation%{linkEnd} to learn more about configuring your endpoint.',
+        'AlertSettings|Use the URL and authorization key below to configure how Prometheus sends alerts to GitLab. Review the %{linkStart}GitLab documentation%{linkEnd} to learn how to configure your endpoint.',
       ),
       webhookUrl: s__('AlertSettings|Webhook URL'),
       authorizationKey: s__('AlertSettings|Authorization key'),
@@ -39,7 +39,7 @@ export const i18n = {
     mapFields: {
       label: s__('AlertSettings|Customize alert payload mapping (optional)'),
       help: s__(
-        'AlertSettings|If you intend to create a custom mapping, provide an example payload from your monitoring tool and click the "parse payload fields" button to continue. The sample payload is required for completing the custom mapping;  if you want to skip the mapping step, progress straight to saving your integration.',
+        'AlertSettings|To create a custom mapping, enter an example payload from your monitoring tool, in JSON format. Select the "Parse payload fields" button to continue.',
       ),
       placeholder: s__('AlertSettings|{ "events": [{ "application": "Name of application" }] }'),
       editPayload: s__('AlertSettings|Edit payload'),
@@ -48,17 +48,15 @@ export const i18n = {
         'AlertSettings|Sample payload has been parsed. You can now map the fields.',
       ),
       resetHeader: s__('AlertSettings|Reset the mapping'),
-      resetBody: s__(
-        "AlertSettings|If you edit the payload, the stored mapping will be reset, and you'll need to re-map the fields.",
-      ),
+      resetBody: s__('AlertSettings|If you edit the payload, you must re-map the fields again.'),
       resetOk: s__('AlertSettings|Proceed with editing'),
       mapIntro: s__(
-        "AlertSettings|The default GitLab alert fields are listed below. If you choose to map your payload keys to GitLab's, please make a selection in the dropdowns below. You may also opt to leave the fields unmapped and move straight to saving your integration.",
+        'AlertSettings|You can map default GitLab alert fields to your payload keys in the dropdowns below.',
       ),
     },
     testPayload: {
       help: s__(
-        'AlertSettings|Provide an example payload from the monitoring tool you intend to integrate with. This will allow you to send an alert to an active GitLab alerting point.',
+        'AlertSettings|Enter an example payload from your selected monitoring tool. This supports sending alerts to a GitLab endpoint.',
       ),
       placeholder: s__('AlertSettings|{ "events": [{ "application": "Name of application" }] }'),
       modalTitle: s__('AlertSettings|The form has unsaved changes'),
@@ -69,13 +67,13 @@ export const i18n = {
     },
     prometheusFormUrl: {
       label: s__('AlertSettings|Prometheus API base URL'),
-      help: s__('AlertSettings|URL cannot be blank and must start with http or https'),
+      help: s__('AlertSettings|URL cannot be blank and must start with http: or https:.'),
       blankUrlError: __('URL cannot be blank'),
       invalidUrlError: __('URL is invalid'),
     },
     restKeyInfo: {
       label: s__(
-        'AlertSettings|Resetting the authorization key for this project will require updating the authorization key in every alert source it is enabled in.',
+        'AlertSettings|If you reset the authorization key for this project, you must update the key in every enabled alert source.',
       ),
     },
   },
@@ -87,15 +85,13 @@ export const i18n = {
   integrationCreated: {
     title: s__('AlertSettings|Integration successfully saved'),
     successMsg: s__(
-      'AlertSettings|A URL and authorization key  have been created for your integration. You will need them to setup a webhook and authorize your endpoint to send alerts to GitLab.',
+      'AlertSettings|GitLab has created a URL and authorization key for your integration. You can use them to set up a webhook and authorize your endpoint to send alerts to GitLab.',
     ),
     btnCaption: s__('AlertSettings|View URL and authorization key'),
   },
-  changesSaved: s__('AlertsIntegrations|The integration has been successfully saved.'),
-  integrationRemoved: s__('AlertsIntegrations|The integration has been successfully removed.'),
-  alertSent: s__(
-    'AlertsIntegrations|The test alert has been successfully sent, and should now be visible on your alerts list.',
-  ),
+  changesSaved: s__('AlertsIntegrations|The integration is saved.'),
+  integrationRemoved: s__('AlertsIntegrations|The integration is deleted.'),
+  alertSent: s__('AlertsIntegrations|The test alert should now be visible in your alerts list.'),
   addNewIntegration: s__('AlertSettings|Add new integration'),
 };
 

app/views/projects/settings/operations/_alert_management.html.haml

@@ -10,7 +10,7 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = _('Expand')
     %p
-      = _('Display alerts from all your monitoring tools directly within GitLab.')
-      = link_to _('More information'), help_page_path('operations/incident_management/integrations.md'), target: '_blank', rel: 'noopener noreferrer'
+      = _('Display alerts from all configured monitoring tools.')
+      = link_to _('Learn more.'), help_page_path('operations/incident_management/integrations.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     .js-alerts-settings{ data: alerts_settings_data }

changelogs/unreleased/mjang-okr-issue-300629.yml

+---
+title: Updated Alert integration UI text to match style guidelines
+merge_request: 58507
+author:
+type: other

changelogs/unreleased/mjang-okr-issue300633.yml

----
-title: Update UI text to match style guidelines
-merge_request:
-author:
-type: other

locale/gitlab.pot

@@ -2900,10 +2900,7 @@ msgstr ""
 msgid "AlertMappingBuilder|Title is a required field for alerts in GitLab. Should the payload field you specified not be available, specifiy which field we should use instead. "
 msgstr ""
 
-msgid "AlertSettings|A URL and authorization key  have been created for your integration. You will need them to setup a webhook and authorize your endpoint to send alerts to GitLab."
-msgstr ""
-
-msgid "AlertSettings|A webhook URL and authorization key will be generated for the integration. Both will be visible after saving the integration in the “View credentials” tab."
+msgid "AlertSettings|A webhook URL and authorization key is generated for the integration. After you save the integration, both are visible under the “View credentials” tab."
 msgstr ""
 
 msgid "AlertSettings|Add new integration"
@@ -2930,19 +2927,25 @@ msgstr ""
 msgid "AlertSettings|Enable integration"
 msgstr ""
 
+msgid "AlertSettings|Enter an example payload from your selected monitoring tool. This supports sending alerts to a GitLab endpoint."
+msgstr ""
+
 msgid "AlertSettings|Enter integration name"
 msgstr ""
 
-msgid "AlertSettings|HTTP Endpoint"
+msgid "AlertSettings|Free versions of GitLab are limited to one integration per type. To add more, %{linkStart}upgrade your subscription%{linkEnd}."
+msgstr ""
+
+msgid "AlertSettings|GitLab has created a URL and authorization key for your integration. You can use them to set up a webhook and authorize your endpoint to send alerts to GitLab."
 msgstr ""
 
-msgid "AlertSettings|If you edit the payload, the stored mapping will be reset, and you'll need to re-map the fields."
+msgid "AlertSettings|HTTP Endpoint"
 msgstr ""
 
-msgid "AlertSettings|If you intend to create a custom mapping, provide an example payload from your monitoring tool and click the \"parse payload fields\" button to continue. The sample payload is required for completing the custom mapping;  if you want to skip the mapping step, progress straight to saving your integration."
+msgid "AlertSettings|If you edit the payload, you must re-map the fields again."
 msgstr ""
 
-msgid "AlertSettings|In free versions of GitLab, only one integration for each type can be added. %{linkStart}Upgrade your subscription%{linkEnd} to add additional integrations."
+msgid "AlertSettings|If you reset the authorization key for this project, you must update the key in every enabled alert source."
 msgstr ""
 
 msgid "AlertSettings|Integration successfully saved"
@@ -2963,18 +2966,12 @@ msgstr ""
 msgid "AlertSettings|Prometheus API base URL"
 msgstr ""
 
-msgid "AlertSettings|Provide an example payload from the monitoring tool you intend to integrate with. This will allow you to send an alert to an active GitLab alerting point."
-msgstr ""
-
 msgid "AlertSettings|Reset Key"
 msgstr ""
 
 msgid "AlertSettings|Reset the mapping"
 msgstr ""
 
-msgid "AlertSettings|Resetting the authorization key for this project will require updating the authorization key in every alert source it is enabled in."
-msgstr ""
-
 msgid "AlertSettings|Sample payload has been parsed. You can now map the fields."
 msgstr ""
 
@@ -2996,22 +2993,22 @@ msgstr ""
 msgid "AlertSettings|Send without saving"
 msgstr ""
 
-msgid "AlertSettings|The default GitLab alert fields are listed below. If you choose to map your payload keys to GitLab's, please make a selection in the dropdowns below. You may also opt to leave the fields unmapped and move straight to saving your integration."
-msgstr ""
-
 msgid "AlertSettings|The form has unsaved changes"
 msgstr ""
 
 msgid "AlertSettings|The form has unsaved changes. How would you like to proceed?"
 msgstr ""
 
-msgid "AlertSettings|URL cannot be blank and must start with http or https"
+msgid "AlertSettings|To create a custom mapping, enter an example payload from your monitoring tool, in JSON format. Select the \"Parse payload fields\" button to continue."
+msgstr ""
+
+msgid "AlertSettings|URL cannot be blank and must start with http: or https:."
 msgstr ""
 
-msgid "AlertSettings|Utilize the URL and authorization key below to authorize Prometheus to send alerts to GitLab. Review the Prometheus documentation to learn where to add these details, and the %{linkStart}GitLab documentation%{linkEnd} to learn more about configuring your endpoint."
+msgid "AlertSettings|Use the URL and authorization key below to configure how Prometheus sends alerts to GitLab. Review the %{linkStart}GitLab documentation%{linkEnd} to learn how to configure your endpoint."
 msgstr ""
 
-msgid "AlertSettings|Utilize the URL and authorization key below to authorize an external service to send alerts to GitLab. Review your external service's documentation to learn where to add these details, and the %{linkStart}GitLab documentation%{linkEnd} to learn more about configuring your endpoint."
+msgid "AlertSettings|Use the URL and authorization key below to configure how an external service sends alerts to GitLab. %{linkStart}How do I configure the endpoint?%{linkEnd}"
 msgstr ""
 
 msgid "AlertSettings|View URL and authorization key"
@@ -3023,6 +3020,9 @@ msgstr ""
 msgid "AlertSettings|Webhook URL"
 msgstr ""
 
+msgid "AlertSettings|You can map default GitLab alert fields to your payload keys in the dropdowns below."
+msgstr ""
+
 msgid "AlertSettings|You can now set up alert endpoints for manually configured Prometheus instances in the Alerts section on the Operations settings page. Alert endpoint fields on this page have been deprecated."
 msgstr ""
 
@@ -3041,13 +3041,16 @@ msgstr ""
 msgid "AlertsIntegrations|Current integrations"
 msgstr ""
 
+msgid "AlertsIntegrations|If you delete the %{integrationName} integration, alerts are no longer sent from this endpoint. This action cannot be undone."
+msgstr ""
+
 msgid "AlertsIntegrations|Integration Name"
 msgstr ""
 
 msgid "AlertsIntegrations|Integration payload is invalid."
 msgstr ""
 
-msgid "AlertsIntegrations|No integrations have been added yet"
+msgid "AlertsIntegrations|No integrations have been added yet."
 msgstr ""
 
 msgid "AlertsIntegrations|The current integration could not be updated. Please try again."
@@ -3059,22 +3062,19 @@ msgstr ""
 msgid "AlertsIntegrations|The integration could not be deleted. Please try again."
 msgstr ""
 
-msgid "AlertsIntegrations|The integration has been successfully removed."
+msgid "AlertsIntegrations|The integration is currently inactive. Enable the integration to send the test alert."
 msgstr ""
 
-msgid "AlertsIntegrations|The integration has been successfully saved."
+msgid "AlertsIntegrations|The integration is deleted."
 msgstr ""
 
-msgid "AlertsIntegrations|The integration is currently inactive. Enable the integration to send the test alert."
+msgid "AlertsIntegrations|The integration is saved."
 msgstr ""
 
 msgid "AlertsIntegrations|The integration token could not be reset. Please try again."
 msgstr ""
 
-msgid "AlertsIntegrations|The test alert has been successfully sent, and should now be visible on your alerts list."
-msgstr ""
-
-msgid "AlertsIntegrations|You have opted to delete the %{integrationName} integration. Do you want to proceed? It means you will no longer receive alerts from this endpoint in your alert list, and this action cannot be undone."
+msgid "AlertsIntegrations|The test alert should now be visible in your alerts list."
 msgstr ""
 
 msgid "Algorithm"
@@ -11169,7 +11169,7 @@ msgstr ""
 msgid "Dismissed on pipeline %{pipelineLink} at %{projectLink}"
 msgstr ""
 
-msgid "Display alerts from all your monitoring tools directly within GitLab."
+msgid "Display alerts from all configured monitoring tools."
 msgstr ""
 
 msgid "Display name"

spec/views/projects/settings/operations/show.html.haml_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe 'projects/settings/operations/show' do
       render
 
       expect(rendered).to have_content _('Alert integrations')
-      expect(rendered).to have_content _('Display alerts from all your monitoring tools directly within GitLab.')
+      expect(rendered).to have_content _('Display alerts from all configured monitoring tools.')
     end
   end