Module: check_mk Branch: master Commit: c4b66505c84964c62c73efa4d32c8b6945662f45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b66505c84964… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 11:46:16 2014 +0100 #1591 FIX netapp_volumes: The state mixed_raid_type is now treated as non-critical state --- .werks/1591 | 9 ++++ ChangeLog | 1 + checks/netapp_volumes | 113 ++++++++++++++++++++++++------------------------- 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/.werks/1591 b/.werks/1591 new file mode 100644 index 0000000..ca4a8f5 --- /dev/null +++ b/.werks/1591 @@ -0,0 +1,9 @@ +Title: netapp_volumes: The state mixed_raid_type is now treated as non-critical state +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417603533 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 567efd6..a69153e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... * 1590 FIX: printer_supply_ricoh: Fixed broken check + * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/netapp_volumes b/checks/netapp_volumes index 1918cc1..05e5fe4 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -24,62 +24,60 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - -#.1.3.6.1.4.1.789.1.5.8.1.1.1 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.1.2 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.1.3 = INTEGER: 3 -#.1.3.6.1.4.1.789.1.5.8.1.2.1 = STRING: "vol0" -#.1.3.6.1.4.1.789.1.5.8.1.2.2 = STRING: "RvRBackup" -#.1.3.6.1.4.1.789.1.5.8.1.2.3 = STRING: "RundV" -#.1.3.6.1.4.1.789.1.5.8.1.3.1 = STRING: "67155442" -#.1.3.6.1.4.1.789.1.5.8.1.3.2 = STRING: "2600515058" -#.1.3.6.1.4.1.789.1.5.8.1.3.3 = STRING: "788575730" -#.1.3.6.1.4.1.789.1.5.8.1.4.1 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.4.2 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.4.3 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.5.1 = STRING: "online" -#.1.3.6.1.4.1.789.1.5.8.1.5.2 = STRING: "online" -#.1.3.6.1.4.1.789.1.5.8.1.5.3 = STRING: "online" -#.1.3.6.1.4.1.789.1.5.8.1.6.1 = STRING: "raid_dp" -#.1.3.6.1.4.1.789.1.5.8.1.6.2 = STRING: "raid_dp" -#.1.3.6.1.4.1.789.1.5.8.1.6.3 = STRING: "raid_dp" -#.1.3.6.1.4.1.789.1.5.8.1.7.1 = STRING: "root, diskroot, nosnap=off, -# nosnapdir=off, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, -# nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, -# convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, -# svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, -# no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" -#.1.3.6.1.4.1.789.1.5.8.1.7.2 = STRING: "nosnap=off, nosnapdir=off, -# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, -# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, -# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, -# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, -# fractional_reserve=100, extent=off, try_first=volume_grow" -#.1.3.6.1.4.1.789.1.5.8.1.7.3 = STRING: "nosnap=on, nosnapdir=on, -# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, -# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, -# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, -# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, -# fractional_reserve=100, extent=off, try_first=volume_grow" -#.1.3.6.1.4.1.789.1.5.8.1.8.1 = STRING: "1ddc9920-496e-11df-aae1-00a09800c998" -#.1.3.6.1.4.1.789.1.5.8.1.8.2 = STRING: "62ac1040-5a8d-11df-83fd-00a09800c998" -#.1.3.6.1.4.1.789.1.5.8.1.8.3 = STRING: "4edc66e0-d6a3-11df-8724-00a09800c998" -#.1.3.6.1.4.1.789.1.5.8.1.9.1 = STRING: "aggr0" -#.1.3.6.1.4.1.789.1.5.8.1.9.2 = STRING: "aggr0" -#.1.3.6.1.4.1.789.1.5.8.1.9.3 = STRING: "aggr0" -#.1.3.6.1.4.1.789.1.5.8.1.10.1 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.10.2 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.10.3 = INTEGER: 2 -#.1.3.6.1.4.1.789.1.5.8.1.11.1 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.11.2 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.11.3 = INTEGER: 1 -#.1.3.6.1.4.1.789.1.5.8.1.12.1 = "" -#.1.3.6.1.4.1.789.1.5.8.1.12.2 = "" -#.1.3.6.1.4.1.789.1.5.8.1.12.3 = "" -#.1.3.6.1.4.1.789.1.5.8.1.13.1 = "" -#.1.3.6.1.4.1.789.1.5.8.1.13.2 = "" -#.1.3.6.1.4.1.789.1.5.8.1.13.3 = "" +# .1.3.6.1.4.1.789.1.5.8.1.1.1 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.1.2 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.1.3 = INTEGER: 3 +# .1.3.6.1.4.1.789.1.5.8.1.2.1 = STRING: "vol0" +# .1.3.6.1.4.1.789.1.5.8.1.2.2 = STRING: "RvRBackup" +# .1.3.6.1.4.1.789.1.5.8.1.2.3 = STRING: "RundV" +# .1.3.6.1.4.1.789.1.5.8.1.3.1 = STRING: "67155442" +# .1.3.6.1.4.1.789.1.5.8.1.3.2 = STRING: "2600515058" +# .1.3.6.1.4.1.789.1.5.8.1.3.3 = STRING: "788575730" +# .1.3.6.1.4.1.789.1.5.8.1.4.1 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.4.2 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.4.3 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.5.1 = STRING: "online" +# .1.3.6.1.4.1.789.1.5.8.1.5.2 = STRING: "online" +# .1.3.6.1.4.1.789.1.5.8.1.5.3 = STRING: "online" +# .1.3.6.1.4.1.789.1.5.8.1.6.1 = STRING: "raid_dp" +# .1.3.6.1.4.1.789.1.5.8.1.6.2 = STRING: "raid_dp" +# .1.3.6.1.4.1.789.1.5.8.1.6.3 = STRING: "raid_dp" +# .1.3.6.1.4.1.789.1.5.8.1.7.1 = STRING: "root, diskroot, nosnap=off, +# nosnapdir=off, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, +# nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, +# convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, +# svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, +# no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" +# .1.3.6.1.4.1.789.1.5.8.1.7.2 = STRING: "nosnap=off, nosnapdir=off, +# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, +# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, +# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, +# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, +# fractional_reserve=100, extent=off, try_first=volume_grow" +# .1.3.6.1.4.1.789.1.5.8.1.7.3 = STRING: "nosnap=on, nosnapdir=on, +# minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, +# snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, +# maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, +# svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, +# fractional_reserve=100, extent=off, try_first=volume_grow" +# .1.3.6.1.4.1.789.1.5.8.1.8.1 = STRING: "1ddc9920-496e-11df-aae1-00a09800c998" +# .1.3.6.1.4.1.789.1.5.8.1.8.2 = STRING: "62ac1040-5a8d-11df-83fd-00a09800c998" +# .1.3.6.1.4.1.789.1.5.8.1.8.3 = STRING: "4edc66e0-d6a3-11df-8724-00a09800c998" +# .1.3.6.1.4.1.789.1.5.8.1.9.1 = STRING: "aggr0" +# .1.3.6.1.4.1.789.1.5.8.1.9.2 = STRING: "aggr0" +# .1.3.6.1.4.1.789.1.5.8.1.9.3 = STRING: "aggr0" +# .1.3.6.1.4.1.789.1.5.8.1.10.1 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.10.2 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.10.3 = INTEGER: 2 +# .1.3.6.1.4.1.789.1.5.8.1.11.1 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.11.2 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.11.3 = INTEGER: 1 +# .1.3.6.1.4.1.789.1.5.8.1.12.1 = "" +# .1.3.6.1.4.1.789.1.5.8.1.12.2 = "" +# .1.3.6.1.4.1.789.1.5.8.1.12.3 = "" +# .1.3.6.1.4.1.789.1.5.8.1.13.1 = "" +# .1.3.6.1.4.1.789.1.5.8.1.13.2 = "" +# .1.3.6.1.4.1.789.1.5.8.1.13.3 = "" netapp_volumes_owner = { '1': 'local', @@ -107,7 +105,8 @@ def check_netapp_volumes(item, _not_used, info): if status == 'reconstructing': ret_state = 1 output += '(!)' - elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored', 'raid4' ]: + elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', + 'raid0, mirrored', 'raid4', 'mixed_raid_type' ]: ret_state = 2 output += '(!!)'