Cherry-pick elastic#22237 to 7.x: [Metricbeat] Remove io.time from wi…

…ndows (elastic#22313) * [Metricbeat] Remove io.time from windows (elastic#22237) * remove io.time from windows * fix tests * add changelog entry (cherry picked from commit 77882fc) * fix changelog
michalpristas · Oct 30, 2020 · 8bd10a3 · 8bd10a3
1 parent 2b8e230
commit 8bd10a3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -429,6 +429,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - Fix panic in kubernetes autodiscover related to keystores {issue}21843[21843] {pull}21880[21880]
 - [Kubernetes] Remove redundant dockersock volume mount {pull}22009[22009]
 - Revert change to report `process.memory.rss` as `process.memory.wss` on Windows. {pull}22055[22055]
+- Remove io.time from windows {pull}22237[22237]
 
 *Packetbeat*
 

diff --git a/metricbeat/module/system/diskio/_meta/data.json b/metricbeat/module/system/diskio/_meta/data.json
@@ -15,7 +15,7 @@
     "system": {
         "diskio": {
             "io": {
-                "time": 601740
+                "time": 1296
             },
             "iostat": {
                 "await": 0,
@@ -48,16 +48,16 @@
                     }
                 }
             },
-            "name": "sdb1",
+            "name": "sda6",
             "read": {
-                "bytes": 25128030208,
-                "count": 3146154,
-                "time": 833872
+                "bytes": 335872,
+                "count": 82,
+                "time": 1296
             },
             "write": {
-                "bytes": 34401640448,
-                "count": 861040,
-                "time": 11224168
+                "bytes": 0,
+                "count": 0,
+                "time": 0
             }
         }
     }

diff --git a/metricbeat/module/system/diskio/diskio.go b/metricbeat/module/system/diskio/diskio.go
@@ -105,9 +105,6 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {
 				"time":  counters.WriteTime,
 				"bytes": counters.WriteBytes,
 			},
-			"io": common.MapStr{
-				"time": counters.IoTime,
-			},
 		}
 
 		// accumulate values from all interfaces
@@ -123,6 +120,10 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {
 			event["iostat"] = iostat.AddLinuxIOStat(result)
 		}
 
+		if runtime.GOOS != "windows" {
+			event.Put("io.time", counters.IoTime)
+		}
+
 		if counters.SerialNumber != "" {
 			event["serial_number"] = counters.SerialNumber
 		}

diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py
@@ -36,7 +36,7 @@
                                                "softirq.norm.pct", "steal.norm.pct", "system.norm.pct", "user.norm.pct"]
 
 SYSTEM_DISKIO_FIELDS = ["name", "read.count", "write.count", "read.bytes",
-                        "write.bytes", "read.time", "write.time", "io.time"]
+                        "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",