[checkmk-commits] Check_MK Git: check_mk: statgrab_load: level is now checked against 15min average

Module: check_mk Branch: master Commit: 008eb32fae920c0f122fe1c08af16981b77d49ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=008eb32fae920c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 21:52:10 2012 +0100 statgrab_load: level is now checked against 15min average --- ChangeLog | 2 ++ checks/cpu | 6 +++--- checks/statgrab_load | 19 +++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c1ac63..7ee5b34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,8 @@ * ps: output node process is running on (only for clusters) * hr_mem: handle rare case where more than one entry is present (this prevents an exception of pfSense) + * statgrab_load: level is now checked against 15min average - + in order to be consistent with the Linux load check Multisite: * Added several missing localization strings diff --git a/checks/cpu b/checks/cpu index 5a42b0a..ea3198e 100644 --- a/checks/cpu +++ b/checks/cpu @@ -50,11 +50,11 @@ def check_cpu_load(item, params, info): perfdata = [ ('load' + str(z), l, warn, crit, 0 ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] if load[2] >= crit: - return (2, "CRIT - 15min Load %.2f at %s CPUs (critical at %.2f)" % (load[2], num_cpus, crit), perfdata) + return (2, "CRIT - 15min load %.2f at %s CPUs (critical at %.2f)" % (load[2], num_cpus, crit), perfdata) elif load[2] >= warn: - return (1, "WARN - 15min Load %.2f at %s CPUs (warning at %.2f)" % (load[2], num_cpus, warn), perfdata) + return (1, "WARN - 15min load %.2f at %s CPUs (warning at %.2f)" % (load[2], num_cpus, warn), perfdata) else: - return (0, "OK - 15min Load %.2f at %s CPUs" % (load[2], num_cpus), perfdata) + return (0, "OK - 15min load %.2f at %s CPUs" % (load[2], num_cpus), perfdata) def inventory_cpu_threads(info): if len(info) == 1 and len(info[0]) >= 5: diff --git a/checks/statgrab_load b/checks/statgrab_load index 46c3ff0..4c7b5fa 100644 --- a/checks/statgrab_load +++ b/checks/statgrab_load @@ -39,15 +39,18 @@ def check_statgrab_load(item, params, info): load_15 = float(value) warn, crit = params - perfdata = [ ('load' + str(z), l, warn, crit, 0 ) for (z,l) in [ (1,load_1), (5,load_5), (15, load_15) ] ] - - - if load_1 >= crit: - return (2, "CRIT - %.2f (critical at %.2f)" % (load_1, crit), perfdata) - elif load_1 >= warn: - return (1, "WARN - %.2f (warning at %.2f)" % (load_1, warn), perfdata) + perfdata = [ ('load' + str(z), l, warn, crit, 0 ) + for (z,l) in + [ (1, load_1), (5, load_5), (15, load_15) ] ] + + if load_15 >= crit: + return (2, "CRIT - 15min load %.2f (critical at %.2f)" % (load_15, crit), perfdata) + elif load_15 >= warn: + return (1, "WARN - 15min load %.2f (warning at %.2f)" % (load_15, warn), perfdata) else: - return (0, "OK - %.2f" % load_1, perfdata) + return (0, "OK - 15min load %.2f" % load_15, perfdata) + check_info['statgrab_load'] = (check_statgrab_load, "CPU load", 1, inventory_statgrab_load) +checkgroup_of['statgrab_load'] = "cpu_load"