Merge pull request #210223 from AbbyMSFT/health-alerts

tamarakhader · web-flow · commit d165a5424073 · 2022-11-16T12:43:28.000-05:00
Add tabs for Resource Health and Service Health alert rules
diff --git a/articles/azure-monitor/alerts/alerts-create-new-alert-rule.md b/articles/azure-monitor/alerts/alerts-create-new-alert-rule.md
@@ -176,14 +176,34 @@ And then defining these elements for the resulting alert actions using:
 
     1. In the **Conditions** pane, select the **Chart period**.
     1. The **Preview** chart shows you the results of your selection.
-    1. In the **Alert logic** section:
+    1. Select values for each of these fields in the **Alert logic** section:
 
         |Field |Description |
         |---------|---------|
-        |Event level| Select the level of the events that this alert rule monitors. Values are: **Critical**, **Error**, **Warning**, **Informational**, **Verbose** and **All**.|
-        |Status|Select the status levels for which the alert is evaluated.|
+        |Event level| Select the level of the events for this alert rule. Values are: **Critical**, **Error**, **Warning**, **Informational**, **Verbose** and **All**.|
+        |Status|Select the status levels for the alert.|
         |Event initiated by|Select the user or service principal that initiated the event.|
 
+    ### [Resource Health alert](#tab/resource-health)
+
+     1. In the **Conditions** pane, select values for each of these fields:
+
+        |Field |Description |
+        |---------|---------|
+        |Event status| Select the statuses of Resource Health events. Values are: **Active**, **In Progress**, **Resolved**, and **Updated**.|
+        |Current resource status|Select the current resource status. Values are: **Available**, **Degraded**, and **Unavailable**.|
+        |Previous resource status|Select the previous resource status. Values are: **Available**, **Degraded**, **Unavailable**, and **Unknown**.|
+        |Reason type|Select the cause(s) of the Resource Health events. Values are: **Platform Initiated**, **Unknown**, and **User Initiated**.|  
+    ### [Service Health alert](#tab/service-health)
+
+     1. In the **Conditions** pane, select values for each of these fields:
+
+      |Field |Description |
+      |---------|---------|
+      |Services| Select the Azure services.|
+      |Regions|Select the Azure regions.|
+      |Event types|Select the type(s) of Service Health events. Values are: **Service issue**, **Planned maintenance**, **Health advisories**, and **Security advisories**.| 
+
     ---
 
     From this point on, you can select the **Review + create** button at any time.
@@ -253,6 +273,14 @@ And then defining these elements for the resulting alert actions using:
     1. (Optional) If you have configured action groups for this alert rule, you can add custom properties to the alert payload to add additional information to the payload. In the **Custom properties** section, add the property **Name** and **Value** for the custom property you want included in the payload.
 
         :::image type="content" source="media/alerts-create-new-alert-rule/alerts-activity-log-rule-details-tab.png" alt-text="Screenshot of the actions tab when creating a new activity log alert rule.":::
+    ### [Resource Health alert](#tab/resource-health)
+
+     1. Enter values for the **Alert rule name** and the **Alert rule description**.
+     1. (Optional) In the **Advanced options** section, select **Enable upon creation** for the alert rule to start running as soon as you're done creating it.
+    ### [Service Health alert](#tab/service-health)
+    
+    1. Enter values for the **Alert rule name** and the **Alert rule description**.
+    1. (Optional) In the **Advanced options** section, select **Enable upon creation** for the alert rule to start running as soon as you're done creating it.
 
     ---
 
