Skip to content

Commit e794518

Browse files
committed
add some missing info that got lost in merge
1 parent 82d20a9 commit e794518

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

articles/azure-monitor/alerts/alerts-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ See [this article](alerts-types.md) for detailed information about each alert ty
5252
|:---------|:---------|
5353
|[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.|
5454
|[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.|
55-
|[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. `Resource Health` alerts and `Service Health` alerts are activity log alerts that report on your service and resource health.|
56-
|[Service Health alerts](alerts-types.md#activity-log-alerts)|Activity log alerts are triggered when a new activity log event occurs that matches the defined conditions.|
55+
|[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.|
5756
|[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.|
57+
|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.|
5858

5959
## Out-of-the-box alert rules (preview)
6060

articles/service-health/alerts-activity-log-service-notifications-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ For information on how to configure service health notification alerts by using
3434

3535
>[!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE2OaXt]
3636
37-
## Create Service Health alert using Azure portal
37+
## Create a Service Health alert using the Azure portal
3838
1. In the [portal](https://portal.azure.com), select **Service Health**.
3939

4040
![The "Service Health" service](media/alerts-activity-log-service-notifications/home-servicehealth.png)

0 commit comments

Comments
 (0)