[checkmk-commits] Check_MK Git: check_mk: dell_powerconnect_cpu: renamed service from CPU to "CPU utilization"

Module: check_mk Branch: master Commit: fad7c5d4136c09623106a86534fe961a3ea26bbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad7c5d4136c09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:31:29 2011 +0100 dell_powerconnect_cpu: renamed service from CPU to "CPU utilization" --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dadd28..4957e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.1.13i2 Checks & Agents: * linux agent - ipmi: Creating directory of cache file if not exists + * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in + order to be consistent with other checks 1.1.13i1: Multisite: diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index b7787dc..124c138 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -64,17 +64,17 @@ def check_dell_powerconnect_cpu(item, params, info): status = 1 output = ' (Above %d%%)' % params[0] - return (status, '%s - CPU load is %d%% %s' % + return (status, '%s - CPU utilization is %d%% %s' % (nagios_state_names[status], cpu_load, output), [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100), ('loadavg 60s', '%d%%' % int(oneminuteperc), params[0], params[1], 0, 100), ('loadavg 5m', '%d%%' % int(fiveminutesperc), params[0], params[1], 0, 100), ]) - return (3, "UNKNOWN - Invalid information in snmp data") + return (3, "UNKNOWN - Invalid information in SNMP data") # Auto-detection of CPU elements. -check_info['dell_powerconnect_cpu'] = (check_dell_powerconnect_cpu, "CPU", 1, inventory_dell_powerconnect_cpu) +check_info['dell_powerconnect_cpu'] = (check_dell_powerconnect_cpu, "CPU utilization", 1, inventory_dell_powerconnect_cpu) snmp_info['dell_powerconnect_cpu'] = ( ".1.3.6.1.4.1.89.1", [ "6", "7", "8", "9" ] ) snmp_scan_functions['dell_powerconnect_cpu'] = \ lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0")