diff --git a/.betterer.results b/.betterer.results index 2e417682c18..21156f60eab 100644 --- a/.betterer.results +++ b/.betterer.results @@ -2053,8 +2053,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "9"], [0, 0, 0, "No untranslated strings. Wrap text with ", "10"], [0, 0, 0, "No untranslated strings. Wrap text with ", "11"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "12"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "13"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "12"] ], "public/app/features/alerting/unified/components/rule-editor/PreviewRule.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], diff --git a/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx b/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx index 4c48f4c1a3a..5f75bfcde1c 100644 --- a/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx +++ b/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx @@ -87,7 +87,7 @@ export const AmRootRouteForm = ({ <> - Firing alert rule instances are routed to notification policies based on matching labels. All alert rules - and instances, irrespective of their labels, match the default notification policy. If there are no nested - policies, or no nested policies match the labels in the alert rule or alert instance, then the default - notification policy is the matching policy. + Firing alert instances are routed to notification policies based on matching labels. The default + notification policy matches all alert instances. - - - Read about notification routing. - - <> @@ -194,12 +183,12 @@ function NeedHelpInfoForNotificationPolicy() { connect them to your notification policy by adding label matchers. - Read about Labels and annotations. + Read about notification policies. @@ -220,20 +209,18 @@ function NeedHelpInfoForContactpoint() {
Notifications for firing alert instances are grouped based on folder and alert rule name.
- The waiting time until the initial notification is sent for a new group created by an incoming alert is 30 - seconds. + The wait time before sending the first notification for a new group of alerts is 30 seconds.
- The waiting time to send a batch of new alerts for that group after the first notification was sent is 5 - minutes. + The waiting time before sending a notification about changes in the alert group after the first notification + has been sent is 5 minutes.
- The waiting time to resend an alert after they have successfully been sent is 4 hours. + The wait time before resending a notification that has already been sent successfully is 4 hours.
Grouping and wait time values are defined in your default notification policy. } - // todo: update the link with the new documentation about simplified routing - externalLink="`https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/notifications/`" - linkText="Read more about notifiying contact points" + externalLink="https://grafana.com/docs/grafana/latest/alerting/fundamentals/notifications/" + linkText="Read more about notifications" title="Notify contact points" /> ); diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx index cfbc879842a..094c9277ecd 100644 --- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx @@ -68,7 +68,7 @@ export const RoutingSettings = ({ alertManager }: RoutingSettingsProps) => { {overrideGrouping && (