diff --git a/dsmon.sh b/dsmon.sh index 1981bdc..3de7194 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -175,43 +175,35 @@ CHECK(){ # echo if [ "${1}" != "report" ]; then - c=0; cw=20; spcA='' - spc1=`expr ${cw} - 7` - until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done - c=0; cw=10; spcB='' - spc2=`expr ${cw} - 4` - until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done - c=0; cw=10; spcC='' - spc3=`expr ${cw} - 5` - until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done - c=0; cw=16; spcD='' - spc4=`expr ${cw} - 3` - until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done - echo -e "${idsST[Reset]}${idsCL[White]} DRIVE${spcA} FREE GB${spcB}FREE %${spcC}TOTAL GB${spcD}WARN % / CRIT %${idsCL[Default]}" + # c=0; cw=20; spcA='' + # spc1=`expr ${cw} - 7` + # until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done + # c=0; cw=10; spcB='' + # spc2=`expr ${cw} - 4` + # until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done + # c=0; cw=10; spcC='' + # spc3=`expr ${cw} - 5` + # until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done + # c=0; cw=16; spcD='' + # spc4=`expr ${cw} - 3` + # until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done + # echo -e "${idsST[Reset]}${idsCL[White]} DRIVE${spcA} FREE GB${spcB}FREE %${spcC}TOTAL GB${spcD}WARN % / CRIT %${idsCL[Default]}" + + printf "%-20s %-20s %-10s %-10s %-16s" "DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %" fi for DRIVE in "${DRIVES[@]}"; do [ "${host_limits_tmp[$DRIVE]}" = "" ] && host_limits_tmp[$DRIVE]=81 - - WARNING_LEVEL=$(printf "%0.2f" $(jq -n 100-${host_limits_tmp[$DRIVE]})) CRITICAL_LEVEL=$(printf "%0.2f" $(jq -n $WARNING_LEVEL-$WARNING_LEVEL/2)) if [ "${1}" != "report" ]; then - c=0; cw=20; spcA='' - spc1=`expr ${cw} - ${#DRIVEINFO_SHORTNAME[$DRIVE]}` - until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done - c=0; cw=10; spcB='' - spc2=`expr ${cw} - ${#DRIVEINFO_FREE[$DRIVE]}` - until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done - c=0; cw=10; spcC='' - spc3=`expr ${cw} - ${#DRIVEINFO_FREEPER[$DRIVE]}` - until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done - c=0; cw=16; spcD='' - spc4=`expr ${cw} - ${#DRIVEINFO_TOT[$DRIVE]}` - until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done + c=0; cw=20; spcA=''; spc1=`expr ${cw} - ${#DRIVEINFO_SHORTNAME[$DRIVE]}`; until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done + c=0; cw=10; spcB=''; spc2=`expr ${cw} - ${#DRIVEINFO_FREE[$DRIVE]}`; until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done + c=0; cw=10; spcC=''; spc3=`expr ${cw} - ${#DRIVEINFO_FREEPER[$DRIVE]}`; until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done + c=0; cw=16; spcD=''; spc4=`expr ${cw} - ${#DRIVEINFO_TOT[$DRIVE]}`; until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done fi if (( $(bc <<<"${DRIVEINFO_FREEPER[$DRIVE]} <= ${CRITICAL_LEVEL}") )); then