From 8a75793698a233a2aa698a70bb8246946f180bd5 Mon Sep 17 00:00:00 2001 From: Mariana Date: Mon, 14 Oct 2019 19:04:27 +0200 Subject: [PATCH 1/3] Fix counter values --- metricbeat/module/windows/perfmon/reader.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/metricbeat/module/windows/perfmon/reader.go b/metricbeat/module/windows/perfmon/reader.go index 2cc299ffcd12..f6598e18be37 100644 --- a/metricbeat/module/windows/perfmon/reader.go +++ b/metricbeat/module/windows/perfmon/reader.go @@ -124,16 +124,14 @@ func (r *Reader) RefreshCounterPaths() error { if err != nil { return errors.Wrap(err, "failed removing unused counter values") } - // Some counters, such as rate counters, require two counter values in order to compute a displayable value. In this case we must call PdhCollectQueryData twice before calling PdhGetFormattedCounterValue. - // For more information, see Collecting Performance Data (https://docs.microsoft.com/en-us/windows/desktop/PerfCtrs/collecting-performance-data). - if err = r.query.CollectData(); err != nil { - return errors.Wrap(err, "failed querying counter values") - } + return nil } // Read executes a query and returns those values in an event. func (r *Reader) Read() ([]mb.Event, error) { + // Some counters, such as rate counters, require two counter values in order to compute a displayable value. In this case we must call PdhCollectQueryData twice before calling PdhGetFormattedCounterValue. + // For more information, see Collecting Performance Data (https://docs.microsoft.com/en-us/windows/desktop/PerfCtrs/collecting-performance-data). if err := r.query.CollectData(); err != nil { return nil, errors.Wrap(err, "failed querying counter values") } From e2a8c6a9ce6ef238254cf077ead3025555583dd7 Mon Sep 17 00:00:00 2001 From: Mariana Date: Mon, 14 Oct 2019 19:21:01 +0200 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 07dbd6f28dc8..10cffcd9e021 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -171,6 +171,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix NPEs / resource leaks when executing config checks. {pull}11165[11165] - Fix duplicated IPs on `mode: all` monitors. {pull}12458[12458] - Fix integer comparison on JSON responses. {pull}13348[13348] +- Fix performance counter values for windows/perfmon metricset.{issue}14036[14036] {pull}14039[14039] *Journalbeat* From b9d514d85fea94c3f073adf567b074cf1ec33ecd Mon Sep 17 00:00:00 2001 From: Mariana Date: Wed, 16 Oct 2019 13:16:23 +0200 Subject: [PATCH 3/3] Fix changelog entry --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 10cffcd9e021..226f6babc383 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -171,7 +171,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix NPEs / resource leaks when executing config checks. {pull}11165[11165] - Fix duplicated IPs on `mode: all` monitors. {pull}12458[12458] - Fix integer comparison on JSON responses. {pull}13348[13348] -- Fix performance counter values for windows/perfmon metricset.{issue}14036[14036] {pull}14039[14039] *Journalbeat* @@ -217,6 +216,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix rds metricset dashboard. {pull}13721[13721] - Ignore prometheus untyped metrics with NaN value. {issue}13750[13750] {pull}13790[13790] - Change kubernetes.event.message to text {pull}13964[13964] +- Fix performance counter values for windows/perfmon metricset.{issue}14036[14036] {pull}14039[14039] *Packetbeat*