From d4f2db66a22ce44b1c2cefa2bf41a2eeb5f56ce9 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Dec 2023 13:51:10 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 52402b5b..e7adf33e 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -14,9 +14,8 @@ AVERAGEPOWER(){ } GET_OFFSITEHOST_FANSPEED(){ - export FanSpeed=0 vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r 10.2.1.21 -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1) - export FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') + echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g' > ${PW_TMPFOLDER}/.fanspeed } CHECKPOWER(){ @@ -308,10 +307,11 @@ CHECKPOWER(){ 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=$(ROUND_NUMBER `echo "scale=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0) - until [ "${FanSpeed}" != "0" ] && [ "${FanSpeed}" != "" ]; do + until [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp done - echo -en "${idsCL[LightCyan]} [FanSpeed=${FanSpeed}'%]" + echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]" + rm -f ${PW_TMPFOLDER}/.fanspeed fi fi