Skip to content

Commit c928744

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into prvlink-review
2 parents ccc275d + e8a5ada commit c928744

35 files changed

+884
-1367
lines changed

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ The [az redisenterprise create](/cli/azure/redisenterprise#az-redisenterprise-cr
195195
az redisenterprise create --cluster-name "cache1" --resource-group "rg1" --location "East US" --sku "Enterprise_E10" --persistence rdb-enabled=true rdb-frequency="1h"
196196
```
197197

198-
Existing caches can be updated using the [az redisenterprise update](/cli/azure/redisenterprise#az-redisenterprise-update) command. This example adds RDB persistence with 12 hour frequency to an existing cache instance:
198+
Existing caches can be updated using the [az redisenterprise database update](/cli/azure/redisenterprise/database#az-redisenterprise-database-update) command. This example adds RDB persistence with 12 hour frequency to an existing cache instance:
199199

200200
```azurecli
201201
az redisenterprise database update --cluster-name "cache1" --resource-group "rg1" --persistence rdb-enabled=true rdb-frequency="12h"

articles/azure-monitor/essentials/metric-chart-samples.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
---
22
title: Azure Monitor metric chart example
33
description: Learn about visualizing your Azure Monitor data.
4-
author: vgorbenko
54
services: azure-monitor
6-
ms.reviewer: vitalyg
75
ms.topic: conceptual
86
ms.date: 01/29/2019
9-
ms.author: vitalyg
7+
ms.reviewer: vitalyg
108
---
119

1210
# Metric chart examples

articles/azure-monitor/essentials/metrics-charts.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
---
22
title: Advanced features of Metrics Explorer
33
description: Metrics are a series of measured values and counts that Azure collects. Learn to use Metrics Explorer to investigate the health and usage of resources.
4-
author: vgorbenko
54
services: azure-monitor
65
ms.topic: conceptual
76
ms.date: 06/09/2022
8-
ms.author: vitalyg
7+
ms.reviewer: vitalyg
98
ms.custom: kr2b-contr-experiment
109
---
1110

articles/azure-monitor/essentials/metrics-getting-started.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
22
title: Get started with Azure Monitor metrics explorer
33
description: Learn how to create your first metric chart with Azure Monitor metrics explorer.
4-
author: vgorbenko
54
services: azure-monitor
65
ms.topic: conceptual
76
ms.date: 02/21/2022
8-
ms.author: vitalyg
97
ms.reviewer: vitalyg
108
---
119

articles/azure-monitor/essentials/prometheus-metrics-enable.md

Lines changed: 187 additions & 186 deletions
Large diffs are not rendered by default.

articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration.md

Lines changed: 67 additions & 60 deletions
Large diffs are not rendered by default.

articles/azure-monitor/essentials/prometheus-metrics-scrape-default.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Default Prometheus metrics configuration in Azure Monitor (preview)
3-
description: Lists the default targets, dashboards, and recording rules for Prometheus metrics in Azure Monitor.
3+
description: This article lists the default targets, dashboards, and recording rules for Prometheus metrics in Azure Monitor.
44
ms.topic: conceptual
55
ms.custom: ignite-2022
66
ms.date: 09/28/2022
@@ -9,11 +9,11 @@ ms.reviewer: aul
99

1010
# Default Prometheus metrics configuration in Azure Monitor (preview)
1111

12-
This article lists the default targets, dashboards, and recording rules when you [configure Prometheus metrics to be scraped from an AKS cluster](prometheus-metrics-enable.md) for any AKS cluster.
12+
This article lists the default targets, dashboards, and recording rules when you [configure Prometheus metrics to be scraped from an Azure Kubernetes Service (AKS) cluster](prometheus-metrics-enable.md) for any AKS cluster.
1313

1414
## Scrape frequency
1515

16-
The default scrape frequency for all default targets and scrapes is **30 seconds**.
16+
The default scrape frequency for all default targets and scrapes is 30 seconds.
1717

1818
## Targets scraped
1919

@@ -136,19 +136,19 @@ The following metrics are collected by default from each default target. All oth
136136
- `kube_node_status_condition`
137137
- `kube_node_spec_taint`
138138

139-
## Targets scraped for windows
139+
## Targets scraped for Windows
140140

141-
There are two default jobs that can be run for windows which scrape metrics required for the dashboards specific to windows.
141+
Two default jobs can be run for Windows that scrape metrics required for the dashboards specific to Windows.
142142

143143
> [!NOTE]
144-
> This requires an update in the ama-metrics-settings-configmap and installing windows exporter on all windows nodepools. Please refer to the [enablement document](./prometheus-metrics-enable.md#enable-prometheus-metric-collection) for more information
144+
> This requires an update in the ama-metrics-settings-configmap and installing windows-exporter on all Windows node pools. For more information, see the [enablement document](./prometheus-metrics-enable.md#enable-prometheus-metric-collection).
145145
146146
- `windows-exporter` (`job=windows-exporter`)
147147
- `kube-proxy-windows` (`job=kube-proxy-windows`)
148148

149-
## Metrics scraped for windows
149+
## Metrics scraped for Windows
150150

151-
The following metrics are collected when windows exporter and windows kube proxy are enabled.
151+
The following metrics are collected when windows-exporter and kube-proxy-windows are enabled.
152152

153153
**windows-exporter (job=windows-exporter)**<br>
154154
- `windows_system_system_up_time`
@@ -191,7 +191,7 @@ The following metrics are collected when windows exporter and windows kube proxy
191191

192192
## Dashboards
193193

194-
Following are the default dashboards that are automatically provisioned and configured by Azure Monitor managed service for Prometheus when you [link your Azure Monitor workspace to an Azure Managed Grafana instance](../essentials/azure-monitor-workspace-manage.md#link-a-grafana-workspace). Source code for these dashboards can be found in [GitHub](https://aka.ms/azureprometheus-mixins)
194+
The following default dashboards are automatically provisioned and configured by Azure Monitor managed service for Prometheus when you [link your Azure Monitor workspace to an Azure Managed Grafana instance](../essentials/azure-monitor-workspace-manage.md#link-a-grafana-workspace). Source code for these dashboards can be found in [this GitHub folder](https://aka.ms/azureprometheus-mixins).
195195

196196
- Kubernetes / Compute Resources / Cluster
197197
- Kubernetes / Compute Resources / Namespace (Pods)
@@ -210,8 +210,7 @@ Following are the default dashboards that are automatically provisioned and conf
210210

211211
## Recording rules
212212

213-
Following are the default recording rules that are automatically configured by Azure Monitor managed service for Prometheus when you [link your Azure Monitor workspace to an Azure Managed Grafana instance](../essentials/azure-monitor-workspace-manage.md#link-a-grafana-workspace). Source code for these recording rules can be found in [GitHub](https://aka.ms/azureprometheus-mixins)
214-
213+
The following default recording rules are automatically configured by Azure Monitor managed service for Prometheus when you [link your Azure Monitor workspace to an Azure Managed Grafana instance](../essentials/azure-monitor-workspace-manage.md#link-a-grafana-workspace). Source code for these recording rules can be found in [this GitHub folder](https://aka.ms/azureprometheus-mixins).
215214

216215
- `cluster:node_cpu:ratio_rate5m`
217216
- `namespace_cpu:kube_pod_container_resource_requests:sum`
@@ -275,4 +274,4 @@ Following are the default recording rules that are automatically configured by A
275274

276275
## Next steps
277276

278-
- [Customize scraping of Prometheus metrics](prometheus-metrics-scrape-configuration.md).
277+
[Customize scraping of Prometheus metrics](prometheus-metrics-scrape-configuration.md)

articles/azure-monitor/logs/customer-managed-keys.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
title: Azure Monitor customer-managed key
33
description: Information and steps to configure Customer-managed key to encrypt data in your Log Analytics workspaces using an Azure Key Vault key.
44
ms.topic: conceptual
5-
author: yossi-y
6-
ms.author: yossiy
5+
ms.reviewer: yossiy
76
ms.date: 05/01/2022
87
ms.custom: devx-track-azurepowershell, devx-track-azurecli
98

articles/azure-monitor/logs/logs-dedicated-clusters.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
title: Azure Monitor Logs Dedicated Clusters
33
description: Customers meeting the minimum commitment tier could use dedicated clusters
44
ms.topic: conceptual
5-
author: yossi-y
6-
ms.author: yossiy
5+
ms.reviewer: yossiy
76
ms.date: 01/01/2023
87
ms.custom: devx-track-azurepowershell, devx-track-azurecli
98
---

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: Export data from a Log Analytics workspace to a storage account by using
33
description: This article describes a method to use Azure Logic Apps to query data from a Log Analytics workspace and send it to Azure Storage.
44
ms.service: azure-monitor
55
ms.topic: conceptual
6-
author: yossi-y
7-
ms.author: yossiy
6+
ms.reviewer: yossiy
87
ms.date: 03/01/2022
98
---
109

0 commit comments

Comments
 (0)