[checkmk-commits] Check_MK Git: check_mk: #1609 FIX zpool_status: fix problem when the zpool has a separate log or cache device

Module: check_mk Branch: master Commit: ddf54dabc0a1b529710e245e4489dd5c331292e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf54dabc0a1b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 15:37:57 2014 +0100 #1609 FIX zpool_status: fix problem when the zpool has a separate log or cache device Thanks to Craig Cook for the patch (http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-May/012173.html) --- .werks/1609 | 10 ++++++++++ ChangeLog | 1 + checks/zpool_status | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/.werks/1609 b/.werks/1609 new file mode 100644 index 0000000..57bde9b --- /dev/null +++ b/.werks/1609 @@ -0,0 +1,10 @@ +Title: zpool_status: fix problem when the zpool has a separate log or cache device +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417617431 +Class: fix + +Thanks to Craig Cook for the patch (http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-May/012173.html) + diff --git a/ChangeLog b/ChangeLog index 4d9f8be..f287f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 1563 FIX: Reworked configuration of process monitoring... NOTE: Please refer to the migration notes! * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... + * 1609 FIX: zpool_status: fix problem when the zpool has a separate log or cache device... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/zpool_status b/checks/zpool_status index f84b651..3a4737f 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -120,6 +120,14 @@ def check_zpool_status(_no_item, _no_params, info): start_pool = False continue + if line[0] == "logs": + start_pool = False + continue + + if line[0] == "cache": + start_pool = False + continue + if start_pool == True: if line[1] != "ONLINE": error_pools[line[0]] = tuple(line[1:])