Module: check_mk Branch: master Commit: 3cb3adef684f848bebb06bcbb19a1310155afeb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cb3adef684f84… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Jan 31 13:21:43 2013 +0100 diskstat.include: fix computation of queue length on windows --- ChangeLog | 2 ++ checks/diskstat.include | 6 +++--- pnp-templates/check_mk-diskstat.php | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 769a6a4..16be061 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,8 @@ * FIX: logwatch.ec: fixed forwarding of single log lines to event console * Improved performance of logwatch.ec check in case of many messages * livestatus_status: new check for monitoring performance of monitoring + * FIX: diskstat.include: fix computation of queue length on windows + (thanks to K.H. Fiebig) Multisite: * Added comment painter to notification related views diff --git a/checks/diskstat.include b/checks/diskstat.include index 4bcba53..553ab76 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -168,8 +168,8 @@ def check_diskstat_line(this_time, item, params, line): warn, crit = None, None timedif, qlx = get_counter(countername, this_time, int(ctr)) - ql = qlx / 100000.0 - infos.append(what.title() + " Queue: %.1f%%" % ql) + ql = qlx / 10000000.0 + infos.append(what.title() + " Queue: %.2f" % ql) # check levels if levels != None: diff --git a/pnp-templates/check_mk-diskstat.php b/pnp-templates/check_mk-diskstat.php index bf60f08..1e02544 100644 --- a/pnp-templates/check_mk-diskstat.php +++ b/pnp-templates/check_mk-diskstat.php @@ -6,7 +6,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -118,7 +118,7 @@ if (isset($DS[2])) { } if (isset($RRD["read_ql"])) { - $opt[] = "--vertical-label 'Queue Length' -X0 -u10 -l-10 --title \"Queue Length $hostname / $disk\" "; + $opt[] = "--vertical-label 'Queue Length' -X0 -u5 -l-5 --title \"Queue Length $hostname / $disk\" "; $def[] = "" . "DEF:read=$RRD[read_ql] " . "DEF:write=$RRD[write_ql] "