Revision: 7908
http://syscheck.svn.sourceforge.net/syscheck/?rev=7908&view=rev
Author: kinneh
Date: 2010-10-12 12:30:17 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
Closes #16 sc_01_discusage config
Modified Paths:
--------------
trunk/syscheck/config/01.conf
trunk/syscheck/lang/01.english
trunk/syscheck/scripts-available/sc_01_diskusage.sh
Modified: trunk/syscheck/config/01.conf
===================================================================
--- trunk/syscheck/config/01.conf 2010-10-07 08:52:11 UTC (rev 7907)
+++ trunk/syscheck/config/01.conf 2010-10-12 12:30:17 UTC (rev 7908)
@@ -1,2 +1,12 @@
# config for sc_01_diskusage.sh
-DU_PERCENT=95
+
+FILESYSTEM[0]=/
+USAGEPERCENT[0]=95
+
+FILESYSTEM[1]=/usr/local/certificate-services
+USAGEPERCENT[1]=90
+
+FILESYSTEM[2]=/backup
+USAGEPERCENT[2]=80
+
+
Modified: trunk/syscheck/lang/01.english
===================================================================
--- trunk/syscheck/lang/01.english 2010-10-07 08:52:11 UTC (rev 7907)
+++ trunk/syscheck/lang/01.english 2010-10-12 12:30:17 UTC (rev 7908)
@@ -3,3 +3,5 @@
DU_HELP_1="No action is needed"
DU_DESCR_2="Diskusage exceeded (%s is %s percent used: Limit is %s percent)"
DU_HELP_2="The usage is more than the limit, if the disk fills up thing will start to break, make some free space and maybe restart the machine"
+DU_DESCR_3="Diskusage problems (%s)"
+DU_HELP_3="Manually check config and also try df -Ph /path"
Modified: trunk/syscheck/scripts-available/sc_01_diskusage.sh
===================================================================
--- trunk/syscheck/scripts-available/sc_01_diskusage.sh 2010-10-07 08:52:11 UTC (rev 7907)
+++ trunk/syscheck/scripts-available/sc_01_diskusage.sh 2010-10-12 12:30:17 UTC (rev 7908)
@@ -15,9 +15,11 @@
ERRNO_1="${SCRIPTID}01"
ERRNO_2="${SCRIPTID}02"
+ERRNO_3="${SCRIPTID}03"
DESCR_1="${DU_DESCR_1}"
DESCR_2="${DU_DESCR_2}"
+DESCR_3="${DU_DESCR_3}"
### local conf ###
@@ -36,14 +38,23 @@
diskusage () {
FILESYSTEM=$1
LIMIT=$2
- PERCENT=`df -Ph $FILESYSTEM | grep -v Filesystem | awk '{print $5}' | sed 's/%//'`
+ DFPH=`df -Ph $FILESYSTEM 2>&1`
- if [ $PERCENT -gt $LIMIT ] ; then
- printlogmess $ERROR $ERRNO_2 "$DESCR_2" "$FILESYSTEM" "$PERCENT" "$LIMIT"
+ if [ $? -ne 0 ] ; then
+ printlogmess $ERROR $ERRNO_3 "$DESCR_3" "$FILESYSTEM" "$DFPH"
else
- printlogmess $INFO $ERRNO_1 "$DESCR_1" "$FILESYSTEM" "$PERCENT" "$LIMIT"
+
+ PERCENT=`df -Ph $FILESYSTEM | grep -v Filesystem| awk '{print $5}' | sed 's/%//'`
+ if [ $PERCENT -gt $LIMIT ] ; then
+ printlogmess $ERROR $ERRNO_2 "$DESCR_2" "$FILESYSTEM" "$PERCENT" "$LIMIT"
+ else
+ printlogmess $INFO $ERRNO_1 "$DESCR_1" "$FILESYSTEM" "$PERCENT" "$LIMIT"
+ fi
fi
}
-diskusage / $DU_PERCENT
+for (( i = 0 ; i < ${#FILESYSTEM[@]} ; i++ )) ; do
+ diskusage ${FILESYSTEM[$i]} ${USAGEPERCENT[$i]}
+done
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|