Changes of Revision 3
[-] | Changed | nagios-plugins-disks.changes |
x 1
2 ------------------------------------------------------------------- 3 +Wed Dec 5 08:48:13 UTC 2012 - cs@linux-administrator.com 4 + 5 +- version 0.3 6 + * add vzfs to filesystem type list 7 + * better error handling 8 + 9 +------------------------------------------------------------------- 10 Tue Oct 30 12:51:22 UTC 2012 - cs@linux-administrator.com 11 12 - version 0.2 13 |
||
[-] | Changed | nagios-plugins-disks.spec ^ |
8 1
2 Name: nagios-plugins-disks 3 -Version: 0.2 4 +Version: 0.3 5 Release: 1 6 Url: http://www.linux-administrator.com 7 Group: System/Monitoring 8 |
||
[+] | Changed | check_disks ^ |
@@ -4,12 +4,21 @@ rm -rf ${CHECK_MULTI_CMD_FILE} -for a in `grep -E '(xfs|ext2|ext3|ext4|btrfs|reiserfs|vfat|tmpfs)' /proc/mounts | awk '{print $1}' | grep ^/` ; do +for a in `grep -E '(xfs|ext2|ext3|ext4|btrfs|reiserfs|vfat|tmpfs|vzfs)' /proc/mounts | awk '{print $1}' | grep ^/` ; do echo "command[check_disk_${CNT}]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p ${a}" >> ${CHECK_MULTI_CMD_FILE} CNT=`expr ${CNT} + 1` done if [ -x /usr/lib/nagios/plugins/check_multi ] ; then - /usr/lib/nagios/plugins/check_multi -f ${CHECK_MULTI_CMD_FILE} -s dont_be_paranoid=1 + if [ -f ${CHECK_MULTI_CMD_FILE} ] ; then + /usr/lib/nagios/plugins/check_multi -f ${CHECK_MULTI_CMD_FILE} -s dont_be_paranoid=1 + else + if [ -x /usr/lib/nagios/plugins/check_disk ] ; then + /usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p / + else + echo "Couldn't find any valid filesystem to check and i'm unable to execute check_disk plugin" + exit 2 + fi + fi else echo "Plugin: /usr/lib/nagios/plugins/check_multi not executable" exit 2 |