From c43d09b470315717771f6edc8a2561c56ee2e33b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 26 Apr 2023 20:05:57 -0500 Subject: [PATCH] Update dsmon.sh --- dsmon.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dsmon.sh b/dsmon.sh index 4b81a3b..38a4be3 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -189,7 +189,7 @@ CHECK(){ # 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 "%-12s %-10s %-10s %-16s\n %-16s" "DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %" + printf "%-20s %-10s %-10s %-16s %-20s\n" "DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %" fi for DRIVE in "${DRIVES[@]}"; do @@ -229,6 +229,7 @@ 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]}" + printf "%-20s %-10s %-10s %-16s %-20s\n" "${DRIVEINFO_SHORTNAME[$DRIVE]}" "${DRIVEINFO_FREE[$DRIVE]} GB" "${DRIVEINFO_FREEPER[$DRIVE]}%" "${DRIVEINFO_TOT[$DRIVE]} GB" "( ${D_WARNING_LEVEL}% / ${D_CRITICAL_LEVEL}% )" 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} SENDNOTICE "Free Space ${fs_status}: '${host_name[$hostid]}'" "${host_name[$hostid]} - (${host_ip[$hostid]})\n\n${DRIVE} : ${DRIVEINFO_FREE[$DRIVE]}GB out of ${DRIVEINFO_TOT[$DRIVE]}GB Free (${DRIVEINFO_FREEPER[$DRIVE]}%)" ${fs_priority}