refactor(disk-io): fetch top items on Windows again

Author: markuslf

check-plugins/disk-io/README.md

@@ -61,12 +61,12 @@ period’s total bandwidth against the maximum ever observed for that disk
 (RWmax). WARN/CRIT trigger if the period average exceeds the configured
 percentage of RWmax for COUNT consecutive runs. Perfdata is emitted for each
 disk (busy_time, read_bytes, read_time, write_bytes, write_time) so you can
-graph trends. On Linux the check automatically focuses on “real” block devices
-with mountpoints; on Windows it uses psutil’s disk counters. Optionally, --top
-lists the processes that generated the most I/O traffic (read/write totals) to
-help identify offenders. This check is cross-platform and works on Linux,
-Windows, and all psutil-supported systems. The check stores its short trend
-state locally in an SQLite DB to evaluate sustained load across runs.
+graph trends. On Linux the check automatically focuses on "real" block devices
+with mountpoints; on Windows it uses psutil’s disk counters. Optionally,
+`--top` lists the processes that generated the most I/O traffic (read/write
+totals) to help identify offenders. This check is cross-platform and works on
+Linux, Windows, and all psutil-supported systems. The check stores its short
+trend state locally in an SQLite DB to evaluate sustained load across runs.
 
 options:
   -h, --help       show this help message and exit
@@ -87,8 +87,7 @@ options:
                    characters that satisfy the condition inside it, zero or
                    more times. Default:
   --top TOP        List x "Top processes that generated the most I/O traffic".
-                   Use `--top=0` to disable this feature. Default: 5 on Linux,
-                   0 on Windows
+                   Use `--top=0` to disable this feature. Default: 5
   --warning WARN   Threshold for disk bandwidth saturation (over the last
                    `--count` measurements) as a percentage of the maximum
                    bandwidth the disk can support. Default: >= 80

check-plugins/disk-io/disk-io

