[checkmk-commits] Check_MK Git: check_mk: brocade_mlx: enhancing checks (BR-MLX modules, more OK states)

Module: check_mk Branch: master Commit: e4592af3df3d6e6877efccb3405fca13834a2a3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4592af3df3d6e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jan 7 20:25:32 2014 +0100 brocade_mlx: enhancing checks (BR-MLX modules, more OK states) CPU and Memory Checks now look on BR-MLX modules too Status "Blocked for full height card" is an OK state now --- .werks/321 | 9 +++++++++ ChangeLog | 1 + checkman/brocade_mlx.module_cpu | 4 ++-- checkman/brocade_mlx.module_mem | 4 ++-- checkman/brocade_mlx.module_status | 2 +- checks/brocade_mlx | 10 +++++----- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.werks/321 b/.werks/321 new file mode 100644 index 0000000..e6f13fb --- /dev/null +++ b/.werks/321 @@ -0,0 +1,9 @@ +Title: brocade_mlx: enhancing checks (BR-MLX modules, more OK states) +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1389122496 +Class: feature + +CPU and Memory Checks now look on BR-MLX modules too +Status "Blocked for full height card" is an OK state now diff --git a/ChangeLog b/ChangeLog index 851e048..048d07c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 0318 hitachi_hnas_fan: New check for fans in Hitachi HNAS systems * 0319 hitachi_hnas_psu, hitachi_hnas_psu: New checks for Hitachi HNAS storage systems * 0320 hitachi_hnas_fpga: new check for Hitachi HNAS storage systems + * 0321 brocade_mlx: enhancing checks (BR-MLX modules, more OK states)... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/brocade_mlx.module_cpu b/checkman/brocade_mlx.module_cpu index 0431db2..876f9c3 100644 --- a/checkman/brocade_mlx.module_cpu +++ b/checkman/brocade_mlx.module_cpu @@ -1,10 +1,10 @@ -title: Brocade NetIron MLX devices: NI-MLX Module CPU Utilization +title: Brocade NetIron MLX devices: NI-MLX or BR-MLX Module CPU Utilization agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the Module CPU Utilization of a NI-MLX module in Brocade + Checks the Module CPU Utilization of a NI-MLX or BR-MLX module in Brocade NetIron MLX switching / routing devices. {WARN} or {CRIT} is returned, if the usage in the last 60 sec was above diff --git a/checkman/brocade_mlx.module_mem b/checkman/brocade_mlx.module_mem index 8135d89..e3d3974 100644 --- a/checkman/brocade_mlx.module_mem +++ b/checkman/brocade_mlx.module_mem @@ -1,10 +1,10 @@ -title: Brocade NetIron MLX devices: NI-MLX Module Memory (RAM usage) +title: Brocade NetIron MLX devices: NI-MLX or BR-MLX Module Memory (RAM usage) agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the Module Memory (RAM usage) of a NI-MLX module in Brocade + Checks the Module Memory (RAM usage) of a NI-MLX or BR-MLX module in Brocade NetIron MLX switching / routing devices. {WARN} or {CRIT} is returned, if the usage is above given thresholds. diff --git a/checkman/brocade_mlx.module_status b/checkman/brocade_mlx.module_status index 6109159..c27da0a 100644 --- a/checkman/brocade_mlx.module_status +++ b/checkman/brocade_mlx.module_status @@ -7,7 +7,7 @@ description: Checks the overall status of modules in Brocade NetIron MLX switching / routing devices. - Returns {OK} on status 10 (running). + 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). Returns {CRIT} on status 3 (rejected) and 4 (bad). Returns {UNKN} on every other status. diff --git a/checks/brocade_mlx b/checks/brocade_mlx index cd32dd1..c8eb27d 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -32,7 +32,7 @@ brocade_mlx_states = { 8: (1, "Configured / Stacking"), 9: (1, "In power-up cycle"), 10: (0, "Running"), - 11: (1, "Blocked for full height card"), + 11: (0, "Blocked for full height card"), } brocade_mlx_info = [ @@ -103,8 +103,8 @@ def inventory_brocade_mlx_module_mem(info): inventory = [] for module_id, module_descr, module_state, mem_total, mem_avail in info[0]: # do not inventorize modules reported as empty - # and: monitor memory only on NI-MLX modules - if module_state != "0" and module_descr.startswith("NI-MLX"): + # and: monitor cpu only on NI-MLX and BR-MLX modules + if module_state != "0" and ( module_descr.startswith("NI-MLX") or module_descr.startswith("BR-MLX") ): inventory.append( (brocade_mlx_combine_item(module_id, module_descr), "brocade_mlx_mem_default_levels") ) return inventory @@ -171,8 +171,8 @@ def inventory_brocade_mlx_module_cpu(info): inventory = [] for module_id, module_descr, module_state, mem_total, mem_avail in info[0]: # do not inventorize modules reported as empty - # and: monitor cpu only on NI-MLX modules - if module_state != "0" and module_descr.startswith("NI-MLX"): + # and: monitor cpu only on NI-MLX and BR-MLX modules + if module_state != "0" and ( module_descr.startswith("NI-MLX") or module_descr.startswith("BR-MLX") ): inventory.append( (brocade_mlx_combine_item(module_id, module_descr), "brocade_mlx_cpu_default_levels") ) return inventory