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:33:19 -06:00
parent 4bdff4bced
commit 4ed069e6ad
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inc/power.inc.sh
View File

@@ -255,8 +255,10 @@ CHECKPOWER(){
DIVIDER . yellow 75 DIVIDER . yellow 75
echo -e "${idsCL[Yellow]}ESXi Host Power Information ${avgdayshdr}" echo -e "${idsCL[Yellow]}ESXi Host Power Information ${avgdayshdr}"
DIVIDER . yellow 75 DIVIDER . yellow 75
SENSOR_TOTAL_MAINSITE=0 SENSOR_TOTAL_WATTS_MAINSITE=0
SENSOR_TOTAL_OFFSITE=0 SENSOR_TOTAL_AMPS_MAINSITE=0
SENSOR_TOTAL_WATTS_OFFSITE=0
SENSOR_TOTAL_AMPS_OFFSITE=0
for SENSOR in ${PW_SENSOR_ORD[@]}; do for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
if [ "${STYPE}" == "" ] || ([ "${STYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then if [ "${STYPE}" == "" ] || ([ "${STYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then
@@ -310,9 +312,11 @@ CHECKPOWER(){
echo -en "${MSG}" echo -en "${MSG}"
if [ "${HOST_WATT_SENSORS}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then if [ "${HOST_WATT_SENSORS}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
if [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]; then if [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]; then
SENSOR_TOTAL_MAINSITE=$(expr ${SENSOR_TOTAL_MAINSITE} + ${HOST_WATTS}) SENSOR_TOTAL_WATTS_MAINSITE=$(expr ${SENSOR_TOTAL_WATTS_MAINSITE} + ${HOST_WATTS})
SENSOR_TOTAL_AMPS_MAINSITE=$(expr ${SENSOR_TOTAL_AMPS_MAINSITE} + ${HOST_AMPS})
elif [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]; then elif [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]; then
SENSOR_TOTAL_OFFSITE=$(expr ${SENSOR_TOTAL_OFFSITE} + ${HOST_WATTS}) SENSOR_TOTAL_WATTS_OFFSITE=$(expr ${SENSOR_TOTAL_WATTS_OFFSITE} + ${HOST_WATTS})
SENSOR_TOTAL_AMPS_OFFSITE=$(expr ${SENSOR_TOTAL_AMPS_OFFSITE} + ${HOST_AMPS})
fi fi
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
@@ -337,8 +341,8 @@ CHECKPOWER(){
fi fi
done done
echo echo
[ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ] && echo -en "${idsCL[LightCyan]}Mainsite Total Watts ${idsCL[Default]}: `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_MAINSITE}`'watts" [ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ] && echo -e "${idsCL[LightCyan]}Mainsite Total ${idsCL[Default]}: ${idsCL[Green]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE}`'watts"
[ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -en "${idsCL[LightCyan]}Offsite Total Watts ${idsCL[Default]}: `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_OFFSITE}`'watts" [ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total ${idsCL[Default]}: ${idsCL[Green]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
fi fi
# if [ ${REPORT} -eq 0 ]; then # if [ ${REPORT} -eq 0 ]; then
# end=`date +%s` # end=`date +%s`