From 5145589be7fa5079fd39af06564fca312ea5f5cb Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 11 Dec 2023 10:07:25 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index c4da9911..8e3bf71c 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -798,6 +798,7 @@ CHECKPOWER(){ elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep off)" != "" ]; then HOST_WATTS_disp="${idsCL[LightRed]}Host powered down" + HOST_WATTS=-1 elif [ "${HOST_WATTS}" == "0" ]; then HOST_WATTS_disp="${idsCL[Yellow]}Host PSU not capable" @@ -816,14 +817,14 @@ CHECKPOWER(){ MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}" echo -en "\r\033[K${MSG}" - if [ "${avgdays}" != "" ] && [ "${HOST_WATTS}" != "0" ]; then + if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; 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" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" elif [ "${HOST_WATTS}" != "0" ] && [ "${HOST_WATTS}" != "" ]; then echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]" fi - if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ]; then + if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ] && [ ${HOST_WATTS} -ge 0 ]; then vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc` # vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSOR}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)