From 48207c76183fe314dc15f452a1cf317a20a96232 Mon Sep 17 00:00:00 2001 From: tonypowa Date: Thu, 20 Jun 2024 16:05:27 +0200 Subject: [PATCH] author,figures --- .../tutorials/alerting-get-started-pt2/index.md | 10 +++++----- docs/sources/tutorials/alerting-get-started/index.md | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/sources/tutorials/alerting-get-started-pt2/index.md b/docs/sources/tutorials/alerting-get-started-pt2/index.md index 7551c77fba7..ae75659e47b 100644 --- a/docs/sources/tutorials/alerting-get-started-pt2/index.md +++ b/docs/sources/tutorials/alerting-get-started-pt2/index.md @@ -39,7 +39,7 @@ Let's consider a scenario where you're monitoring website traffic using Grafana. If the query returns more than one time-series, each time-series represents a different metric or aspect being monitored. In this case, the alert rule is applied individually to each time-series. -{{< figure src="/media/docs/alerting/alerting-always-firing-alert.png" max-width="1200px" caption="Alert Instances in the Context of an Alert Rule" >}} +{{< figure src="/media/docs/alerting/get-started-digram-instance-grey.png" max-width="1200px" caption="Alert Instances in the Context of an Alert Rule" >}} In this scenario, each time-series is evaluated independently against the alert rule. It results in the creation of an alert instance for each time-series. The time-series corresponding to the desktop page views meets the threshold and, therefore, results in an alert instance in **Firing** state for which an alert notification will be sent. The mobile alert instance state remains **Normal**. @@ -52,7 +52,7 @@ Key Characteristics: - Route alert notifications by matching alerts and policies with labels - Manage when to send notifications -{{< figure src="/media/docs/alerting/alerting-always-firing-alert.png" max-width="1200px" caption="Routing of alerts with notification policies" >}} +{{< figure src="/media/docs/alerting/get-started-notification-policy-tree-combo.png" max-width="1200px" caption="Routing of alerts with notification policies" >}} In the above diagram, alert instances and notification policies are matched by labels. For instance, the label `team=operations` matches the alert instance “**Pod stuck in CrashLoop**” and “**Disk Usage -80%**” to child policies that send alert notifications to a particular contact point (operations@grafana.com). @@ -122,7 +122,7 @@ The above CSV data simulates a data source returning multiple time series, each It should return two series.`desktop` in Firing state, and `mobile` in Normal state. The values `1`, and `0` mean that the condition is either `true` or `false`. -{{< figure src="/media/docs/alerting/alerting-always-firing-alert.png" max-width="1200px" caption="Preview of a query returning two alert instances in Grafana." >}} +{{< figure src="/media/docs/alerting/get-started-expression-instances.png" max-width="1200px" caption="Preview of a query returning two alert instances in Grafana." >}} ### Set evaluation behavior @@ -144,7 +144,7 @@ In this section, you can select how you want to route your alert instances. Sinc These [types of labels](https://grafana.com/docs/grafana/next/alerting/fundamentals/alert-rules/annotation-label/#label-types) are generated by the data source query and they can be leveraged to match our notification policies without needing to manually add them to the alert rule. -{{< figure src="/media/docs/alerting/alerting-always-firing-alert.png" max-width="1200px" caption="Routing preview of matched notification policies" >}} +{{< figure src="/media/docs/alerting/get-started-alert-instace-routing-prev.png" max-width="1200px" caption="Routing preview of matched notification policies" >}} {{< admonition type="note" >}} Even if both labels match the policies, only the alert instance in Firing state produces an alert notification. @@ -158,7 +158,7 @@ Now that we have set up the alert rule, it’s time to check the alert notificat Now that the alert rule has been configured, you should receive alert [notifications](http://grafana.com/docs/grafana/next/alerting/fundamentals/alert-rule-evaluation/state-and-health/#notifications) in the contact point whenever the alert triggers and gets resolved. In our example, each alert instance should be routed separately as we configured labels to match notification policies. Once the evaluation interval has concluded (1m), you should receive an alert notification in the Webhook endpoint. -{{< figure src="/media/docs/alerting/alerting-always-firing-alert.png" max-width="1200px" caption="" >}} +{{< figure src="/media/docs/alerting/get-started-webhook-alert-isntance.png" max-width="1200px" caption="" >}} The alert notification details show that the alert instance corresponding to the website views from desktop devices was correctly routed through the notification policy to the Webhook contact point. The notification also shows that the instance is in **Firing** state, as well as it includes the label `device=desktop`, which makes the routing of the alert instance possible. diff --git a/docs/sources/tutorials/alerting-get-started/index.md b/docs/sources/tutorials/alerting-get-started/index.md index 18ac15cee5b..59ef4d286b1 100644 --- a/docs/sources/tutorials/alerting-get-started/index.md +++ b/docs/sources/tutorials/alerting-get-started/index.md @@ -1,7 +1,5 @@ --- Feedback Link: https://github.com/grafana/tutorials/issues/new -authors: - - antonio-calero-merello categories: - alerting description: Get started with Grafana Alerting by creating your first alert in just a few minutes. Learn how to set up an alert, send alert notifications to a public webhook, and generate sample data to observe your alert in action.