Merging upstream version 1.32.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 15 insertions, 11 deletions

diff --git a/docs/monitor/enable-notifications.md b/docs/monitor/enable-notifications.md
index 68beba53..e5b5a6f2 100644
--- a/docs/monitor/enable-notifications.md
+++ b/docs/monitor/enable-notifications.md
@@ -14,7 +14,7 @@ alarms](/docs/monitor/configure-alarms.md) to change the preconfigured threshold
 infrastructure.
 
 Netdata Cloud offers [centralized alarm notifications](#netdata-cloud) via email, which leverages the health status
-information already streamed to Netdata Cloud from claimed nodes to send notifications to those who have enabled them.
+information already streamed to Netdata Cloud from connected nodes to send notifications to those who have enabled them.
 
 The Netdata Agent has a [notification system](#netdata-agent) that supports more than a dozen services, such as email,
 Slack, PagerDuty, Twilio, Amazon SNS, Discord, and much more.
@@ -25,10 +25,11 @@ response process.
 
 ## Netdata Cloud
 
-Netdata Cloud's [centralized alarm notifications](https://learn.netdata.cloud/docs/cloud/monitoring/notifications/) is a
-zero-configuration way to get notified when an anomaly or incident strikes any node or application in your
-infrastructure. The advantage of using centralized alarm notifications from Netdata Cloud is that you don't have to
-worry about configuring each node in your infrastructure.
+Netdata Cloud's [centralized alarm
+notifications](https://learn.netdata.cloud/docs/cloud/alerts-notifications/notifications) is a zero-configuration way to
+get notified when an anomaly or incident strikes any node or application in your infrastructure. The advantage of using
+centralized alarm notifications from Netdata Cloud is that you don't have to worry about configuring each node in your
+infrastructure.
 
 To enable centralized alarm notifications for a Space, click on **Manage Space** in the left-hand menu, then click on
 the **Notifications** tab. Click the toggle switch next to **E-mail** to enable this notification method.
@@ -40,8 +41,9 @@ choose what types of notifications to receive from each War Room.
 ![Enabling and configuring alarm notifications in Netdata
 Cloud](https://user-images.githubusercontent.com/1153921/101936280-93c50900-3b9d-11eb-9ba0-d6927fa872b7.gif)
 
-See the [centralized alarm notifications](https://learn.netdata.cloud/docs/cloud/monitoring/notifications/) reference
-doc for further details about what information is conveyed in an email notification, flood protection, and more.
+See the [centralized alarm notifications](https://learn.netdata.cloud/docs/cloud/alerts-notifications/notifications)
+reference doc for further details about what information is conveyed in an email notification, flood protection, and
+more.
 
 ## Netdata Agent
 
@@ -69,6 +71,7 @@ notification platform.
 -   [**Kavenegar**](/health/notifications/kavenegar/README.md)
 -   [**Matrix**](/health/notifications/matrix/README.md)
 -   [**Messagebird**](/health/notifications/messagebird/README.md)
+-   [**Microsoft Teams**](/health/notifications/msteams/README.md)
 -   [**Netdata Agent dashboard**](/health/notifications/web/README.md)
 -   [**Opsgenie**](/health/notifications/opsgenie/README.md)
 -   [**PagerDuty**](/health/notifications/pagerduty/README.md)
@@ -138,7 +141,7 @@ architecture](/docs/store/distributed-data-architecture.md) for the best-in-clas
 
 ### Related reference documentation
 
-- [Netdata Cloud · Alarm notifications](https://learn.netdata.cloud/docs/cloud/monitoring/notifications/)
+- [Netdata Cloud · Alarm notifications](https://learn.netdata.cloud/docs/cloud/alerts-notifications/notifications)
 - [Netdata Agent · Notifications](/health/notifications/README.md)
 
 [![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fdocs%2Fmonitor%2Fenable-notifications&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>)
diff --git a/docs/monitor/view-active-alarms.md b/docs/monitor/view-active-alarms.md
index b23e2d72..99169c2c 100644
--- a/docs/monitor/view-active-alarms.md
+++ b/docs/monitor/view-active-alarms.md
@@ -11,9 +11,10 @@ performance issue affects your node or the applications it runs.
 
 ## Netdata Cloud
 
-A War Room's [alarms indicator](https://learn.netdata.cloud/docs/cloud/war-rooms#indicators) displays the number of active `critical` (red) and
-`warning` (yellow) alerts for the nodes in this War Room. Click on either the critical or warning badges to open a
-pre-filtered modal displaying only those types of [active alarms](https://learn.netdata.cloud/docs/cloud/monitoring/alarms).
+A War Room's [alarms indicator](https://learn.netdata.cloud/docs/cloud/war-rooms#indicators) displays the number of
+active `critical` (red) and `warning` (yellow) alerts for the nodes in this War Room. Click on either the critical or
+warning badges to open a pre-filtered modal displaying only those types of [active
+alarms](https://learn.netdata.cloud/docs/cloud/alerts-notifications/view-active-alerts).
 
 ![The Alarms panel in Netdata
 Cloud](https://user-images.githubusercontent.com/1153921/108564747-d2bfbb00-72c0-11eb-97b9-5863ad3324eb.png)