[v9.4.x] Docs: Update wording / text and copy (#62490)
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com> Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
This commit is contained in:
co-authored by
brendamuir
Gilles De Mey
parent
1b0f5f0a81
commit
992e5d72ff
@@ -21,7 +21,7 @@ Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
|
||||
## Add Grafana managed rule
|
||||
|
||||
1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
|
||||
1. Click **New 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.
|
||||
- In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
|
||||
1. In Step 2, add queries and expressions to evaluate, and then select the alert condition.
|
||||
|
||||
@@ -35,7 +35,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
|
||||
|
||||
1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
|
||||
1. Click **New 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.
|
||||
- In **Rule name**, add a descriptive name.
|
||||
1. In Step 2, select **Mimir or Loki recording rule** option.
|
||||
@@ -49,7 +49,7 @@ To create a Grafana Mimir or Loki managed recording rule
|
||||
1. Click **Save** to save the recording rule or **Save and exit** to save the recording rule and go back to the Alerting page.
|
||||
|
||||
1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
|
||||
1. Click **New alert rule**.
|
||||
1. Click **Create alert rule**.
|
||||
1. In Step 1, add the rule name.
|
||||
- In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
|
||||
1. In Step 2, add the type, and storage location.
|
||||
|
||||
@@ -35,7 +35,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
|
||||
|
||||
1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
|
||||
1. Click **New 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.
|
||||
- In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
|
||||
1. In Step 2, select **Mimir or Loki alert** option.
|
||||
|
||||
@@ -24,13 +24,13 @@ Complete the following steps to add a contact point.
|
||||
|
||||
1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
|
||||
1. Click **Contact points** to open the page listing existing contact points.
|
||||
1. Click **New contact point**.
|
||||
1. Click **Add contact point**.
|
||||
1. From the **Alertmanager** dropdown, select an Alertmanager. By default, Grafana Alertmanager is selected.
|
||||
1. In **Name**, enter a descriptive name for the contact point.
|
||||
1. From **Contact point integration**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
|
||||
1. Some contact point integrations, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point integration.
|
||||
1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
|
||||
1. To add another contact point integration, click **New contact point integration** and repeat steps 6 through 8.
|
||||
1. To add another contact point integration, click **Add contact point integration** and repeat steps 6 through 8.
|
||||
1. Click **Save contact point** to save your changes.
|
||||
|
||||
## Edit a contact point
|
||||
|
||||
@@ -28,7 +28,7 @@ To add a silence, complete the following steps.
|
||||
1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
|
||||
2. On the Alerting page, click **Silences** to open the page listing existing silences.
|
||||
3. From Alertmanager drop-down, select an external Alertmanager to create and manage silences for the external data source. Otherwise, keep the default option of Grafana.
|
||||
4. Click **New Silence** to open the Create silence page.
|
||||
4. Click **Add Silence** to open the Create silence page.
|
||||
5. In **Silence start and end**, select the start and end date to indicate when the silence should go into effect and expire.
|
||||
6. Optionally, in **Duration**, specify how long the silence is enforced. This automatically updates the end time in the **Silence start and end** field.
|
||||
7. In the **Name** and **Value** fields, enter one or more _Matching Labels_. Matchers determine which rules the silence will apply to.
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ In the Contact points tab, you can see a list of your notification templates.
|
||||
|
||||
To create a template, complete the following steps.
|
||||
|
||||
1. Click New template.
|
||||
1. Click **Add template**.
|
||||
|
||||
2. Choose a name for the notification template.
|
||||
|
||||
@@ -40,7 +40,7 @@ To create a template, complete the following steps.
|
||||
|
||||
To create a notification template that contains more than one template:
|
||||
|
||||
1. Click New Template.
|
||||
1. Click **Add Template**.
|
||||
|
||||
2. Enter a name for the notification template.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user