[checkmk-commits] 3357 FIX Fixed service conditions of Disk IO related rulesets

Module: check_mk Branch: master Commit: eb9a10ddf934a2a90223485c187d90a93507d2a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb9a10ddf934a2… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Apr 1 10:46:09 2016 +0200 3357 FIX Fixed service conditions of Disk IO related rulesets --- .werks/3357 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 16 ++++------------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.werks/3357 b/.werks/3357 new file mode 100644 index 0000000..04980f9 --- /dev/null +++ b/.werks/3357 @@ -0,0 +1,10 @@ +Title: Fixed service conditions of Disk IO related rulesets +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459500350 + + diff --git a/ChangeLog b/ChangeLog index 9f0e2f4..8bb2aec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ * 3352 FIX: Network scan: Added hostname translation to translate detected DNS names of scanned hosts * 3353 FIX: Displaying disabled/offline host state in WATO host list now * 3354 FIX: Added missing option to exclude IP addresses by regex + * 3357 FIX: Fixed service conditions of Disk IO related rulesets Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 12b8b7f..a5b4aca 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7378,14 +7378,12 @@ register_check_parameters( default_value = 300, )), ]), - OptionalDropdownChoice( - choices = [ ( "SUMMARY", _("Summary of all disks") ), ], - otherlabel = _("On explicit devices ->"), - explicit = TextAscii(allow_empty = False), + TextAscii( title = _("Device"), help = _("For a summarized throughput of all disks, specify <tt>SUMMARY</tt>, " "a per-disk IO is specified by the drive letter, a colon and a slash on Windows " - "(e.g. <tt>C:/</tt>) or by the device name on Linux/UNIX (e.g. <tt>/dev/sda</tt>).")), + "(e.g. <tt>C:/</tt>) or by the device name on Linux/UNIX (e.g. <tt>/dev/sda</tt>).") + ), "dict", ) @@ -7456,13 +7454,7 @@ register_check_parameters( "if you are running PNP4Nagios in SINGLE mode.")), ), ]), - OptionalDropdownChoice( - choices = [ ( "SUMMARY", _("Summary of all disks") ), - ( "read", _("Summary of disk input (read)") ), - ( "write", _("Summary of disk output (write)") ), - ], - otherlabel = _("On explicit devices ->"), - explicit = TextAscii(allow_empty = False), + TextAscii( title = _("Device"), help = _("For a summarized throughput of all disks, specify <tt>SUMMARY</tt>, for a " "sum of read or write throughput write <tt>read</tt> or <tt>write</tt> resp. "