From d53d9764a15a259179eed8bf5678a26c61fafb73 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 12 Jan 2024 08:46:15 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 5c883588..a76f9c82 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -136,18 +136,17 @@ CHECKPOWER(){ if [ ${REPORT} -eq 0 ]; then echo -en "\r\033[K" - echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" + # echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" MSG="${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average} 0`'watts" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays} amp); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'amps" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" - else - echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)" fi - echo -e "${idsCL[Default]}" + echo -e "${idsCL[Default]}" + MSG="${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'watts ${idsCL[Default]}~ est" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then