Module: check_mk Branch: master Commit: c307249f119d45c651634333410c3178480d1280 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c307249f119d45… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 15 13:55:28 2014 +0200 brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices --- .werks/808 | 8 ++++++++ ChangeLog | 1 + checkman/brocade_mlx.module_status | 6 +++--- checkman/brocade_mlx_fan | 6 +++--- checkman/brocade_mlx_power | 6 +++--- checkman/brocade_mlx_temp | 4 ++-- checks/brocade_mlx_fan | 2 +- checks/brocade_mlx_power | 2 +- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.werks/808 b/.werks/808 new file mode 100644 index 0000000..7373269 --- /dev/null +++ b/.werks/808 @@ -0,0 +1,8 @@ +Title: brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1397562878 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9a7f3bd..8dfeb5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0805 ibm_svc_enclosure: New Check for Enclosures, Canisters and PSUs in IBM SVC / Storwize V3700 / V7000 devices * 0806 ibm_svc_enclosurestats.temp: New Check for temperature in enclosures of IBM SVC / Storwize V3700 / V7000 devices * 0807 ibm_svc_enclosurestats.power: New check for power consumption of enclosures of IBM SVC / Storwize V3700 / V7000 devices + * 0808 brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/brocade_mlx.module_status b/checkman/brocade_mlx.module_status index c27da0a..985e4c8 100644 --- a/checkman/brocade_mlx.module_status +++ b/checkman/brocade_mlx.module_status @@ -1,11 +1,11 @@ -title: Brocade NetIron MLX devices: Module Overall Status +title: Brocade NetIron MLX / ADX / FGS / ICX devices: Module Overall Status agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the overall status of modules in Brocade NetIron MLX - switching / routing devices. + Checks the overall status of modules in Brocade NetIron MLX / ADX / FGS / + ICX switching / routing devices. Returns {OK} on status 10 (running) and 11 (Blocked for full height card). Returns {WARN} on status 0 (empty), 2 (going down) and 9 (coming up). diff --git a/checkman/brocade_mlx_fan b/checkman/brocade_mlx_fan index a933c9c..a0a48b9 100644 --- a/checkman/brocade_mlx_fan +++ b/checkman/brocade_mlx_fan @@ -1,11 +1,11 @@ -title: Brocade NetIron MLX devices: Fans +title: Brocade NetIron MLX / ADX / FGS / ICX devices: Fans agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the operational status of fans in Brocade NetIron MLX - switching / routing devices. + Checks the operational status of fans in Brocade NetIron MLX / ADX / + FGS / ICX switching / routing devices. Returns {OK} on status 2 (normal), {CRIT} on status 3 (failure) and {UNKN} on every other status. diff --git a/checkman/brocade_mlx_power b/checkman/brocade_mlx_power index 9b8d1b3..f392d24 100644 --- a/checkman/brocade_mlx_power +++ b/checkman/brocade_mlx_power @@ -1,11 +1,11 @@ -title: Brocade NetIron MLX devices: Power Supplies +title: Brocade NetIron MLX / ADX / FGS / ICX devices: Power Supplies agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the operational status of power supplies on Brocade NetIron MLX - switching / routing devices. + Checks the operational status of power supplies on Brocade NetIron MLX / ADX + / FGS / ICX switching / routing devices. Returns {OK} on status 2 (normal), {CRIT} on status 3 (failure) and {UNKN} on every other status. diff --git a/checkman/brocade_mlx_temp b/checkman/brocade_mlx_temp index a6cc0e5..505bb33 100644 --- a/checkman/brocade_mlx_temp +++ b/checkman/brocade_mlx_temp @@ -1,10 +1,10 @@ -title: Brocade NetIron MLX devices: Temperature Sensors +title: Brocade NetIron MLX / FGS / ICX devices: Temperature Sensors agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the temperature sensors of one module in Brocade NetIron MLX switching / + Checks the temperature sensors of one module in Brocade NetIron MLX / FGS / ICX switching / routing devices. {WARN} or {CRIT} is returned, if at least one of the temperatures is above given diff --git a/checks/brocade_mlx_fan b/checks/brocade_mlx_fan index bd35d69..28d5ff5 100644 --- a/checks/brocade_mlx_fan +++ b/checks/brocade_mlx_fan @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def brocade_mlx_fan_combine_item(id, descr): - if descr == "": + if descr == "" or "(RPM " in descr: return id else: return "%s %s" % (id, descr) diff --git a/checks/brocade_mlx_power b/checks/brocade_mlx_power index 2e3ab2d..195f424 100644 --- a/checks/brocade_mlx_power +++ b/checks/brocade_mlx_power @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def brocade_mlx_power_combine_item(id, descr): - if descr == "": + if descr == "" or "AC " in descr: return id else: return "%s %s" % (id, descr)