From 72d296843d67aea7bfdd676036d5a33790603b2c Mon Sep 17 00:00:00 2001 From: Armand Grillet <2117580+armandgrillet@users.noreply.github.com> Date: Fri, 27 Aug 2021 15:09:28 +0200 Subject: [PATCH] Docs: clarify state of Unified Alerting (#38603) * Docs: clarify state of Unified Alerting * Update docs/sources/alerting/unified-alerting/_index.md Co-authored-by: Kyle Brandt * Adjusted note to move below the introduction. * Fixed a typo and added beta notes. * Minor typo fix. * Docs: remove innacurate beta label for Grafana 8.0 Grafana 8.0 is not in beta, only unified alerting. Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Kyle Brandt Co-authored-by: achatterjee-grafana --- docs/sources/alerting/_index.md | 4 +++- docs/sources/alerting/unified-alerting/_index.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md index f713ac1d842..046f98ea24f 100644 --- a/docs/sources/alerting/_index.md +++ b/docs/sources/alerting/_index.md @@ -7,7 +7,9 @@ weight = 110 Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. -Grafana 8.0 has new and improved alerts. The new alerting system are an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible data sources in one UI and API. +Grafana 8.0 has new and improved alerts. The new alerting system is an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible data sources in one UI and API. + +> **Note:** Out of the box, Grafana still supports old [legacy dashboard alerts]({{< relref "../old-alerting/_index.md" >}}). We encourage you to create issues in the Grafana GitHub repository for bugs found while testing Grafana 8 alerts. Alerts have four main components: diff --git a/docs/sources/alerting/unified-alerting/_index.md b/docs/sources/alerting/unified-alerting/_index.md index 6415f62fccd..d91b05f64a6 100644 --- a/docs/sources/alerting/unified-alerting/_index.md +++ b/docs/sources/alerting/unified-alerting/_index.md @@ -8,9 +8,9 @@ weight = 113 Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. -> **Note:** This information is for the new, Grafana 8 Alerts. This is an [opt-in]({{< relref"./opt-in.md" >}}) feature released in Grafana 8.0. Grafana still supports [legacy dashboard alerts]({{< relref "../old-alerting/_index.md" >}}) out of the box +> **Note:** Grafana 8 alerts (beta) is an [opt-in]({{< relref"./opt-in.md" >}}) feature. Out of the box, Grafana still supports old [legacy dashboard alerts]({{< relref "../old-alerting/_index.md" >}}). We encourage you to create issues in the Grafana GitHub repository for bugs found while testing this new feature. -Alerts have four main components: +Grafana 8 alerts have four main components: - Alerting rule - One or more query and/or expression, a condition, the frequency of evaluation, and the (optional) duration that a condition must be met before creating an alert. - Contact point - A channel for sending notifications when the conditions of an alerting rule are met.