Module: check_mk Branch: master Commit: 960889291afa1954e9fb3e6c9d1e17d33d6e093e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=960889291afa19… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 21 16:42:04 2015 +0200 #2286 hp_procurve_cpu, hp_procurve_mem, hp_procurve_sensors: now can monitor HP 2920 Switch Stack --- .werks/2286 | 9 +++++++++ ChangeLog | 1 + checks/hp_procurve_cpu | 3 ++- checks/hp_procurve_mem | 3 ++- checks/hp_procurve_sensors | 3 ++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/2286 b/.werks/2286 new file mode 100644 index 0000000..8b0fa25 --- /dev/null +++ b/.werks/2286 @@ -0,0 +1,9 @@ +Title: hp_procurve_cpu, hp_procurve_mem, hp_procurve_sensors: now can monitor HP 2920 Switch Stack +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1437488829 +Class: feature + +Now the checks hp_procurce_cpu, hp_procurve_mem and hp_procurve_sensors monitor HP 2920 Switches. diff --git a/ChangeLog b/ChangeLog index 98b6d9f..607b33c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 2451 wut_webtherm.humidity, wut_webtherm.pressure: Two new checks for humidity and air pressure sensors for WuT devices... NOTE: Please refer to the migration notes! * 2472 MSSQL Agent Plugin: Can now be configured to auth as database user... + * 2286 hp_procurve_cpu, hp_procurve_mem, hp_procurve_sensors: now can monitor HP 2920 Switch Stack... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/hp_procurve_cpu b/checks/hp_procurve_cpu index 1b98af6..22668c8 100644 --- a/checks/hp_procurve_cpu +++ b/checks/hp_procurve_cpu @@ -61,5 +61,6 @@ check_info["hp_procurve_cpu"] = { 'group': "cpu_utilization", 'snmp_info': ('.1.3.6.1.4.1.11.2.14.11.5.1.9.6', ['1']), 'snmp_scan_function': \ - lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0"), + lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0") \ + or ".11.2.3.7.8" in oid(".1.3.6.1.2.1.1.2.0"), } diff --git a/checks/hp_procurve_mem b/checks/hp_procurve_mem index 27bd55d..2acebdc 100644 --- a/checks/hp_procurve_mem +++ b/checks/hp_procurve_mem @@ -53,6 +53,7 @@ check_info["hp_procurve_mem"] = { 'default_levels_variable' : 'hp_procurve_mem_default_levels', 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.11.2.14.11.5.1.1.2.1.1.1', ['5', '7']), - 'snmp_scan_function' : lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_scan_function' : lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0") \ + or ".11.2.3.7.8" in oid(".1.3.6.1.2.1.1.2.0"), 'includes' : [ "memory.include" ], } diff --git a/checks/hp_procurve_sensors b/checks/hp_procurve_sensors index e4a0c55..8ec7183 100644 --- a/checks/hp_procurve_sensors +++ b/checks/hp_procurve_sensors @@ -105,5 +105,6 @@ check_info["hp_procurve_sensors"] = { 'service_description': 'Sensor %s', 'snmp_info': ('.1.3.6.1.4.1.11.2.14.11.1.2.6.1', ['1', '2', '4', '7']), 'snmp_scan_function': \ - lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0"), + lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0") \ + or ".11.2.3.7.8" in oid(".1.3.6.1.2.1.1.2.0"), }