voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update powerwall.sh

Browse Source
This commit is contained in:
David Schroeder
2023-12-03 10:24:57 -06:00
parent 78185f0e8b
commit 681b98931d
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
powerwall.sh
View File

@@ -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