[checkmk-commits] Check_MK Git: check_mk: FIX check_mk_agent.solaris: fixed problem with section <<<zfsget>>>

Module: check_mk Branch: master Commit: e92db8e1bb5629cd55268a70b734e09a0f1f6f62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e92db8e1bb5629… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Fri Apr 4 16:03:21 2014 +0200 FIX check_mk_agent.solaris: fixed problem with section <<<zfsget>>> The check zfsget expected more fields in the section zfsget than that the check_mk_agent.solaris delivered - the fstype was missing This caused an exception in the zfsget check. The problem has been fixed in the check itself, so it can handle both agent output versions. Now its also fixed in the agent output. --- .werks/786 | 15 +++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/786 b/.werks/786 new file mode 100644 index 0000000..f8a89d8 --- /dev/null +++ b/.werks/786 @@ -0,0 +1,15 @@ +Title: check_mk_agent.solaris: fixed problem with section <<<zfsget>>> +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1396620030 + +The check zfsget expected more fields in the section zfsget than +that the check_mk_agent.solaris delivered - the fstype was missing +This caused an exception in the zfsget check. + +The problem has been fixed in the check itself, so it can handle +both agent output versions. Now its also fixed in the agent output. + diff --git a/ChangeLog b/ChangeLog index 26181a9..81e4b5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 0150 printer_suply: New option to upturn toner levels... * 0801 ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... + * 0786 FIX: check_mk_agent.solaris: fixed problem with section <<<zfsget>>>... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index e2d7b80..435ded5 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -126,7 +126,7 @@ then echo '<<<zfsget>>>' zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' - df -l -k -F zfs 2>/dev/null | sed 1d + df -l -k -T -F zfs 2>/dev/null | sed 1d fi