Skip to content

Commit 7bb4fe5

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents f00a598 + b66da57 commit 7bb4fe5

17 files changed

+448
-10
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The information in this table can help you decide when to use each type of alert
3131
|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. Use 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. |
3232
|Log alert|You can use log alerts 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 Kusto Query Language (KQL) for data manipulation by 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. 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. |
3333
|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 like a restart, a shutdown, or the creation or deletion of a resource. Service Health alerts and Resource Health alerts let you know when there's an issue with one of your services or resources.|For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/).|
34-
|Prometheus alerts|Prometheus alerts are primarily used for alerting on performance and health of Kubernetes clusters, including Azure Kubernetes Service. The alert rules are based on PromQL, which is an open-source query language. |Prometheus alert rules are only charged on the data queried by the rules. For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/). |
34+
|Prometheus alerts|Prometheus alerts are used for alerting on Prometheus metrics stored in [Azure Monitor managed services for Prometheus](../essentials/prometheus-metrics-overview.md). The alert rules are based on the PromQL open-source query language. |Prometheus alert rules are only charged on the data queried by the rules. For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/). |
3535

3636
## Metric alerts
3737

@@ -207,7 +207,7 @@ Smart detection works for web apps hosted in the cloud or on your own servers th
207207

208208
## Prometheus alerts
209209

210-
Prometheus alerts are based on Prometheus metric values stored in [Azure Monitor managed services for Prometheus](../essentials/prometheus-metrics-overview.md). Prometheus alert rules are configured as part of [Prometheus rule groups](/azure/azure-monitor/essentials/prometheus-rule-groups). They fire when the result of a PromQL expression resolves to true. Fired Prometheus alerts are displayed and managed like other alert types.
210+
Prometheus alerts are used to monitor metrics stored in [Azure Monitor managed services for Prometheus](../essentials/prometheus-metrics-overview.md). Prometheus alert rules are configured as part of [Prometheus rule groups](/azure/azure-monitor/essentials/prometheus-rule-groups). They fire when the result of a PromQL expression resolves to true. Fired Prometheus alerts are displayed and managed like other alert types.
211211

212212
## Next steps
213213
- Get an [overview of alerts](alerts-overview.md).
@@ -216,3 +216,4 @@ Prometheus alerts are based on Prometheus metric values stored in [Azure Monitor
216216

217217

218218

219+

articles/azure-monitor/essentials/data-platform-metrics.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ Azure Monitor provides REST APIs that allow you to get data in and out of Azure
6464
- **Azure Monitor Metrics REST API** - Allows you to access Azure Monitor platform metrics definitions and values. For more information, see [Azure Monitor REST API](/rest/api/monitor/). For information on how to use the API, see the [Azure monitoring REST API walkthrough](./rest-api-walkthrough.md).
6565
- **Azure Monitor Metrics Data plane REST API** - [Azure Monitor Metrics data plane API](/rest/api/monitor/metrics-data-plane/) is a high-volume API designed for customers with large volume metrics queries. It's similar to the existing standard Azure Monitor Metrics REST API, but provides the capability to retrieve metric data for up to 50 resource IDs in the same subscription and region in a single batch API call. This improves query throughput and reduces the risk of throttling.
6666

67+
## Security
68+
69+
All communication between connected systems and the Azure Monitor service is encrypted using the TLS 1.2 (HTTPS) protocol. The Microsoft SDL process is followed to ensure all Azure services are up-to-date with the most recent advances in cryptographic protocols.
70+
71+
Secure connection is established between the agent and the Azure Monitor service using certificate-based authentication and TLS with port 443. Azure Monitor uses a secret store to generate and maintain keys. Private keys are rotated every 90 days and are stored in Azure and are managed by the Azure operations who follow strict regulatory and compliance practices. For more information on security, see [Encryption of data in transit](../../security/fundamentals/encryption-overview.md#encryption-of-data-in-transit), [Encryption of data at rest](../../security/fundamentals/encryption-atrest.md), and [Azure Monitor Logs data security](../logs/data-security.md)
6772

6873
## Metrics Explorer
6974

@@ -75,7 +80,7 @@ For more information, see [Getting started with Azure Monitor Metrics Explorer](
7580

7681
## Data structure
7782

78-
Data that Azure Monitor Metrics collects is stored in a time-series database that's optimized for analyzing time-stamped data. Each set of metric values is a time series with the following properties:
83+
Data that Azure Monitor Metrics collects, is stored in a time-series database that's optimized for analyzing time-stamped data. Each set of metric values is a time series with the following properties:
7984

8085
* The time when the value was collected.
8186
* The resource that the value is associated with.

articles/azure-monitor/logs/change-pricing-tier.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
title: Change pricing tier for Log Analytics workspace
33
description: Details on how to change pricing tier for Log Analytics workspace in Azure Monitor.
44
ms.topic: conceptual
5+
author: guywild
6+
ms.author: guywild
7+
ms.reviewer: Dale.Koetke
58
ms.date: 03/25/2022
69
---
710

articles/azure-monitor/logs/data-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.topic: conceptual
55
author: guywild
66
ms.author: guywild
77
ms.reviewer: MeirMen
8-
ms.date: 03/21/2022
8+
ms.date: 07/02/2023
99

1010
---
1111

articles/azure-monitor/logs/logs-export-logic-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article describes a method to use Azure Logic Apps to query da
44
ms.service: azure-monitor
55
ms.topic: conceptual
66
ms.reviewer: yossiy
7-
ms.date: 05/01/2023
7+
ms.date: 07/02/2023
88
---
99

1010

articles/azure-monitor/logs/move-workspace-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Move a Log Analytics workspace to another Azure region by using the Azure
33
description: Use an Azure Resource Manager template to move a Log Analytics workspace from one Azure region to another by using the Azure portal.
44
ms.topic: how-to
55
ms.custom: devx-track-arm-template
6-
ms.date: 08/17/2021
6+
ms.date: 07/02/2023
77
ms.reviewer: yossiy
88
---
99

articles/azure-monitor/logs/powershell-workspace-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: PowerShell samples show how to configure a Log Analytics workspace
44
ms.topic: conceptual
55
author: guywi-ms
66
ms.author: guywild
7-
ms.date: 03/28/2022
7+
ms.date: 07/02/2023
88
ms.reviewer: yossiy
99
ms.custom: devx-track-azurepowershell
1010

articles/azure-monitor/logs/quick-create-workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create a Log Analytics workspace to enable management
44
ms.topic: conceptual
55
author: guywi-ms
66
ms.author: guywild
7-
ms.date: 03/28/2022
7+
ms.date: 07/02/2023
88
ms.reviewer: yossiy
99

1010
# Customer intent: As a DevOps engineer or IT expert, I want to set up a workspace to collect logs from multiple data sources from Azure, on-premises, and third-party cloud deployments.

0 commit comments

Comments
 (0)