[checkmk-commits] Check_MK Git: check_mk: FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal

Module: check_mk Branch: master Commit: 86a48219ad32d135dd742ef4a55f250b8661eb77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86a48219ad32d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 09:44:26 2011 +0100 FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal --- ChangeLog | 1 + checks/ucd_cpu_load | 3 ++- checks/ucd_cpu_util | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c09c03..fe00c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * FIX: df: fix status in case of critical trend and warning used * FIX: df: fix display of trend warn/crit in PNP-graph * FIX: cmctc: fix inventory in case of incomplete entries + * FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * cisco_locif: The check has been removed. Please switch to if/if64 diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load index 153a71b..f1fa478 100644 --- a/checks/ucd_cpu_load +++ b/checks/ucd_cpu_load @@ -51,4 +51,5 @@ snmp_info['ucd_cpu_load'] = ( ".1.3.6.1.4.1.2021.10.1", [ 6 ] ) # of the info area for scanning is not a good idea. It will slow down # scans for *all* hosts. snmp_scan_functions['ucd_cpu_load'] = \ - lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() + 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") diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 02cfd4a..9cca8a5 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -90,4 +90,5 @@ snmp_info['ucd_cpu_util'] = ( ".1.3.6.1.4.1.2021.11", [ 50, 51, 52, 53, 54, 55, # of the info area for scanning is not a good idea. It will slow down # scans for *all* hosts. snmp_scan_functions['ucd_cpu_util'] = \ - lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() + 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")