From 720aebe303f0a5d11fb66561ae9d29e91b5ecdf8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Dec 2023 13:47:44 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 4630f22b..52402b5b 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -13,6 +13,12 @@ AVERAGEPOWER(){ echo ${average} } +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') +} + CHECKPOWER(){ start=`date +%s` rm -f ${PW_TMPFOLDER}/*.hostpower* @@ -35,6 +41,8 @@ CHECKPOWER(){ echo -e "${idsCL[Yellow]}Mainsite Power Information ${idsCL[LightYellow]}${avgdayshdr}" DIVIDER . yellow 75 + [ "${PTYPE}" != "power" ] && GET_OFFSITEHOST_FANSPEED & + echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... " INVSTATSINFO=$(curl -s "http://${PW_INVERTER_IP}/stats.json") @@ -298,14 +306,11 @@ CHECKPOWER(){ 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" ] && [ ${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) - echo "H1: ${vHOSTFAN}" - FanSpeed=$(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2) - echo "H2: ${FanSpeed}" - FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100/1" | bc` 0) - echo "H3: ${FanSpeed}" - # 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) - # FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') + # 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 + tmp=tmp + done echo -en "${idsCL[LightCyan]} [FanSpeed=${FanSpeed}'%]" fi fi