From 94c73ef73d4f66979ff0549c7f5e1e14774692a9 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 26 Apr 2023 20:56:15 -0500 Subject: [PATCH] Update dsmon.sh --- dsmon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsmon.sh b/dsmon.sh index 49aef7d..d3df060 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]}" - pf="%-20s %10s %10s %16s %30s\n" + pf="%-20s %10s %10s %12s %50s\n" printf "${pf}" "${idsCLf[White]}DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %${idsCLf[Default]}" fi @@ -230,7 +230,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]}" - pf="%-20s %10s %10s %16s %30s\n" + [ "${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