public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Navigation: Rename Alerts & incidents to Alerts & IRM (#65635)

Browse Source 
update Alerts & incidents to Alerts & IRM
This commit is contained in:
Ashley Harrison
2023-03-31 09:40:06 +01:00
committed by GitHub
parent a123e0a97c
commit e39c3b76dd
14 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+1 -1
View File
@@ -20,7 +20,7 @@ Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
## Add Grafana managed rule ## Add Grafana managed rule
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules**. 1. Click **Alert rules**.
1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alerts** option is selected by default. 1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alerts** option is selected by default.
1. In Step 1, add the rule name. 1. In Step 1, add the rule name.
docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
+2 -2
View File
@@ -34,7 +34,7 @@ You can create and manage recording rules for an external Grafana Mimir or Loki
To create a Grafana Mimir or Loki managed recording rule To create a Grafana Mimir or Loki managed recording rule
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules**. 1. Click **Alert rules**.
1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alert** option is selected by default. 1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alert** option is selected by default.
1. In Step 1, add the rule name. The recording name must be a Prometheus metric name and contain no whitespace. 1. In Step 1, add the rule name. The recording name must be a Prometheus metric name and contain no whitespace.
@@ -51,7 +51,7 @@ To create a Grafana Mimir or Loki managed recording rule
<!-- delete next steps? --> <!-- delete next steps? -->
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules**. 1. Click **Alert rules**.
1. Click **+ Create alert rule**. 1. Click **+ Create alert rule**.
1. In Step 1, add the rule name. 1. In Step 1, add the rule name.
docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+1 -1
View File
@@ -34,7 +34,7 @@ Watch this video to learn more about how to create a Mimir managed alert rule: {
## Add a Grafana Mimir or Loki managed alerting rule ## Add a Grafana Mimir or Loki managed alerting rule
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules**. 1. Click **Alert rules**.
1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alerts** option is selected by default. 1. Click **+ Create alert rule**. The new alerting rule page opens where the **Grafana managed alerts** option is selected by default.
1. In Step 1, add the rule name. 1. In Step 1, add the rule name.
docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md
+2 -2
View File
@@ -29,7 +29,7 @@ A namespace contains one or more groups. The rules within a group are run sequen
To rename a namespace: To rename a namespace:
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules** to view the list of existing alerts. 1. Click **Alert rules** to view the list of existing alerts.
1. Find a Grafana Mimir or Loki managed rule with the group that belongs to the namespace you want to edit. 1. Find a Grafana Mimir or Loki managed rule with the group that belongs to the namespace you want to edit.
1. Click the **Edit** (pen) icon. 1. Click the **Edit** (pen) icon.
@@ -41,7 +41,7 @@ A new namespace is created and all groups are copied into this namespace from th
The rules within a group are run sequentially at a regular interval, the default interval is one (1) minute. You can modify this interval using the following instructions. The rules within a group are run sequentially at a regular interval, the default interval is one (1) minute. You can modify this interval using the following instructions.
1. In the left-side menu, click the **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click the **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules** to view the list of existing alerts. 1. Click **Alert rules** to view the list of existing alerts.
1. Find a Grafana Mimir or Loki managed rule with the group you want to edit. 1. Find a Grafana Mimir or Loki managed rule with the group you want to edit.
1. Click **Edit** (pen) icon. 1. Click **Edit** (pen) icon.
docs/sources/alerting/alerting-rules/view-state-health.md
+1 -1
View File
@@ -22,7 +22,7 @@ There are three key components: [alert rule state](#alert-rule-state), [alert in
To view the state and health of your alert rules: To view the state and health of your alert rules:
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Alert rules** to view the list of existing alerts. 1. Click **Alert rules** to view the list of existing alerts.
1. Click an alert rule to view its state, health, and state history. 1. Click an alert rule to view its state, health, and state history.
docs/sources/alerting/manage-notifications/create-notification-policy.md
+4 -4
View File
@@ -36,7 +36,7 @@ You can configure grouping to be `group_by: [alertname]` (take note that the `en
> **Note:** Before Grafana v8.2, the configuration of the embedded Alertmanager was shared across organizations. Users of Grafana 8.0 and 8.1 are advised to use the new Grafana 8 Alerts only if they have one organization. Otherwise, silences for the Grafana managed alerts will be visible by all organizations. > **Note:** Before Grafana v8.2, the configuration of the embedded Alertmanager was shared across organizations. Users of Grafana 8.0 and 8.1 are advised to use the new Grafana 8 Alerts only if they have one organization. Otherwise, silences for the Grafana managed alerts will be visible by all organizations.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Notification policies**. 1. Click **Notification policies**.
1. From the **Choose Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected. 1. From the **Choose Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected.
1. In the Root policy section, click **Edit**. 1. In the Root policy section, click **Edit**.
@@ -50,7 +50,7 @@ You can configure grouping to be `group_by: [alertname]` (take note that the `en
## Add new nested policy ## Add new nested policy
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Notification policies**. 1. Click **Notification policies**.
1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, the **Grafana Alertmanager** is selected. 1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, the **Grafana Alertmanager** is selected.
1. To add a top level specific policy, go to the Specific routing section and click **+ New specific policy**. 1. To add a top level specific policy, go to the Specific routing section and click **+ New specific policy**.
@@ -63,7 +63,7 @@ You can configure grouping to be `group_by: [alertname]` (take note that the `en
## Add nested policy ## Add nested policy
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Notification policies**. 1. Click **Notification policies**.
1. Expand the specific policy you want to update. 1. Expand the specific policy you want to update.
1. Click **+ Add nested policy**, then add the details using information in [Add new specific policy](#add-new-specific-policy). 1. Click **+ Add nested policy**, then add the details using information in [Add new specific policy](#add-new-specific-policy).
@@ -71,7 +71,7 @@ You can configure grouping to be `group_by: [alertname]` (take note that the `en
## Edit specific policy ## Edit specific policy
1. In the left-side menu, click **Alerts & incidents**, and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
1. Click **Notification policies**. 1. Click **Notification policies**.
1. Find the policy you want to edit, then click **Edit**. 1. Find the policy you want to edit, then click **Edit**.
1. Make any changes using instructions in [Add new specific policy](#add-new-specific-policy). 1. Make any changes using instructions in [Add new specific policy](#add-new-specific-policy).
docs/sources/alerting/manage-notifications/create-silence.md
+3 -3
View File
@@ -25,7 +25,7 @@ Silences stop notifications from getting created and last for only a specified w
To add a silence, complete the following steps. To add a silence, complete the following steps.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Silences**. 1. Click **Silences**.
1. From the **Alertmanager** dropdown, select an external Alertmanager to create and manage silences for the external data source. Otherwise, keep the default option of Grafana. 1. From the **Alertmanager** dropdown, select an external Alertmanager to create and manage silences for the external data source. Otherwise, keep the default option of Grafana.
1. Click **Create silence** to open the Create silence page. 1. Click **Create silence** to open the Create silence page.
@@ -39,7 +39,7 @@ To add a silence, complete the following steps.
To edit a silence, complete the following steps. To edit a silence, complete the following steps.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Silences** to view the list of existing silences. 1. Click **Silences** to view the list of existing silences.
1. Find the silence you want to edit, then click **Edit** (pen icon). 1. Find the silence you want to edit, then click **Edit** (pen icon).
1. Make the desired changes, then click **Submit** to save your changes. 1. Make the desired changes, then click **Submit** to save your changes.
@@ -56,7 +56,7 @@ To link to a new silence page for an external Alertmanager, add a `alertmanager`
To remove a silence, complete the following steps. To remove a silence, complete the following steps.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Silences** to view the list of existing silences. 1. Click **Silences** to view the list of existing silences.
1. Select the silence you want to end, then click **Unsilence**. 1. Select the silence you want to end, then click **Unsilence**.
docs/sources/alerting/manage-notifications/manage-contact-points/_index.md
+4 -4
View File
@@ -23,7 +23,7 @@ Use contact points to define how your contacts are notified when an alert rule f
Complete the following steps to add a contact point. Complete the following steps to add a contact point.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Contact points**. 1. Click **Contact points**.
1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, **Grafana Alertmanager** is selected. 1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, **Grafana Alertmanager** is selected.
1. Click **+ Add contact point**. 1. Click **+ Add contact point**.
@@ -38,7 +38,7 @@ Complete the following steps to add a contact point.
Complete the following steps to edit a contact point. Complete the following steps to edit a contact point.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Contact points** to view a list of existing contact points. 1. Click **Contact points** to view a list of existing contact points.
1. Find the contact point to edit, and then click **Edit** (pen icon). 1. Find the contact point to edit, and then click **Edit** (pen icon).
1. Make any changes and click **Save contact point**. 1. Make any changes and click **Save contact point**.
@@ -47,7 +47,7 @@ Complete the following steps to edit a contact point.
Complete the following steps to delete a contact point. Complete the following steps to delete a contact point.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Contact points** to view a list of existing contact points. 1. Click **Contact points** to view a list of existing contact points.
1. Find the contact point to delete, and then click **Delete** (trash icon). 1. Find the contact point to delete, and then click **Delete** (trash icon).
1. In the confirmation dialog, click **Yes, delete**. 1. In the confirmation dialog, click **Yes, delete**.
@@ -58,7 +58,7 @@ Complete the following steps to delete a contact point.
Complete the following steps to test a contact point. Complete the following steps to test a contact point.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Contact points** to view a list of existing contact points. 1. Click **Contact points** to view a list of existing contact points.
1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed. 1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed.
1. Click **Test** to open the contact point testing modal. 1. Click **Test** to open the contact point testing modal.
docs/sources/alerting/manage-notifications/mute-timings.md
+2 -2
View File
@@ -33,7 +33,7 @@ The following table highlights the key differences between mute timings and sile
## Create a mute timing ## Create a mute timing
1. In the left-side menu, click **Alerts & incidents**, and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
1. Click **Notification policies**. 1. Click **Notification policies**.
1. From the **Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected. 1. From the **Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected.
1. Scroll down to the Mute timings section. 1. Scroll down to the Mute timings section.
@@ -43,7 +43,7 @@ The following table highlights the key differences between mute timings and sile
## Add mute timing to a notification policy ## Add mute timing to a notification policy
1. In the left-side menu, click **Alerts & incidents**, and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM**, and then **Alerting**.
1. Click **Notification policies**. 1. Click **Notification policies**.
1. Identify the notification policy you would like to add the mute timing to and click the **Edit** button for that policy. 1. Identify the notification policy you would like to add the mute timing to and click the **Edit** button for that policy.
1. In the Specific routing section, from the **Mute timings** dropdown, select the mute timings you would like to add to the route. 1. In the Specific routing section, from the **Mute timings** dropdown, select the mute timings you would like to add to the route.
docs/sources/alerting/manage-notifications/view-alert-groups.md
+1 -1
View File
@@ -25,7 +25,7 @@ You can view alert groups and also filter for alert rules that match specific cr
To view alert groups, complete the following steps. To view alert groups, complete the following steps.
1. In the left-side menu, click **Alerts & incidents** and then **Alerting**. 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
1. Click **Groups** to view the list of existing groups. 1. Click **Groups** to view the list of existing groups.
1. From the **Alertmanager** dropdown, select an external Alertmanager as your data source. By default, the `Grafana` Alertmanager is selected. 1. From the **Alertmanager** dropdown, select an external Alertmanager as your data source. By default, the `Grafana` Alertmanager is selected.
1. From **Custom group by** dropdown, select a combination of labels to view a grouping other than the default. This is useful for debugging and verifying your grouping of notification policies. 1. From **Custom group by** dropdown, select a combination of labels to view a grouping other than the default. This is useful for debugging and verifying your grouping of notification policies.
pkg/services/navtree/navtreeimpl/applinks.go
+1 -1
View File
@@ -234,7 +234,7 @@ func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *n
} }
alertsAndIncidentsChildren = append(alertsAndIncidentsChildren, appLink) alertsAndIncidentsChildren = append(alertsAndIncidentsChildren, appLink)
treeRoot.AddSection(&navtree.NavLink{ treeRoot.AddSection(&navtree.NavLink{
Text: "Alerts & incidents", Text: "Alerts & IRM",
Id: navtree.NavIDAlertsAndIncidents, Id: navtree.NavIDAlertsAndIncidents,
SubTitle: "Alerting and incident management apps", SubTitle: "Alerting and incident management apps",
Icon: "bell", Icon: "bell",
public/app/core/components/NavBar/navBarItem-translations.ts
+1 -1
View File
@@ -114,7 +114,7 @@ export function getNavTitle(navId: string | undefined) {
case 'apps': case 'apps':
return t('nav.apps.title', 'Apps'); return t('nav.apps.title', 'Apps');
case 'alerts-and-incidents': case 'alerts-and-incidents':
return t('nav.alerts-and-incidents.title', 'Alerts & incidents'); return t('nav.alerts-and-incidents.title', 'Alerts & IRM');
case 'help': case 'help':
return t('nav.help.title', 'Help'); return t('nav.help.title', 'Help');
case 'profile/settings': case 'profile/settings':
public/locales/en-US/grafana.json
+1 -1
View File
@@ -174,7 +174,7 @@
}, },
"alerts-and-incidents": { "alerts-and-incidents": {
"subtitle": "Alerting and incident management apps", "subtitle": "Alerting and incident management apps",
"title": "Alerts & incidents" "title": "Alerts & IRM"
}, },
"api-keys": { "api-keys": {
"subtitle": "Manage and create API keys that are used to interact with Grafana HTTP APIs", "subtitle": "Manage and create API keys that are used to interact with Grafana HTTP APIs",
public/locales/pseudo-LOCALE/grafana.json
+1 -1
View File
@@ -174,7 +174,7 @@
}, },
"alerts-and-incidents": { "alerts-and-incidents": {
"subtitle": "Åľęřŧįʼnģ äʼnđ įʼnčįđęʼnŧ mäʼnäģęmęʼnŧ äppş", "subtitle": "Åľęřŧįʼnģ äʼnđ įʼnčįđęʼnŧ mäʼnäģęmęʼnŧ äppş",
"title": "Åľęřŧş & įʼnčįđęʼnŧş" "title": "Åľęřŧş & ĨŖM"
}, },
"api-keys": { "api-keys": {
"subtitle": "Mäʼnäģę äʼnđ čřęäŧę ÅPĨ ĸęyş ŧĥäŧ äřę ūşęđ ŧő įʼnŧęřäčŧ ŵįŧĥ Ğřäƒäʼnä ĦŦŦP ÅPĨş", "subtitle": "Mäʼnäģę äʼnđ čřęäŧę ÅPĨ ĸęyş ŧĥäŧ äřę ūşęđ ŧő įʼnŧęřäčŧ ŵįŧĥ Ğřäƒäʼnä ĦŦŦP ÅPĨş",