diff --git a/inc/power.inc.sh b/inc/power.inc.sh index f721ebb3..519a640f 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -17,7 +17,6 @@ GET_OFFSITEHOST_FANSPEED(){ 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) FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed - echo "DONE: $(cat ${PW_TMPFOLDER}/.fanspeed)" } CHECKPOWER(){ @@ -35,7 +34,7 @@ CHECKPOWER(){ done [ "${avgdays}" == "0" ] && unset avgdays [ "${avgdays}" != "" ] && avgdayshdr="${avgdays}-Day-Avg" || avgdayshdr="" - GET_OFFSITEHOST_FANSPEED & + [ "${PTYPE}" != "power" ] && GET_OFFSITEHOST_FANSPEED & if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]) && [ "${PTYPE}" != "esxi" ]; then echo @@ -308,7 +307,7 @@ 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 [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp; echo $(cat ${PW_TMPFOLDER}/.fanspeed); sleep 1s; done + until [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp; sleep 1s; done echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]" fi fi