Add IO operations in progress to be exported in diskio module (elasti…

…c#22066) * add IO operations in progress to be exported in diskio module * update changelog (cherry picked from commit 5bd19e0)
fearful-symmetry · Dec 1, 2020 · ad28061 · ad28061
1 parent 6d0785f
commit ad28061
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -611,6 +611,18 @@ same journal. {pull}18467[18467]
 - Add unit file states to system/service {pull}22557[22557]
 - `kibana` module: `stats` metricset no-longer collects usage-related data. {pull}22732[22732]
 - Add more TCP states to Metricbeat system socket_summary. {pull}14347[14347]
+- Add io.ops in fields exported by system.diskio. {pull}22066[22066]
+
+*Packetbeat*
+
+- Add an example to packetbeat.yml of using the `forwarded` tag to disable
+  `host` metadata fields when processing network data from network tap or mirror
+  port. {pull}19209[19209]
+- Add ECS fields for x509 certs, event categorization, and related IP info. {pull}19167[19167]
+- Add 100-continue support {issue}15830[15830] {pull}19349[19349]
+- Add initial SIP protocol support {pull}21221[21221]
+- Add support for overriding the published index on a per-protocol/flow basis. {pull}22134[22134]
+- Change build process for x-pack distribution {pull}21979[21979]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -41512,6 +41512,16 @@ type: long
 The total number of of milliseconds spent doing I/Os.
 
 
+type: long
+
+--
+
+*`system.diskio.io.ops`*::
++
+--
+The total number of I/Os in progress.
+
+
 type: long
 
 --

diff --git a/metricbeat/module/system/diskio/_meta/fields.yml b/metricbeat/module/system/diskio/_meta/fields.yml
@@ -55,6 +55,11 @@
       type: long
       description: >
         The total number of of milliseconds spent doing I/Os.
+    
+    - name: io.ops
+      type: long
+      description: >
+        The total number of I/Os in progress.
 
     - name: iostat.read.request.merges_per_sec
       type: float

diff --git a/metricbeat/module/system/diskio/diskio.go b/metricbeat/module/system/diskio/diskio.go
@@ -107,6 +107,11 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {
 			},
 		}
 
+		// Add linux-only ops in progress
+		if runtime.GOOS == "linux" {
+			event.Put("io.ops", counters.IopsInProgress)
+		}
+
 		// accumulate values from all interfaces
 		diskReadBytes += counters.ReadBytes
 		diskWriteBytes += counters.WriteBytes

diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go
diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py
@@ -39,7 +39,7 @@
                         "write.bytes", "read.time", "write.time"]
 
 SYSTEM_DISKIO_FIELDS_LINUX = ["name", "read.count", "write.count", "read.bytes",
-                              "write.bytes", "read.time", "write.time", "io.time",
+                              "write.bytes", "read.time", "write.time", "io.time", "io.ops",
                               "iostat.read.request.merges_per_sec", "iostat.write.request.merges_per_sec", "iostat.read.request.per_sec", "iostat.write.request.per_sec", "iostat.read.per_sec.bytes", "iostat.write.per_sec.bytes"
                               "iostat.request.avg_size", "iostat.queue.avg_size", "iostat.await", "iostat.service_time", "iostat.busy"]