[checkmk-commits] 3300 FIX zfsget: Fixed excluding snapshots from zfsget section

Module: check_mk Branch: master Commit: d90ea94d4ee704a50c88d2e06c2b2383f3469019 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90ea94d4ee704… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Mar 21 11:59:32 2016 +0100 3300 FIX zfsget: Fixed excluding snapshots from zfsget section --- .werks/3300 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3300 b/.werks/3300 new file mode 100644 index 0000000..49c2bda --- /dev/null +++ b/.werks/3300 @@ -0,0 +1,10 @@ +Title: zfsget: Fixed excluding snapshots from zfsget section +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458557924 + + diff --git a/ChangeLog b/ChangeLog index 939c836..2a8f293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 3104 FIX: ipmi: fixed crash when using summarized output with nagios backend * 3298 FIX: winperf_processor.util: Fixed exception when CPU counters were not matched * 3299 FIX: mssql_backup: Fixed exception in case of invalid agent output + * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index a5e65f9..4b5ded9 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -131,7 +131,7 @@ fi # Filesystem usage for ZFS if type zfs > /dev/null 2>&1 ; then echo '<<<zfsget>>>' - zfs get -Hp name,quota,used,avail,mountpoint,type -t filesystem,volume || \ + zfs get -t filesystem,volume -Hp name,quota,used,avail,mountpoint,type || \ zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' df -kP -t zfs | sed 1d