From 63f4bf1e53a860fc9590eb49b7a9b4f648059238 Mon Sep 17 00:00:00 2001 From: Mariana Date: Wed, 1 Jul 2020 12:35:45 +0200 Subject: [PATCH 1/2] fix config --- metricbeat/docs/modules/windows.asciidoc | 6 +++--- metricbeat/metricbeat.reference.yml | 6 +++--- metricbeat/module/windows/_meta/config.reference.yml | 6 +++--- x-pack/metricbeat/metricbeat.reference.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) 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 5b5013a4bc3..2fd0a28aa22 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1297,10 +1297,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"] From e0da3af2113bd8edb8d4321b86b8264555ae16bb Mon Sep 17 00:00:00 2001 From: Mariana Date: Wed, 1 Jul 2020 12:40:03 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 6bcd7474392..bee1c238213 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -260,6 +260,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Stop counterCache only when already started {pull}19103[19103] - Add param `aws_partition` to support aws-cn, aws-us-gov regions. {issue}18850[18850] {pull}19423[19423] - 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] *Packetbeat*