diff --git a/dsmon.sh b/dsmon.sh index d3df060..4bc7280 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -175,22 +175,22 @@ 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]}" - pf="%-20s %10s %10s %12s %50s\n" - printf "${pf}" "${idsCLf[White]}DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %${idsCLf[Default]}" + # pf="%-20s %10s %10s %12s %50s\n" + # printf "${pf}" "${idsCLf[White]}DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %${idsCLf[Default]}" fi for DRIVE in "${DRIVES[@]}"; do @@ -200,12 +200,12 @@ CHECK(){ 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 - # fi + 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 + fi if (( $(bc <<<"${DRIVEINFO_FREEPER[$DRIVE]} <= ${CRITICAL_LEVEL}") )); then fs_status='CRITICAL' @@ -229,9 +229,9 @@ CHECK(){ D_WARNING_LEVEL=$(printf "%0.2f" $(jq -n 100-${WARNING_LEVEL})) D_CRITICAL_LEVEL=$(printf "%0.2f" $(jq -n 100-${CRITICAL_LEVEL})) - # [ "${1}" != "report" ] && echo -e "${idsCL[Cyan]} ${DRIVEINFO_SHORTNAME[$DRIVE]}${spcA}${idsCL[$fs_status_color]}${DRIVEINFO_FREE[$DRIVE]} GB${spcB}${DRIVEINFO_FREEPER[$DRIVE]}%${spcC}${DRIVEINFO_TOT[$DRIVE]} GB${idsST[Reset]}${spcD}${idsCL[Cyan]}( ${idsCL[Yellow]}${D_WARNING_LEVEL}%${idsCL[Cyan]} / ${idsCL[RedBold]}${D_CRITICAL_LEVEL}%${idsST[Reset]}${idsCL[Cyan]} )${idsCL[Default]}" + [ "${1}" != "report" ] && echo -e "${idsCL[Cyan]} ${DRIVEINFO_SHORTNAME[$DRIVE]}${spcA}${idsCL[$fs_status_color]}${DRIVEINFO_FREE[$DRIVE]} GB${spcB}${DRIVEINFO_FREEPER[$DRIVE]}%${spcC}${DRIVEINFO_TOT[$DRIVE]} GB${idsST[Reset]}${spcD}${idsCL[Cyan]}( ${idsCL[Yellow]}${D_WARNING_LEVEL}%${idsCL[Cyan]} / ${idsCL[RedBold]}${D_CRITICAL_LEVEL}%${idsST[Reset]}${idsCL[Cyan]} )${idsCL[Default]}" - [ "${1}" != "report" ] && printf "${pf}" "${idsCLf[Cyan]}${DRIVEINFO_SHORTNAME[$DRIVE]}" "${idsCLf[$fs_status_color]}${DRIVEINFO_FREE[$DRIVE]} GB" "${DRIVEINFO_FREEPER[$DRIVE]}%" "${DRIVEINFO_TOT[$DRIVE]} GB" "${idsCLf[Cyan]}(${idsCLf[Default]}${D_WARNING_LEVEL}%${idsCLf[Cyan]}/${idsCLf[Default]}${D_CRITICAL_LEVEL}%${idsCLf[Cyan]})(${idsCLf[Yellow]}${D_WARNING_LEVEL}%${idsCLf[Cyan]}/${idsCLf[Red]}${D_CRITICAL_LEVEL}%${idsCLf[Cyan]})${idsCLf[Default]}" + # [ "${1}" != "report" ] && printf "${pf}" "${idsCLf[Cyan]}${DRIVEINFO_SHORTNAME[$DRIVE]}" "${idsCLf[$fs_status_color]}${DRIVEINFO_FREE[$DRIVE]} GB" "${DRIVEINFO_FREEPER[$DRIVE]}%" "${DRIVEINFO_TOT[$DRIVE]} GB" "${idsCLf[Cyan]}(${idsCLf[Default]}${D_WARNING_LEVEL}%${idsCLf[Cyan]}/${idsCLf[Default]}${D_CRITICAL_LEVEL}%${idsCLf[Cyan]})(${idsCLf[Yellow]}${D_WARNING_LEVEL}%${idsCLf[Cyan]}/${idsCLf[Red]}${D_CRITICAL_LEVEL}%${idsCLf[Cyan]})${idsCLf[Default]}" if [ "${fs_status}" != "Normal" ] && [ "${1}" = "report" ]; then # echo -e "${host_name[$hostid]} - (${host_ip[$hostid]})\n\n${DRIVE} : ${DRIVEINFO_FREE[$DRIVE]}GB out of ${DRIVEINFO_TOT[$DRIVE]}GB Free (${DRIVEINFO_FREEPER[$DRIVE]}%)\n\n$(date)" | mail -s "Free Space ${fs_status}: '${host_name[$hostid]}'" ${ALERT_EMAIL}