@@ -35,7 +35,7 @@ except ImportError:
 
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2025090702'
+__version__ = '2025090703'
 
 DESCRIPTION = """Checks disk I/O bandwidth over time and alerts on sustained saturation, not
 short spikes. The check records per-disk read/write counters and then derives current (R1/W1)
@@ -44,8 +44,8 @@ maximum ever observed for that disk (RWmax). WARN/CRIT trigger if the period ave
 the configured percentage of RWmax for COUNT consecutive runs.
 
 Perfdata is emitted for each disk (busy_time, read_bytes, read_time, write_bytes, write_time)
-so you can graph trends. On Linux the check automatically focuses on “real” block devices with
-mountpoints; on Windows it uses psutil’s disk counters. Optionally, --top lists the processes
+so you can graph trends. On Linux the check automatically focuses on "real" block devices with
+mountpoints; on Windows it uses psutil’s disk counters. Optionally, `--top` lists the processes
 that generated the most I/O traffic (read/write totals) to help identify offenders.
 
 This check is cross-platform and works on Linux, Windows, and all psutil-supported systems.
@@ -57,7 +57,7 @@ DEFAULT_CACHE_EXPIRE = 90
 DEFAULT_COUNT = 5    # measurements; if check runs once per minute, this is a 5 minute interval
 DEFAULT_CRIT = 90    # %
 DEFAULT_MATCH = ''
-DEFAULT_TOP = 0 if lib.base.WINDOWS else 5
+DEFAULT_TOP = 5
 DEFAULT_WARN = 80    # %
 
 
@@ -112,7 +112,7 @@ def parse_args():
         '--top',
         help='List x "Top processes that generated the most I/O traffic". '
              'Use `--top=0` to disable this feature. '
-             'Default: 5 on Linux, 0 on Windows',
+             'Default: %(default)s',
         dest='TOP',
         type=int,
         default=DEFAULT_TOP,

check-plugins/disk-io/icingaweb2-module-director/disk-io.json

@@ -178,7 +178,7 @@
                 "tpl-service-generic"
             ],
             "max_check_attempts": 5,
-            "notes": "Checks disk I/O bandwidth over time and alerts on sustained saturation, not short spikes. The check records per-disk read/write counters and then derives current (R1/W1) and period averages (R{COUNT}/W{COUNT}). It compares the period\u2019s total bandwidth against the maximum ever observed for that disk (RWmax). WARN/CRIT trigger if the period average exceeds the configured percentage of RWmax for COUNT consecutive runs. Perfdata is emitted for each disk (busy_time, read_bytes, read_time, write_bytes, write_time) so you can graph trends. On Linux the check automatically focuses on \u201creal\u201d block devices with mountpoints; on Windows it uses psutil\u2019s disk counters. Optionally, --top lists the processes that generated the most I/O traffic (read/write totals) to help identify offenders. This check is cross-platform and works on Linux, Windows, and all psutil-supported systems. The check stores its short trend state locally in an SQLite DB to evaluate sustained load across runs.",
+            "notes": "Checks disk I/O bandwidth over time and alerts on sustained saturation, not short spikes. The check records per-disk read/write counters and then derives current (R1/W1) and period averages (R{COUNT}/W{COUNT}). It compares the period\u2019s total bandwidth against the maximum ever observed for that disk (RWmax). WARN/CRIT trigger if the period average exceeds the configured percentage of RWmax for COUNT consecutive runs. Perfdata is emitted for each disk (busy_time, read_bytes, read_time, write_bytes, write_time) so you can graph trends. On Linux the check automatically focuses on \"real\" block devices with mountpoints; on Windows it uses psutil\u2019s disk counters. Optionally, `--top` lists the processes that generated the most I/O traffic (read/write totals) to help identify offenders. This check is cross-platform and works on Linux, Windows, and all psutil-supported systems. The check stores its short trend state locally in an SQLite DB to evaluate sustained load across runs.",
             "notes_url": "https://github.com/Linuxfabrik/monitoring-plugins/tree/main/check-plugins/disk-io",
             "object_name": "tpl-service-disk-io",
             "object_type": "template",
@@ -229,7 +229,7 @@
                 "tpl-service-generic"
             ],
             "max_check_attempts": 5,
-            "notes": "Checks disk I/O bandwidth over time and alerts on sustained saturation, not short spikes. The check records per-disk read/write counters and then derives current (R1/W1) and period averages (R{COUNT}/W{COUNT}). It compares the period\u2019s total bandwidth against the maximum ever observed for that disk (RWmax). WARN/CRIT trigger if the period average exceeds the configured percentage of RWmax for COUNT consecutive runs. Perfdata is emitted for each disk (busy_time, read_bytes, read_time, write_bytes, write_time) so you can graph trends. On Linux the check automatically focuses on \u201creal\u201d block devices with mountpoints; on Windows it uses psutil\u2019s disk counters. Optionally, --top lists the processes that generated the most I/O traffic (read/write totals) to help identify offenders. This check is cross-platform and works on Linux, Windows, and all psutil-supported systems. The check stores its short trend state locally in an SQLite DB to evaluate sustained load across runs.",
+            "notes": "Checks disk I/O bandwidth over time and alerts on sustained saturation, not short spikes. The check records per-disk read/write counters and then derives current (R1/W1) and period averages (R{COUNT}/W{COUNT}). It compares the period\u2019s total bandwidth against the maximum ever observed for that disk (RWmax). WARN/CRIT trigger if the period average exceeds the configured percentage of RWmax for COUNT consecutive runs. Perfdata is emitted for each disk (busy_time, read_bytes, read_time, write_bytes, write_time) so you can graph trends. On Linux the check automatically focuses on \"real\" block devices with mountpoints; on Windows it uses psutil\u2019s disk counters. Optionally, `--top` lists the processes that generated the most I/O traffic (read/write totals) to help identify offenders. This check is cross-platform and works on Linux, Windows, and all psutil-supported systems. The check stores its short trend state locally in an SQLite DB to evaluate sustained load across runs.",
             "notes_url": "https://github.com/Linuxfabrik/monitoring-plugins/tree/main/check-plugins/disk-io",
             "object_name": "tpl-service-disk-io-windows",
             "object_type": "template",
@@ -298,7 +298,7 @@
         "5": {
             "varname": "disk_io_top",
             "caption": "Disk I/O: Top",
-            "description": "List x \"Top processes that generated the most I/O traffic\". Use `--top=0` to disable this feature. Default: 5 on Linux, 0 on Windows",
+            "description": "List x \"Top processes that generated the most I/O traffic\". Use `--top=0` to disable this feature.",
             "datatype": "Icinga\\Module\\Director\\DataType\\DataTypeString",
             "format": null,
             "settings": {
@@ -362,7 +362,7 @@
         "11": {
             "varname": "disk_io_windows_top",
             "caption": "Disk I/O: Top",
-            "description": "List x \"Top processes that generated the most I/O traffic\". Use `--top=0` to disable this feature. Default: 5 on Linux, 0 on Windows",
+            "description": "List x \"Top processes that generated the most I/O traffic\". Use `--top=0` to disable this feature.",
             "datatype": "Icinga\\Module\\Director\\DataType\\DataTypeString",
             "format": null,
             "settings": {