Skip to content

Commit d3130a1

Browse files
committed
pr feedback
1 parent 5e5779e commit d3130a1

File tree

2 files changed

+29
-10
lines changed

2 files changed

+29
-10
lines changed

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

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,26 @@ Deploy the template with the parameter file using any valid method for deploying
332332

333333
As of version `6.4.0-main-02-22-2023-3ee44b9e` windows metric collection has been enabled for the AKS clusters. Onboarding to the Azure Monitor Metrics Addon will enable the windows daemonset pods to start running on your nodepools(Windows Server 2019 and Windows Server 2022 are both supported). Please follow the below mentioned steps so that the pods are able to collect metrics from your windows nodepools.
334334

335-
- For accessing windows metrics you must manually install the windows exporter on AKS nodes. Please enable the following collectors : `[defaults],container,memory,process,cpu_info`. You can deploy the following [YAML](https://github.com/prometheus-community/windows_exporter/blob/master/kubernetes/windows-exporter-daemonset.yaml) file using `kubectl apply -f windows-exporter-daemonset.yaml`
336-
- Please refer to the [customize configuration section](./prometheus-metrics-scrape-configuration.md#metrics-addon-settings-configmap) and enable the `windowsexporter` and `windowsexporter` boolean to true by applying the ama-metrics-settings-configmap on your cluster
337-
- Please use the CLI option `--enable-windows-recording-rules` while onboarding to enable the recording rules required for the default dashboards
338-
- If using ARM/Bicep/Policy to onboard please enable the windows recording rules by settings `enableWindowsRecordingRules` to true in the parameters file.
339-
- If the cluster is already onbaorded to Azure Monitor Metrics and you want to enable windows recording rule groups. Please use the following [ARM Tempalte](https://github.com/Azure/prometheus-collector/blob/kaveesh/windows_recording_rules/AddonArmTemplate/WindowsRecordingRuleGroupTemplate/WindowsRecordingRules.json) and [Parameters](https://github.com/Azure/prometheus-collector/blob/kaveesh/windows_recording_rules/AddonArmTemplate/WindowsRecordingRuleGroupTemplate/WindowsRecordingRulesParameters.json) file to create the rule groups.
335+
1. Manually install the windows exporter on AKS nodes to access windows metrics.
336+
Enable the following collectors :
340337

338+
* `[defaults]`
339+
* `container`
340+
* `memory`
341+
* `process`
342+
* `cpu_info`
343+
344+
Deploy the [windows-exporter-daemonset YAML](https://github.com/prometheus-community/windows_exporter/blob/master/kubernetes/windows-exporter-daemonset.yaml) file
345+
```
346+
kubectl apply -f windows-exporter-daemonset.yaml
347+
```
348+
2. Apply the [ama-metrics-settings-configmap](https://github.com/Azure/prometheus-collector/blob/main/otelcollector/configmaps/ama-metrics-settings-configmap.yaml) to your cluster, setting the `windowsexporter` and `windowskubeproxy` booleans to rue`. For more information see [Metrics addon settings configmap](./prometheus-metrics-scrape-configuration.md#metrics-addon-settings-configmap).
349+
3. While onboarding, enable the recording rules required for the default dashboards.
350+
351+
* For CLI include the option `--enable-windows-recording-rules`.
352+
* For ARM, Bicep, or Policy, set `enableWindowsRecordingRules` to `true` in the parameters file.
353+
354+
If the cluster is already onbaorded to Azure Monitor Metrics, to enable windows recording rule groups use this [ARM Tempalte](https://github.com/Azure/prometheus-collector/blob/kaveesh/windows_recording_rules/AddonArmTemplate/WindowsRecordingRuleGroupTemplate/WindowsRecordingRules.json) and [Parameters](https://github.com/Azure/prometheus-collector/blob/kaveesh/windows_recording_rules/AddonArmTemplate/WindowsRecordingRuleGroupTemplate/WindowsRecordingRulesParameters.json) file to create the rule groups.
341355

342356
## Verify Deployment
343357

@@ -394,13 +408,16 @@ ama-metrics-ksm-5fcf8dffcd 1 1 1 11h
394408
## Uninstall metrics addon
395409
Currently, Azure CLI is the only option to remove the metrics addon and stop sending Prometheus metrics to Azure Monitor managed service for Prometheus.
396410

397-
If you don't already have it, install the aks-preview extension with the following command.
411+
Install the `aks-preview` extension using the following command:
412+
413+
```
414+
az extension add --name aks-preview
415+
```
398416

399-
The `aks-preview` extension needs to be installed using the following command. For more information on how to install a CLI extension, see [Use and manage extensions with the Azure CLI](/cli/azure/azure-cli-extensions-overview).
417+
For more information on installing a CLI extension, see [Use and manage extensions with the Azure CLI](/cli/azure/azure-cli-extensions-overview).
400418

401419
> [!NOTE]
402-
> Please upgrade your az cli version to the latest version and ensure that the aks-preview version you're using is greater than or equal to '0.5.132'. You can find out the version using the `az version` command.
403-
420+
> Upgrade your az cli version to the latest version and ensure that the aks-preview version you're using is at least '0.5.132'. Find your current version using the `az version`.
404421
```azurecli
405422
az extension add --name aks-preview
406423
```

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ The following metrics are collected by default from each default target. All oth
137137

138138
## Targets scraped for windows
139139

140+
There are two default jobs that can be run for windows which scrape metrics required for the dashboards specific to windows.
141+
140142
> [!NOTE]
141-
> This requires an update in the ama-metrics-settings-configmap and installing windows exporter on all windows nodepools. Please refer to the enablement document for more information.
143+
> 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
142144
143145
- `windows-exporter` (`job=windows-exporter`)
144146
- `kube-proxy-windows` (`job=kube-proxy-windows`)

0 commit comments

Comments
 (0)