Update powerwall.sh

This commit is contained in:
2023-12-03 10:17:44 -06:00
parent f30dc507be
commit 78185f0e8b

View File

@@ -606,7 +606,7 @@ CHECKPOWER(){
MSG="${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate" MSG="${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate"
echo -en "${MSG}" echo -en "${MSG}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts"
echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
fi fi
@@ -626,13 +626,14 @@ CHECKPOWER(){
fi fi
echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}" echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}"
MSG="${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ${idsCL[Default]}~ estimate"
echo -en "${MSG}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}) echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts"
else echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}"
average_disp="" fi
fi echo -e "${idsCL[Default]}"
echo -e "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ${idsCL[Default]}~ estimate${idsCL[Green]}${average_disp} ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)${idsCL[Default]}"
# echo # echo
DIVIDER . lightCyan 75 DIVIDER . lightCyan 75
@@ -700,15 +701,15 @@ CHECKPOWER(){
echo echo
echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}" echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}"
MSG="${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS}`'watts ${idsCL[Default]}~ estimate"
echo -en "${MSG}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays}) echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts"
else echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}"
average_disp="" fi
fi echo -e "${idsCL[Default]}\n"
echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS}`'watts ${idsCL[Default]}~ estimate${idsCL[Green]}${average_disp}${idsCL[Default]}"
echo
# echo -e "${idsCL[LightCyan]}Current Fan Speed ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}%${idsCL[Default]}" # echo -e "${idsCL[LightCyan]}Current Fan Speed ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}%${idsCL[Default]}"
# echo # echo
fi fi