resolve comments

Author: bragi92

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

@@ -329,8 +329,13 @@ Deploy the template with the parameter file using any valid method for deploying
 
 ## Enable windows metrics collection
 
+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.
+
 - 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`
-- Please refer to the [customize configuration section](./prometheus-metrics-scrape-configuration.md#metrics-addon-settings-configmap) and enable the `windowsexporter` boolean to true.
+- 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
+- Please use the CLI option `--enable-windows-recording-rules` and set it to true while onboarding to enable the recording rules required for the default dashboards
+- If using ARM/Bicep/Policy to onboard please enable the windows recording rules by settings `enableWindowsRecordingRules` to true in the parameters file.
+- 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.
 
 
 ## Verify Deployment

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

@@ -15,16 +15,16 @@ This article lists the default targets, dashboards, and recording rules when you
 
  The default scrape frequency for all default targets and scrapes is **30 seconds**.
 
-## Targets scraped 
+## Targets scraped
 
 - `cadvisor` (`job=cadvisor`)
 - `nodeexporter` (`job=node`)
 - `kubelet` (`job=kubelet`)
 - `kube-state-metrics` (`job=kube-state-metrics`)
-   
+
 ## Metrics collected from default targets
 
-The following metrics are collected by default from each default target. All other metrics are dropped through relabeling rules. 
+The following metrics are collected by default from each default target. All other metrics are dropped through relabeling rules.
 
    **cadvisor (job=cadvisor)**<br>
    - `container_memory_rss`
@@ -38,7 +38,7 @@ The following metrics are collected by default from each default target. All oth
    - `container_fs_writes_total`
    - `container_fs_reads_bytes_total`
    - `container_fs_writes_bytes_total|container_cpu_usage_seconds_total`
-  
+
    **kubelet (job=kubelet)**<br>
    - `kubelet_node_name`
    - `kubelet_running_pods`
@@ -79,7 +79,7 @@ The following metrics are collected by default from each default target. All oth
    - `process_cpu_seconds_total`
    - `go_goroutines`
    - `kubernetes_build_info`
-  
+
    **nodexporter (job=node)**<br>
    - `node_memory_MemTotal_bytes`
    - `node_cpu_seconds_total`
@@ -105,7 +105,7 @@ The following metrics are collected by default from each default target. All oth
    - `node_disk_read_bytes_total`
    - `node_disk_written_bytes_total`
    - `node_uname_info`
-  
+
    **kube-state-metrics (job=kube-state-metrics)**<br>
    - `kube_node_status_allocatable`
    - `kube_pod_owner`
@@ -135,6 +135,57 @@ The following metrics are collected by default from each default target. All oth
    - `kube_node_status_condition`
    - `kube_node_spec_taint`
 
+## Targets scraped for windows
+
+> [!NOTE]
+> 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.
+
+- `windows-exporter` (`job=windows-exporter`)
+- `kube-proxy-windows` (`job=kube-proxy-windows`)
+
+## Metrics scraped for windows
+
+The following metrics are collected when windows exporter and windows kube proxy are enabled.
+
+**windows-exporter (job=windows-exporter)**<br>
+  - `windows_system_system_up_time`
+  - `windows_cpu_time_total`
+  - `windows_memory_available_bytes`
+  - `windows_os_visible_memory_bytes`
+  - `windows_memory_cache_bytes`
+  - `windows_memory_modified_page_list_bytes`
+  - `windows_memory_standby_cache_core_bytes`
+  - `windows_memory_standby_cache_normal_priority_bytes`
+  - `windows_memory_standby_cache_reserve_bytes`
+  - `windows_memory_swap_page_operations_total`
+  - `windows_logical_disk_read_seconds_total`
+  - `windows_logical_disk_write_seconds_total`
+  - `windows_logical_disk_size_bytes`
+  - `windows_logical_disk_free_bytes`
+  - `windows_net_bytes_total`
+  - `windows_net_packets_received_discarded_total`
+  - `windows_net_packets_outbound_discarded_total`
+  - `windows_container_available`
+  - `windows_container_cpu_usage_seconds_total`
+  - `windows_container_memory_usage_commit_bytes`
+  - `windows_container_memory_usage_private_working_set_bytes`
+  - `windows_container_network_receive_bytes_total`
+  - `windows_container_network_transmit_bytes_total`
+
+**kube-proxy-windows (job=kube-proxy-windows)**<br>
+  - `kubeproxy_sync_proxy_rules_duration_seconds`
+  - `kubeproxy_sync_proxy_rules_duration_seconds_bucket`
+  - `kubeproxy_sync_proxy_rules_duration_seconds_sum`
+  - `kubeproxy_sync_proxy_rules_duration_seconds_count`
+  - `rest_client_requests_total`
+  - `rest_client_request_duration_seconds`
+  - `rest_client_request_duration_seconds_bucket`
+  - `rest_client_request_duration_seconds_sum`
+  - `rest_client_request_duration_seconds_count`
+  - `process_resident_memory_bytes`
+  - `process_cpu_seconds_total`
+  - `go_goroutines`
+
 ## Dashboards
 
 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)