[8.0](backport #27355) [Metricbeat] Add Linux pressure metricset (#29037

) * [Metricbeat] Add Linux pressure metricset (#27355) * Adds new linux pressure metricset * Tidy up code * Be consistent in default config * Run integration tests * Make update * make update v3 * Address comments * Format tests * Remove unused imports from tests * Mage format * Update changelog * simplify loop * Fix fields/mapping (cherry picked from commit e49f257) # Conflicts: # metricbeat/docs/fields.asciidoc # metricbeat/docs/modules/linux.asciidoc # metricbeat/docs/modules/linux/pressure.asciidoc # metricbeat/docs/modules_list.asciidoc # metricbeat/include/list_common.go # metricbeat/metricbeat.reference.yml # metricbeat/module/linux/_meta/config.yml # metricbeat/module/linux/fields.go # metricbeat/module/linux/pressure/pressure.go # metricbeat/module/linux/pressure/pressure_test.go # metricbeat/modules.d/linux.yml.disabled # x-pack/metricbeat/metricbeat.reference.yml * fix merge Co-authored-by: Brad Deam <54515790+b-deam@users.noreply.github.com> Co-authored-by: Alex Kristiansen <alex.kristiansen@elastic.co>
elastic · Nov 19, 2021 · 932d1e4 · 932d1e4
1 parent 8ada2a6
commit 932d1e4
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -87,6 +87,16 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Remove deprecated fields in Redis module. {issue}11835[11835] {pull}28246[28246]
 - Align fields to Beats naming conventions in GCP module. {issue}27231[27231] {pull}27974[27974]
 - system/process metricset: Replace usage of deprecated `process.ppid` field with `process.parent.pid`. {pull}28620[28620]
+- Make use of secure port when accessing Kubelet API {pull}16063[16063]
+- Add Tomcat overview dashboard {pull}14026[14026]
+- Move service config under metrics and simplify metric types. {pull}18691[18691]
+- Fix ECS compliance of user.id field in system/users  metricset {pull}19019[19019]
+- Remove "invalid zero" metrics on Windows and Darwin, don't report linux-only memory and diskio metrics when running under agent. {pull}21457[21457]
+- Added `statsd.mappings` configuration for Statsd module {pull}26220[26220]
+- Added Airflow lightweight module {pull}26220[26220]
+- Add state_job metricset to Kubernetes module{pull}26479[26479]
+- Bump AWS SDK version to v0.24.0 for WebIdentity authentication flow {issue}19393[19393] {pull}27126[27126]
+- Add Linux pressure metricset {pull}27355[27355]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/linux.asciidoc b/metricbeat/docs/modules/linux.asciidoc
@@ -33,7 +33,10 @@ metricbeat.modules:
     # - conntrack
     # - iostat
     # - pressure
+<<<<<<< HEAD
     # - rapl
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
   enabled: true
   #hostfs: /hostfs
   #rapl.use_msr_safe: false

diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
@@ -595,7 +595,10 @@ metricbeat.modules:
     # - conntrack
     # - iostat
     # - pressure
+<<<<<<< HEAD
     # - rapl
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
   enabled: true
   #hostfs: /hostfs
   #rapl.use_msr_safe: false

diff --git a/metricbeat/module/linux/_meta/config.yml b/metricbeat/module/linux/_meta/config.yml
@@ -7,7 +7,10 @@
     # - conntrack
     # - iostat
     # - pressure
+<<<<<<< HEAD
     # - rapl
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
   enabled: true
   #hostfs: /hostfs
   #rapl.use_msr_safe: false

diff --git a/metricbeat/module/linux/pressure/pressure.go b/metricbeat/module/linux/pressure/pressure.go
@@ -74,7 +74,6 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 
 	return &MetricSet{
 		BaseMetricSet: base,
-		fs:            hostfs,
 		procfs:        procfs,
 	}, nil
 }

diff --git a/metricbeat/modules.d/linux.yml.disabled b/metricbeat/modules.d/linux.yml.disabled
@@ -10,7 +10,10 @@
     # - conntrack
     # - iostat
     # - pressure
+<<<<<<< HEAD
     # - rapl
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
   enabled: true
   #hostfs: /hostfs
   #rapl.use_msr_safe: false

diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
@@ -967,7 +967,10 @@ metricbeat.modules:
     # - conntrack
     # - iostat
     # - pressure
+<<<<<<< HEAD
     # - rapl
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
   enabled: true
   #hostfs: /hostfs
   #rapl.use_msr_safe: false