[checkmk-commits] Check_MK Git: check_mk: #1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002)

Module: check_mk Branch: master Commit: f61e730072c4703438e5264e33ab39902b345e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61e730072c470… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 11:56:12 2014 +0100 #1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) --- .werks/1685 | 9 +++++++++ ChangeLog | 1 + checks/enterasys_cpu_util | 3 ++- checks/enterasys_fans | 3 ++- checks/enterasys_powersupply | 3 ++- checks/enterasys_temp | 3 ++- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/1685 b/.werks/1685 new file mode 100644 index 0000000..5483ca3 --- /dev/null +++ b/.werks/1685 @@ -0,0 +1,9 @@ +Title: enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417776942 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 72c5ca9..3a9e4ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 1599 check_mk_agent.aix: Simple run_cached Feature for plugins... * 1699 Windows agent: new option "file" for writing output into a file... * 1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices + * 1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util index e541e2e..f0d9967 100644 --- a/checks/enterasys_cpu_util +++ b/checks/enterasys_cpu_util @@ -43,7 +43,8 @@ check_info["enterasys_cpu_util"] = { "inventory_function" : inventory_enterasys_cpu_util, "service_description" : "CPU util %s", "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.49.1.1.1.1", [ OID_END, 3 ]), #util in last 1min - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), "has_perfdata" : True, "group" : "cpu_utilization_multiitem", "includes" : [ "cpu_util.include" ], diff --git a/checks/enterasys_fans b/checks/enterasys_fans index 55cbae3..4dc8c6f 100644 --- a/checks/enterasys_fans +++ b/checks/enterasys_fans @@ -49,6 +49,7 @@ check_info["enterasys_fans"] = { "inventory_function" : inventory_enterasys_fans, "service_description" : "FAN %s", "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.3.1.1", [ OID_END, 2 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), } diff --git a/checks/enterasys_powersupply b/checks/enterasys_powersupply index 90d7712..732723e 100644 --- a/checks/enterasys_powersupply +++ b/checks/enterasys_powersupply @@ -64,6 +64,7 @@ check_info["enterasys_powersupply"] = { "inventory_function" : inventory_enterasys_powersupply, "service_description" : "PSU %s", "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.2.1.1", [ OID_END, 2, 3, 4 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), } diff --git a/checks/enterasys_temp b/checks/enterasys_temp index 02186d0..17b2a1d 100644 --- a/checks/enterasys_temp +++ b/checks/enterasys_temp @@ -48,7 +48,8 @@ check_info["enterasys_temp"] = { "service_description" : "Temperature", "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.4.1.52.4.1.1.8.1", [ 1 ]), # chEnvAmbientTemp - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), "group" : "hw_single_temperature", "includes" : [ "temperature.include" ], }