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

Update power.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2024-01-08 23:29:01 -06:00
parent 67e8f39975
commit 4bdff4bced
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
inc/power.inc.sh
View File

@@ -255,14 +255,11 @@ CHECKPOWER(){
DIVIDER . yellow 75
echo -e "${idsCL[Yellow]}ESXi Host Power Information ${avgdayshdr}"
DIVIDER . yellow 75
SENSOR_TOTAL_MAINSITE=0
SENSOR_TOTAL_OFFSITE=0
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
gochk=0
if [ "${STYPE}" == "" ] || ([ "${STYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then
gochk=1
fi
if [ ${gochk} -eq 1 ]; then
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
HOST_WATT_SENSORS=$(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.8.1 -O vq 2> /dev/null | sed -e 's/"//g')
@@ -312,6 +309,11 @@ CHECKPOWER(){
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
echo -en "${MSG}"
if [ "${HOST_WATT_SENSORS}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
if [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]; then
SENSOR_TOTAL_MAINSITE=$(expr ${SENSOR_TOTAL_MAINSITE} + ${HOST_WATTS})
elif [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]; then
SENSOR_TOTAL_OFFSITE=$(expr ${SENSOR_TOTAL_OFFSITE} + ${HOST_WATTS})
fi
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts"
@@ -330,10 +332,13 @@ CHECKPOWER(){
fi
fi
fi
echo -e "${idsCL[Default]}"
echo -e "${idsCL[Default]}"
fi
fi
done
echo
[ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ] && echo -en "${idsCL[LightCyan]}Mainsite Total Watts ${idsCL[Default]}: `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_MAINSITE}`'watts"
[ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -en "${idsCL[LightCyan]}Offsite Total Watts ${idsCL[Default]}: `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_OFFSITE}`'watts"
fi
# if [ ${REPORT} -eq 0 ]; then
# end=`date +%s`