[checkmk-commits] Check_MK Git: check_mk: WATO: renamed check group cpu_utilization to cpu_iowait

Module: check_mk Branch: master Commit: 96a31bac3c8bc9e919aca95bd9749d942eb151db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96a31bac3c8bc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 4 16:07:49 2012 +0200 WATO: renamed check group cpu_utilization to cpu_iowait --- checks/kernel | 2 +- checks/ucd_cpu_util | 2 +- web/plugins/wato/check_parameters.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/checks/kernel b/checks/kernel index 8ff91b3..2102d27 100644 --- a/checks/kernel +++ b/checks/kernel @@ -152,7 +152,7 @@ def check_cpu_utilization(item, params, info): (user_perc, system_perc, wait_perc), perfdata) check_info['kernel.util'] = (check_cpu_utilization, "CPU utilization", 1, inventory_cpu_utilization) -checkgroup_of['kernel.util'] = "cpu_utilization" +checkgroup_of['kernel.util'] = "cpu_iowait" check_info['kernel'] = (check_kernel, "Kernel %s", 1, inventory_kernel) checkgroup_of['kernel'] = "vm_counter" diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 9e68c3c..0ace283 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -92,4 +92,4 @@ snmp_info['ucd_cpu_util'] = ( ".1.3.6.1.4.1.2021.11", [ 50, 51, 52, 53, 54, 55, snmp_scan_functions['ucd_cpu_util'] = \ lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") -checkgroup_of['ucd_cpu_util'] = "cpu_utilization" +checkgroup_of['ucd_cpu_util'] = "cpu_iowait" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fd98071..385ecc0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -885,6 +885,21 @@ checkgroups.append(( checkgroups.append(( subgroup_cpumem, "cpu_utilization", + _("CPU utilization (percentual)"), + Optional( + Tuple( + elements = [ + Percentage(title = _("Warning at a utilization of"), label = "%"), + Percentage(title = _("Critical at a utilization of"), label = "%")]), + label = _("Alert on too high CPU utilization"), + help = _("The CPU utilization sums up the percentages of CPU time that is used " + "for user processes and kernel routines over all available cores within " + "the last check interval. The possible range is from 0% to 100%")), + None, None)) + +checkgroups.append(( + subgroup_cpumem, + "cpu_iowait", _("CPU utilization (disk wait)"), Optional( Tuple(