diff --git a/metricbeat/docs/modules/system.asciidoc b/metricbeat/docs/modules/system.asciidoc index 2fc3930d844..82d2a358d89 100644 --- a/metricbeat/docs/modules/system.asciidoc +++ b/metricbeat/docs/modules/system.asciidoc @@ -265,6 +265,14 @@ metricbeat.modules: # Filter systemd services based on a name pattern #service.pattern_filter: ["ssh*", "nfs*"] +<<<<<<< HEAD +======= + + # This option enables the use of performance counters to collect data for cpu/core metricset. + # Only effective for Windows. + # You should use this option if running beats on machins with more than 64 cores. + #use_performance_counters: false +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) ---- [float] diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 00eeded0626..43a9ead7874 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -142,6 +142,14 @@ metricbeat.modules: # Filter systemd services based on a name pattern #service.pattern_filter: ["ssh*", "nfs*"] +<<<<<<< HEAD +======= + # This option enables the use of performance counters to collect data for cpu/core metricset. + # Only effective for Windows. + # You should use this option if running beats on machins with more than 64 cores. + #use_performance_counters: false + +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) #------------------------------ Aerospike Module ------------------------------ - module: aerospike metricsets: ["namespace"] diff --git a/metricbeat/module/system/_meta/config.reference.yml b/metricbeat/module/system/_meta/config.reference.yml index 974df87cb0b..0266612f941 100644 --- a/metricbeat/module/system/_meta/config.reference.yml +++ b/metricbeat/module/system/_meta/config.reference.yml @@ -81,3 +81,11 @@ # Filter systemd services based on a name pattern #service.pattern_filter: ["ssh*", "nfs*"] +<<<<<<< HEAD +======= + + # This option enables the use of performance counters to collect data for cpu/core metricset. + # Only effective for Windows. + # You should use this option if running beats on machins with more than 64 cores. + #use_performance_counters: false +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) diff --git a/metricbeat/module/system/core/_meta/docs.asciidoc b/metricbeat/module/system/core/_meta/docs.asciidoc index e70e55f0db7..3579cf1c7eb 100644 --- a/metricbeat/module/system/core/_meta/docs.asciidoc +++ b/metricbeat/module/system/core/_meta/docs.asciidoc @@ -21,4 +21,8 @@ metricbeat.modules: - module: system metricsets: [core] core.metrics: [percentages, ticks] +<<<<<<< HEAD +======= + #use_performance_counters: false +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) ---- diff --git a/metricbeat/module/system/core/config.go b/metricbeat/module/system/core/config.go index 8ac1d2f9575..5f7a2e2dc6c 100644 --- a/metricbeat/module/system/core/config.go +++ b/metricbeat/module/system/core/config.go @@ -65,5 +65,10 @@ func (c Config) Validate() (metrics.MetricOpts, error) { } var defaultConfig = Config{ +<<<<<<< HEAD Metrics: []string{percentages}, +======= + Metrics: []string{percentages}, + UserPerformanceCounters: false, +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) } diff --git a/metricbeat/module/system/cpu/_meta/docs.asciidoc b/metricbeat/module/system/cpu/_meta/docs.asciidoc index fb83c41e500..95e16523cf2 100644 --- a/metricbeat/module/system/cpu/_meta/docs.asciidoc +++ b/metricbeat/module/system/cpu/_meta/docs.asciidoc @@ -22,4 +22,8 @@ metricbeat.modules: - module: system metricsets: [cpu] cpu.metrics: [percentages, normalized_percentages, ticks] +<<<<<<< HEAD +======= + #use_performance_counters: false +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) ---- diff --git a/metricbeat/module/system/cpu/config.go b/metricbeat/module/system/cpu/config.go index ef9d78fe0ce..d0179d944fb 100644 --- a/metricbeat/module/system/cpu/config.go +++ b/metricbeat/module/system/cpu/config.go @@ -69,5 +69,10 @@ func (c Config) Validate() (metrics.MetricOpts, error) { } var defaultConfig = Config{ +<<<<<<< HEAD Metrics: []string{percentages, normalizedPercentages}, +======= + Metrics: []string{percentages, normalizedPercentages}, + UserPerformanceCounters: false, +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) } diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 11e1715050e..1a989e26496 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -142,6 +142,14 @@ metricbeat.modules: # Filter systemd services based on a name pattern #service.pattern_filter: ["ssh*", "nfs*"] +<<<<<<< HEAD +======= + # This option enables the use of performance counters to collect data for cpu/core metricset. + # Only effective for Windows. + # You should use this option if running beats on machins with more than 64 cores. + #use_performance_counters: false + +>>>>>>> f3a063f1d (chore: disable performance counters (#42041)) #------------------------------- ActiveMQ Module ------------------------------- - module: activemq metricsets: ['broker', 'queue', 'topic']