diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 518576e7257..717ec9fbc9c 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -307,6 +307,8 @@ field. You can revert this change by configuring tags for the module and omittin
 - Remove dedot for tag values in aws module. {issue}19112[19112] {pull}19221[19221]
 - Set tags correctly if the dimension value is ARN {issue}19111[19111] {pull}19433[19433]
 - Fix bug incorrect parsing of float numbers as integers in Couchbase module {issue}18949[18949] {pull}19055[19055]
+- Fix config example in the perfmon configuration files. {pull}19539[19539]
+- Add missing info about the rest of the azure metricsets in the documentation. {pull}19601[19601]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/modules/windows.asciidoc b/metricbeat/docs/modules/windows.asciidoc
index 60faf2cf642..35525fd9df1 100644
--- a/metricbeat/docs/modules/windows.asciidoc
+++ b/metricbeat/docs/modules/windows.asciidoc
@@ -33,10 +33,10 @@ metricbeat.modules:
 #  - object: 'Process'
 #    instance: ["*"]
 #    counters:
-#    - name: 'Disk Writes/sec'
-#      field: physical_disk.write.per_sec
+#    - name: '% Processor Time'
+#      field: cpu_usage
 #      format: "float"
-#    - name: "% Disk Write Time"
+#    - name: "Thread Count"
 
 - module: windows
   metricsets: ["service"]
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index c0160d0a818..2badf80ceff 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -865,10 +865,10 @@ metricbeat.modules:
 #  - object: 'Process'
 #    instance: ["*"]
 #    counters:
-#    - name: 'Disk Writes/sec'
-#      field: physical_disk.write.per_sec
+#    - name: '% Processor Time'
+#      field: cpu_usage
 #      format: "float"
-#    - name: "% Disk Write Time"
+#    - name: "Thread Count"
 
 - module: windows
   metricsets: ["service"]
diff --git a/metricbeat/module/windows/_meta/config.reference.yml b/metricbeat/module/windows/_meta/config.reference.yml
index 49656feb554..ecb94de595e 100644
--- a/metricbeat/module/windows/_meta/config.reference.yml
+++ b/metricbeat/module/windows/_meta/config.reference.yml
@@ -8,10 +8,10 @@
 #  - object: 'Process'
 #    instance: ["*"]
 #    counters:
-#    - name: 'Disk Writes/sec'
-#      field: physical_disk.write.per_sec
+#    - name: '% Processor Time'
+#      field: cpu_usage
 #      format: "float"
-#    - name: "% Disk Write Time"
+#    - name: "Thread Count"
 
 - module: windows
   metricsets: ["service"]
diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
index 7982bdc67ae..92da6e6790f 100644
--- a/x-pack/metricbeat/metricbeat.reference.yml
+++ b/x-pack/metricbeat/metricbeat.reference.yml
@@ -1298,10 +1298,10 @@ metricbeat.modules:
 #  - object: 'Process'
 #    instance: ["*"]
 #    counters:
-#    - name: 'Disk Writes/sec'
-#      field: physical_disk.write.per_sec
+#    - name: '% Processor Time'
+#      field: cpu_usage
 #      format: "float"
-#    - name: "% Disk Write Time"
+#    - name: "Thread Count"
 
 - module: windows
   metricsets: ["service"]