Changes of Revision 6
| [-] | Changed | nagios-plugins-disks.changes |
|
x 1 2 -------------------------------------------------------------------3 +Fri May 9 14:12:12 UTC 2014 - cs@linux-administrator.com4 +5 +- version 0.66 + * follow links of devices (needed to get real logical volume path7 + * allow to define warn/crit in file for each device in 8 + /etc/nagios/check_disks/ directory.9 + Create a file with format <warn>%:<crit>% called like the device10 + name, substitute / with _ in filename11 + e.g. _dev_mapper_vg--data-root12 +13 +-------------------------------------------------------------------14 Wed Mar 27 08:48:57 UTC 2013 - cs@linux-administrator.com15 16 - version 0.517 |
||
| [-] | Changed | nagios-plugins-disks.spec ^ |
|
8 1 2 Name: nagios-plugins-disks3 -Version: 0.54 +Version: 0.65 Release: 16 Url: http://www.linux-administrator.com7 Group: System/Monitoring8 |
||
| [+] | Changed | check_disks ^ |
| @@ -5,21 +5,37 @@ rm -rf ${CHECK_MULTI_CMD_FILE} for a in `grep -E '(xfs|ext2|ext3|ext4|btrfs|reiserfs|vfat|tmpfs|vzfs)' /proc/mounts | awk '{print $1}' | grep ^/ | grep -v -E '(^/vz/template:)' | sort -u` ; do - echo "command[check_disk_${CNT}]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p ${a}" >> ${CHECK_MULTI_CMD_FILE} + a=`readlink -e ${a}` + if [ -d /etc/nagios/check_disks/ ] ; then + b=`echo ${a} | sed -e s@"/"@"_"@g` + if [ -s /etc/nagios/check_disks/${b} ] ; then + # format is 20%:10% + warn=`cat /etc/nagios/check_disks/${b} | awk -F: '{print $1}'` + crit=`cat /etc/nagios/check_disks/${b} | awk -F: '{print $2}'` + if [ -z "${warn}" ] || [ -z "${crit}" ] ; then + warn="20%" + crit="10%" + fi + else + warn="20%" + crit="10%" + fi + fi + echo "command[check_disk_${CNT}]=/usr/lib/nagios/plugins/check_disk -w ${warn} -c ${crit} -p ${a}" >> ${CHECK_MULTI_CMD_FILE} CNT=`expr ${CNT} + 1` done if [ -x /usr/lib/nagios/plugins/check_multi ] ; then - 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 + 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 + echo "Plugin: /usr/lib/nagios/plugins/check_multi not executable" + exit 2 fi | ||