Module: check_mk Branch: master Commit: 05c4bb360438b43603ff3e23a33a28c2bc6f677d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c4bb360438b4… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Apr 29 12:32:12 2014 +0200 FIX oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 --- .werks/608 | 8 ++++++++ ChangeLog | 1 + checks/oracle_asm_diskgroup | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/608 b/.werks/608 new file mode 100644 index 0000000..ad1d9d7 --- /dev/null +++ b/.werks/608 @@ -0,0 +1,8 @@ +Title: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398767431 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 462998b..54cc516 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 0154 FIX: zfsget: Fixed inventory of filesystems * 0155 FIX: mssql_counters: harded check agains odd agent output * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... + * 0608 FIX: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index d2528db..1535795 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -35,12 +35,20 @@ def inventory_oracle_asm_diskgroup(info): def check_oracle_asm_diskgroup(item, params, info): - for state, typ, rebal, sector, block, au, total_mb, \ - free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ - voting_files, name in info: + for line in info: + if len(line) == 13: + state, typ, rebal, sector, block, au, total_mb, \ + free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ + voting_files, name = line + elif len(line) == 12: + state, typ, rebal, sector, block, au, total_mb, \ + free_mb, req_mir_free_mb, usable_file_mb, offline_disks, \ + name = line + else: + name = "" if name.rstrip('/') == item: return df_check_filesystem(g_hostname, item, int(total_mb), - int(free_mb), params) + int(free_mb), params) return (3, "Disk group not found")