Merge branch...

Merge branch '330229-okr-admin-area-network-incident-management-limits-review-and-revise-settings-related-ui-text' into 'master'

UI Text: Admin Area-Network/Incident Management Limits

See merge request gitlab-org/gitlab!68828

doc/administration/instance_limits.md

@@ -515,17 +515,23 @@ Plan.default.actual_limits.update!(ci_jobs_trace_size_limit: 125)
 
 ## Instance monitoring and metrics
 
-### Incident Management inbound alert limits
+### Limit inbound incident management alerts
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17859) in GitLab 12.5.
 
-Limiting inbound alerts for an incident reduces the number of alerts (issues)
-that can be created within a period of time, which can help prevent overloading
-your incident responders with duplicate issues. You can reduce the volume of
-alerts in the following ways:
+You can limit the number of inbound alerts for [incidents](../operations/incident_management/incidents.md)
+that can be created in a period of time. The inbound [incident management](../operations/incident_management/index.md)
+alert limit can help prevent overloading your incident responders by reducing the
+number of alerts or duplicate issues.
 
-- Max requests per period per project, 3600 seconds by default.
-- Rate limit period in seconds, 3600 seconds by default.
+To set inbound incident management alert limits:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Settings > Network**.
+1. Expand General **Incident Management Limits**.
+1. Select the **Enable Incident Management inbound alert limit** checkbox.
+1. Optional. Input a custom value for **Maximum requests per project per rate limit period**. Default is 3600.
+1. Optional. Input a custom value for **Rate limit period**. Default is 3600 seconds.
 
 ### Prometheus Alert JSON payloads
 

doc/user/admin_area/settings/index.md

@@ -98,7 +98,7 @@ To access the default page for Admin Area settings:
 | [Package Registry Rate Limits](package_registry_rate_limits.md) | Configure specific limits for Packages API requests that supersede the user and IP rate limits. |
 | [Outbound requests](../../../security/webhooks.md) | Allow requests to the local network from hooks and services. |
 | [Protected Paths](protected_paths.md) | Configure paths to be protected by Rack Attack. |
-| [Incident Management](../../../operations/incident_management/index.md) Limits | Configure limits on the number of inbound alerts able to be sent to a project. |
+| [Incident Management](../../../operations/incident_management/index.md) Limits | Limit the number of inbound alerts that can be sent to a project. |
 | [Notes creation limit](rate_limit_on_notes_creation.md)| Set a rate limit on the note creation requests. |
 
 ## Geo

ee/app/views/admin/application_settings/_ee_network_settings.haml

@@ -6,6 +6,7 @@
       %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
         = expanded_by_default? ? _('Collapse') : _('Expand')
       %p
-        = _('Configure limits on the number of inbound alerts able to be sent to a project.')
+        = _('Limit the number of inbound incident management alerts that can be sent to a project.')
+        = link_to _('Learn more.'), help_page_path('administration/instance_limits.md', anchor: 'limit-inbound-incident-management-alerts'), target: '_blank', rel: 'noopener noreferrer'
     .settings-content
       = render 'network_incident_management'

ee/app/views/admin/application_settings/_network_incident_management.html.haml

@@ -6,14 +6,16 @@
       .form-check
         = f.check_box :throttle_incident_management_notification_enabled, class: 'form-check-input', data: { qa_selector: 'throttle_unauthenticated_checkbox' }
         = f.label :throttle_incident_management_notification_enabled, class: 'form-check-label' do
-          = _('Enable Incident Management inbound alert limit')
-        %span.form-text.text-muted
-          = _('Helps reduce alert volume (e.g. if creating too many issues)')
+          = _('Enable incident management inbound alert limit')
+        %span.form-text.gl-text-gray-600
+          = _('Reduce incident management alert volume (for example, if too many issues are being created).')
     .form-group
-      = f.label :throttle_incident_management_notification_period_in_seconds, 'Max requests per period per project', class: 'label-bold'
+      = f.label :throttle_incident_management_notification_period_in_seconds, 'Maximum requests per project per rate limit period', class: 'gl-font-weight-bold'
       = f.number_field :throttle_incident_management_notification_period_in_seconds, class: 'form-control gl-form-input'
     .form-group
-      = f.label :throttle_incident_management_notification_per_period, 'Rate limit period in seconds', class: 'label-bold'
+      = f.label :throttle_incident_management_notification_per_period, 'Rate limit period', class: 'gl-font-weight-bold'
       = f.number_field :throttle_incident_management_notification_per_period, class: 'form-control gl-form-input'
+      .form-text.gl-text-gray-600
+        = _("The time period in seconds that the maximum requests per project limit applies to.")
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

locale/gitlab.pot

@@ -8497,9 +8497,6 @@ msgstr ""
 msgid "Configure limits for web and API requests."
 msgstr ""
 
-msgid "Configure limits on the number of inbound alerts able to be sent to a project."
-msgstr ""
-
 msgid "Configure paths to be protected by Rack Attack."
 msgstr ""
 
@@ -12350,9 +12347,6 @@ msgstr ""
 msgid "Enable Gitpod?"
 msgstr ""
 
-msgid "Enable Incident Management inbound alert limit"
-msgstr ""
-
 msgid "Enable Invisible Captcha during sign up"
 msgstr ""
 
@@ -12440,6 +12434,9 @@ msgstr ""
 msgid "Enable in-product marketing emails"
 msgstr ""
 
+msgid "Enable incident management inbound alert limit"
+msgstr ""
+
 msgid "Enable integration"
 msgstr ""
 
@@ -16499,9 +16496,6 @@ msgstr ""
 msgid "Helps prevent malicious users hide their activity"
 msgstr ""
 
-msgid "Helps reduce alert volume (e.g. if creating too many issues)"
-msgstr ""
-
 msgid "Helps reduce request volume (e.g. from crawlers or abusive bots)"
 msgstr ""
 
@@ -20065,6 +20059,9 @@ msgstr ""
 msgid "Limit the number of concurrent operations this secondary node can run in the background."
 msgstr ""
 
+msgid "Limit the number of inbound incident management alerts that can be sent to a project."
+msgstr ""
+
 msgid "Limit the number of issues and epics per minute a user can create through web and API requests."
 msgstr ""
 
@@ -27558,6 +27555,9 @@ msgstr ""
 msgid "Redis"
 msgstr ""
 
+msgid "Reduce incident management alert volume (for example, if too many issues are being created)."
+msgstr ""
+
 msgid "Reduce project visibility"
 msgstr ""
 
@@ -33538,6 +33538,9 @@ msgstr ""
 msgid "The tag name can't be changed for an existing release."
 msgstr ""
 
+msgid "The time period in seconds that the maximum requests per project limit applies to."
+msgstr ""
+
 msgid "The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination."
 msgstr ""