From 681b98931d8308a27b270eb48eb7618f883c1052 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 3 Dec 2023 10:24:57 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index a6837437..cae0effb 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -611,7 +611,6 @@ CHECKPOWER(){ echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" fi echo -e " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}" - echo # echo DIVIDER . lightCyan 75 @@ -631,7 +630,7 @@ CHECKPOWER(){ if [ "${avgdays}" != "" ]; then echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" - echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}" + echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" fi echo -e "${idsCL[Default]}" @@ -726,7 +725,7 @@ CHECKPOWER(){ gochk=1 fi if [ ${gochk} -eq 1 ]; then - [ "${avgdays}" != "" ] && echo -en "${idsCL[Yellow]}Pulling data and calculating averages for '${SENSOR}' ... " || echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... " + echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... " # HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //') # if [ "${HOST_WATTS}" = "" ]; then @@ -756,18 +755,15 @@ CHECKPOWER(){ HOST_WATTS_disp="${idsCL[LightRed]}Could not pull data" fi # fi + MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}" + echo -en "\r\033[K${MSG}" + if [ "${avgdays}" != "" ] && [ "${HOST_WATTS}" != "0" ]; then - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}) - average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" - else - average_disp="" - fi - echo -en "\r\033[K" - if [ "${HOST_WATTS}" != "0" ]; then - echo -e "${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp} ${idsCL[LightCyan]}[PS1=${PS1}'A, PS2=${PS2}'A]${idsCL[Default]}" - else - echo -e "${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}" - fi + echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" + fi + [ "${HOST_WATTS}" != "0" ] && echo -e "${idsCL[LightCyan]}[PS1=${PS1}'A, PS2=${PS2}'A]${idsCL[Default]}" || echo -e "${idsCL[Default]}" fi fi done