From a938d2ecba256b66d4bcf90ea87d9a86f291688b Mon Sep 17 00:00:00 2001
From: Vihas Makwana <121151420+VihasMakwana@users.noreply.github.com>
Date: Mon, 16 Dec 2024 20:35:46 +0530
Subject: [PATCH] chore: disable performance counters (#42041)

(cherry picked from commit f3a063f1db520d7011460a6bb290d0cf38c9a8a9)

# Conflicts:
#	metricbeat/docs/modules/system.asciidoc
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/system/_meta/config.reference.yml
#	metricbeat/module/system/core/_meta/docs.asciidoc
#	metricbeat/module/system/core/config.go
#	metricbeat/module/system/cpu/_meta/docs.asciidoc
#	metricbeat/module/system/cpu/config.go
#	x-pack/metricbeat/metricbeat.reference.yml
---
 metricbeat/docs/modules/system.asciidoc             | 8 ++++++++
 metricbeat/metricbeat.reference.yml                 | 8 ++++++++
 metricbeat/module/system/_meta/config.reference.yml | 8 ++++++++
 metricbeat/module/system/core/_meta/docs.asciidoc   | 4 ++++
 metricbeat/module/system/core/config.go             | 5 +++++
 metricbeat/module/system/cpu/_meta/docs.asciidoc    | 4 ++++
 metricbeat/module/system/cpu/config.go              | 5 +++++
 x-pack/metricbeat/metricbeat.reference.yml          | 8 ++++++++
 8 files changed, 50 insertions(+)

diff --git a/metricbeat/docs/modules/system.asciidoc b/metricbeat/docs/modules/system.asciidoc
index 2fc3930d8444..82d2a358d89c 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 00eeded0626b..43a9ead78745 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 974df87cb0bc..0266612f941d 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 e70e55f0db71..3579cf1c7eb8 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 8ac1d2f9575a..5f7a2e2dc6c3 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 fb83c41e500a..95e16523cf21 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 ef9d78fe0ced..d0179d944fbd 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 11e1715050e2..1a989e264960 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']