@@ -292,14 +320,32 @@ You can create a new alert rule using the [Azure CLI](/cli/azure/get-started-wit
 
     ### [Activity log alert](#tab/activity-log)
 
-    To create an activity log alert rule, use the **az monitor activity-log alert create** command. You can see detailed documentation on the metric alert rule create command in the **az monitor activity-log alert create** section of the [CLI reference documentation for activity log alerts](/cli/azure/monitor/activity-log/alert).
-
     To create a new activity log alert rule, use the following commands:
      - [az monitor activity-log alert create](/cli/azure/monitor/activity-log/alert#az-monitor-activity-log-alert-create): Create a new activity log alert rule resource.
      - [az monitor activity-log alert scope](/cli/azure/monitor/activity-log/alert/scope): Add scope for the created activity log alert rule.
      - [az monitor activity-log alert action-group](/cli/azure/monitor/activity-log/alert/action-group): Add an action group to the activity log alert rule.
 
-    ---
+    You can find detailed documentation on the activity log alert rule create command in the **az monitor activity-log alert create** section of the [CLI reference documentation for activity log alerts](/cli/azure/monitor/activity-log/alert).
+    ### [Resource Health alert](#tab/resource-health)
+ 
+    To create a new activity log alert rule, use the following commands using the `Resource Health` category:
+     - [az monitor activity-log alert create](/cli/azure/monitor/activity-log/alert#az-monitor-activity-log-alert-create): Create a new activity log alert rule resource.
+     - [az monitor activity-log alert scope](/cli/azure/monitor/activity-log/alert/scope): Add scope for the created activity log alert rule.
+     - [az monitor activity-log alert action-group](/cli/azure/monitor/activity-log/alert/action-group): Add an action group to the activity log alert rule.
+    
+    You can find detailed documentation on the alert rule create command in the **az monitor activity-log alert create** section of the [CLI reference documentation for activity log alerts](/cli/azure/monitor/activity-log/alert). 
+
+   ### [Service Health alert](#tab/service-health)
+
+    To create a new activity log alert rule, use the following commands using the `Service Health` category:
+     - [az monitor activity-log alert create](/cli/azure/monitor/activity-log/alert#az-monitor-activity-log-alert-create): Create a new activity log alert rule resource .
+     - [az monitor activity-log alert scope](/cli/azure/monitor/activity-log/alert/scope): Add scope for the created activity log alert rule.
+     - [az monitor activity-log alert action-group](/cli/azure/monitor/activity-log/alert/action-group): Add an action group to the activity log alert rule.
+
+    You can find detailed documentation on the alert rule create command in the **az monitor activity-log alert create** section of the [CLI reference documentation for activity log alerts](/cli/azure/monitor/activity-log/alert).
+
+   ---
+
 ## Create a new alert rule using PowerShell
 
 - To create a metric alert rule using PowerShell, use this cmdlet: [Add-AzMetricAlertRuleV2](/powershell/module/az.monitor/add-azmetricalertrulev2)
diff --git a/articles/azure-monitor/alerts/alerts-overview.md b/articles/azure-monitor/alerts/alerts-overview.md
@@ -45,15 +45,16 @@ You can see all alert instances in all your Azure resources generated in the las
 
 ## Types of alerts
 
-There are four types of alerts. This table provides a brief description of each alert type. 
+This table provides a brief description of each alert type. 
 See [this article](alerts-types.md) for detailed information about each alert type and how to choose which alert type best suits your needs.
 
 |Alert type|Description|
 |:---------|:---------|
 |[Metric alerts](alerts-types.md#metric-alerts)|Metric alerts evaluate resource metrics at regular intervals. Metrics can be platform metrics, custom metrics, logs from Azure Monitor converted to metrics or Application Insights metrics. Metric alerts have several additional features, such as the ability to apply multiple conditions and dynamic thresholds.|
 |[Log alerts](alerts-types.md#log-alerts)|Log alerts allow users to use a Log Analytics query to evaluate resource logs at a predefined frequency.|
-|[Activity log alerts](alerts-types.md#activity-log-alerts)|Activity log alerts are triggered when a new activity log event occurs that matches the defined conditions.|
+|[Activity log alerts](alerts-types.md#activity-log-alerts)|Activity log alerts are triggered when a new activity log event occurs that matches defined conditions. **Resource Health** alerts and **Service Health** alerts are activity log alerts that report on your service and resource health.|
 |[Smart detection alerts](alerts-types.md#smart-detection-alerts)|Smart detection on an Application Insights resource automatically warns you of potential performance problems and failure anomalies in your web application. You can migrate smart detection on your Application Insights resource to create alert rules for the different smart detection modules.|
+|[Prometheus alerts (preview)](alerts-types.md#prometheus-alerts-preview)|Prometheus alerts are used for alerting on performance and health of Kubernetes clusters (including AKS). The alert rules are based on PromQL, which is an open source query language.|
 
 ## Out-of-the-box alert rules (preview)
 
diff --git a/articles/azure-monitor/alerts/alerts-types.md b/articles/azure-monitor/alerts/alerts-types.md
@@ -13,12 +13,15 @@ ms.reviewer: harelbr
 
 This article describes the kinds of Azure Monitor alerts you can create, and helps you understand when to use each type of alert.
 
-There are five types of alerts:
+There are four types of alerts:
 - [Metric alerts](#metric-alerts)
-- - [Log alerts](#log-alerts)
+- [Log alerts](#log-alerts)
 - [Activity log alerts](#activity-log-alerts)
+    - [Service Health alerts](#service-health-alerts)
+    - [Resource Health alerts](#resource-health-alerts)
 - [Smart detection alerts](#smart-detection-alerts)
 - [Prometheus alerts](#prometheus-alerts-preview) (preview)
+
 ## Choosing the right alert type
 
 This table can help you decide when to use what type of alert. For more detailed information about pricing, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/).
@@ -27,7 +30,7 @@ This table can help you decide when to use what type of alert. For more detailed
 |---------|---------|---------|
 |Metric alert|Metric data is stored in the system already pre-computed. Metric alerts are useful when you want to be alerted about data that requires little or no manipulation. We recommend using metric alerts if the data you want to monitor is available in metric data.|Each metric alert rule is charged based on the number of time-series that are monitored. |
 |Log alert|Log alerts allow you to perform advanced logic operations on your data. If the data you want to monitor is available in logs, or requires advanced logic, you can use the robust features of KQL for data manipulation using log alerts.|Each log alert rule is billed based on the interval at which the log query is evaluated (more frequent query evaluation results in a higher cost). Additionally, for log alerts configured for [at scale monitoring](#splitting-by-dimensions-in-log-alert-rules), the cost also depends on the number of time series created by the dimensions resulting from your query. | 
-|Activity Log alert|Activity logs provide auditing of all actions that occurred on resources. Use activity log alerts to be alerted when a specific event happens to a resource, for example, a restart, a shutdown, or the creation or deletion of a resource.|For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/).|
+|Activity Log alert|Activity logs provide auditing of all actions that occurred on resources. Use activity log alerts to be alerted when a specific event happens to a resource, for example, a restart, a shutdown, or the creation or deletion of a resource. Service Health alerts and Resource Health alerts can let you know when there is an issue with one of your services or resources.|For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/).|
 |Prometheus alerts (preview)| Prometheus alerts are primarily used for alerting on performance and health of Kubernetes clusters (including AKS). The alert rules are based on PromQL, which is an open source query language. | There is no charge for Prometheus alerts during the preview period. |
 ## Metric alerts
 
@@ -175,6 +178,16 @@ Activity log alert rules are Azure resources, so they can be created by using an
 
 An activity log alert only monitors events in the subscription in which the alert is created.
 
+### Service Health alerts
+
+Service Health alerts are a type of activity alert. [Service Health](../../service-health/overview.md) lets you know about outages, planned maintenance activities, and other health advisories because the authenticated Service Health experience knows which services and resources you currently use. 
+
+The best way to use Service Health is to set up Service Health alerts to notify you using your preferred communication channels when service issues, planned maintenance, or other changes may affect the Azure services and regions you use.
+
+### Resource Health alerts
+
+Resource Health alerts are a type of activity alert. [Resource Health overview](../../service-health/resource-health-overview.md) helps you diagnose and get support for service problems that affect your Azure resources. It reports on the current and past health of your resources. Resource Health relies on signals from different Azure services to assess whether a resource is healthy. If a resource is unhealthy, Resource Health analyzes additional information to determine the source of the problem. It also reports on actions that Microsoft is taking to fix the problem and identifies things that you can do to address it.
+
 ## Smart Detection alerts
 
 After setting up Application Insights for your project, when your app generates a certain minimum amount of data, Smart Detection takes 24 hours to learn the normal behavior of your app. Your app's performance has a typical pattern of behavior. Some requests or dependency calls will be more prone to failure than others; and the overall failure rate may go up as load increases. Smart Detection uses machine learning to find these anomalies. Smart Detection monitors the data received from your app, and in particular the failure rates. Application Insights automatically alerts you in near real time if your web app experiences an abnormal rise in the rate of failed requests.
diff --git a/articles/azure-vmware/includes/customer-communications.md b/articles/azure-vmware/includes/customer-communications.md
@@ -10,6 +10,6 @@ ms.author: v-szuber
 
 <!-- Used in introduction.md and faq.yml -->
 
-You can find service issues, planned maintenance, health advisories, and security advisories notifications published through **Service Health** in the Azure portal. You can take timely actions when you set up activity log alerts for these notifications. For more information, see [Create service health alerts using the Azure portal](../../service-health/alerts-activity-log-service-notifications-portal.md#create-service-health-alert-using-azure-portal).
+You can find service issues, planned maintenance, health advisories, and security advisories notifications published through **Service Health** in the Azure portal. You can take timely actions when you set up activity log alerts for these notifications. For more information, see [Create Service Health alerts using the Azure portal](../../service-health/alerts-activity-log-service-notifications-portal.md#create-a-service-health-alert-using-the-azure-portal).
 
 :::image type="content" source="../media/service-health.png" alt-text="Screenshot of Service Health notifications.":::
diff --git a/articles/service-health/alerts-activity-log-service-notifications-portal.md b/articles/service-health/alerts-activity-log-service-notifications-portal.md
@@ -6,7 +6,6 @@ ms.date: 06/27/2019
 ---
 
 # Create activity log alerts on service notifications using the Azure portal
-## Overview
 
 This article shows you how to use the Azure portal to set up activity log alerts for service health notifications by using the Azure portal.  
 
@@ -31,11 +30,11 @@ To learn more about action groups, see [Create and manage action groups](../azur
 
 For information on how to configure service health notification alerts by using Azure Resource Manager templates, see [Resource Manager templates](../azure-monitor/alerts/alerts-activity-log.md).
 
-### Watch a video on setting up your first Azure Service Health alert
+## Watch a video on setting up your first Azure Service Health alert
 
 >[!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE2OaXt]
 
-## Create Service Health alert using Azure portal
+## Create a Service Health alert using the Azure portal
 1. In the [portal](https://portal.azure.com), select **Service Health**.
 
     ![The "Service Health" service](media/alerts-activity-log-service-notifications/home-servicehealth.png)
@@ -44,32 +43,12 @@ For information on how to configure service health notification alerts by using
 
     ![The "Health alerts" tab](media/alerts-activity-log-service-notifications/alerts-blades-sh.png)
 
-1. Select **Add service health alert** and fill in the fields.
+1. Select **Add service health alert**.
 
     ![The "Create service health alert" command](media/alerts-activity-log-service-notifications/service-health-alert.png)
 
-1. Select the **Subscription**, **Services**, and **Regions** for which you want to be alerted.
+1. The **Create an alert rule wizard** opens to the **Conditions** tab, with the **Scope** tab already populated. Follow the steps for Service Health alerts, starting from the **Conditions** tab, in the [create a new alert rule wizard](../azure-monitor/alerts/alerts-create-new-alert-rule.md).
 
-    [![The "Add activity log alert" dialog box](./media/alerts-activity-log-service-notifications/activity-log-alert-new-ux.png)](./media/alerts-activity-log-service-notifications/activity-log-alert-new-ux.png#lightbox)
-
-> [!NOTE]
-> This subscription is used to save the activity log alert. The alert resource is deployed to this subscription and monitors events in the activity log for it.
-
-> [!NOTE]
-> If selecting specific regions, make sure you always add the "Global" region. This would make sure your alert rule covers resources and services that are global by nature, i.e. not specific to a single region.
-
-5. Choose the **Event types** you want to be alerted for: *Service issue*, *Planned maintenance*, *Health advisories*, and *Security advisory*.
-
-6. Click **Select action group** to choose an existing action group or to create a new action group. For more information on action groups, see [Create and manage action groups in the Azure portal](../azure-monitor/alerts/action-groups.md).
-
-
-7. Define your alert details by entering an **Alert rule name** and **Description**.
-
-8. Select the **Resource group** where you want the alert to be saved.
-
-
-
-Within a few minutes, the alert is active and begins to trigger based on the conditions you specified during creation.
 
 Learn how to [Configure webhook notifications for existing problem management systems](service-health-alert-webhook-guide.md). For information on the webhook schema for activity log alerts, see [Webhooks for Azure activity log alerts](../azure-monitor/alerts/activity-log-alerts-webhook.md).
 
diff --git a/articles/service-health/resource-health-alert-monitor-guide.md b/articles/service-health/resource-health-alert-monitor-guide.md
