[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
elastic · Nov 18, 2021 · ab108fe · ab108fe
1 parent 74d48aa
commit ab108fe
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 0 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -86,6 +86,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/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -45972,6 +45972,7 @@ type: long
 
 --
 
+<<<<<<< HEAD
 [float]
 === rapl
 
@@ -46069,6 +46070,8 @@ type: float
 
 --
 
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 [[exported-fields-logstash]]
 == Logstash fields
 

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
@@ -57,8 +60,11 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-linux-pressure,pressure>>
 
+<<<<<<< HEAD
 * <<metricbeat-metricset-linux-rapl,rapl>>
 
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 include::linux/conntrack.asciidoc[]
 
 include::linux/iostat.asciidoc[]
@@ -71,5 +77,8 @@ include::linux/pageinfo.asciidoc[]
 
 include::linux/pressure.asciidoc[]
 
+<<<<<<< HEAD
 include::linux/rapl.asciidoc[]
 
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
diff --git a/metricbeat/docs/modules/linux/pressure.asciidoc b/metricbeat/docs/modules/linux/pressure.asciidoc
@@ -3,7 +3,11 @@ This file is generated! See scripts/mage/docs_collector.go
 ////
 
 [[metricbeat-metricset-linux-pressure]]
+<<<<<<< HEAD
 === Linux pressure metricset
+=======
+=== linux pressure metricset
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 
 beta[]
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -187,14 +187,22 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-module-kvm,KVM>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-kvm-dommemstat,dommemstat>> beta[]  
 |<<metricbeat-metricset-kvm-status,status>> beta[]  
+<<<<<<< HEAD
 |<<metricbeat-module-linux,Linux>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .7+| .7+|  |<<metricbeat-metricset-linux-conntrack,conntrack>> beta[]  
+=======
+|<<metricbeat-module-linux,linux>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.6+| .6+|  |<<metricbeat-metricset-linux-conntrack,conntrack>> beta[]  
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 |<<metricbeat-metricset-linux-iostat,iostat>> beta[]  
 |<<metricbeat-metricset-linux-ksm,ksm>> beta[]  
 |<<metricbeat-metricset-linux-memory,memory>> beta[]  
 |<<metricbeat-metricset-linux-pageinfo,pageinfo>> beta[]  
 |<<metricbeat-metricset-linux-pressure,pressure>> beta[]  
+<<<<<<< HEAD
 |<<metricbeat-metricset-linux-rapl,rapl>> beta[]  
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 |<<metricbeat-module-logstash,Logstash>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-logstash-node,node>>   
 |<<metricbeat-metricset-logstash-node_stats,node_stats>>   

diff --git a/metricbeat/include/list_common.go b/metricbeat/include/list_common.go
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/fields.go b/metricbeat/module/linux/fields.go
diff --git a/metricbeat/module/linux/pressure/pressure.go b/metricbeat/module/linux/pressure/pressure.go
@@ -63,18 +63,31 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 		return nil, fmt.Errorf("the %v/%v metricset is only supported on Linux", moduleName, metricsetName)
 	}
 
+<<<<<<< HEAD
 	sys := base.Module().(linux.LinuxModule)
 	hostfs := sys.GetHostFS()
 
 	path := filepath.Join(hostfs, "proc")
+=======
+	linuxModule, ok := base.Module().(*linux.Module)
+	if !ok {
+		return nil, errors.New("unexpected module type")
+	}
+
+	path := filepath.Join(linuxModule.HostFS, "proc")
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 	procfs, err := procfs.NewFS(path)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error creating new Host FS at %s", path)
 	}
 
 	return &MetricSet{
 		BaseMetricSet: base,
+<<<<<<< HEAD
 		fs:            hostfs,
+=======
+		fs:            linuxModule.HostFS,
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 		procfs:        procfs,
 	}, nil
 }

diff --git a/metricbeat/module/linux/pressure/pressure_test.go b/metricbeat/module/linux/pressure/pressure_test.go
@@ -15,7 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+<<<<<<< HEAD
 //go:build linux
+=======
+>>>>>>> e49f2579c ([Metricbeat] Add Linux pressure metricset (#27355))
 // +build linux
 
 package pressure

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