Update power.inc.sh
This commit is contained in:
@@ -14,10 +14,9 @@ AVERAGEPOWER(){
|
||||
}
|
||||
|
||||
GET_OFFSITEHOST_FANSPEED(){
|
||||
echo -en "running - "
|
||||
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)
|
||||
echo $(${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
|
||||
echo $(${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') > ${PW_TMPFOLDER}/.fanspeed
|
||||
export FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
|
||||
}
|
||||
|
||||
CHECKPOWER(){
|
||||
@@ -35,14 +34,14 @@ CHECKPOWER(){
|
||||
done
|
||||
[ "${avgdays}" == "0" ] && unset avgdays
|
||||
[ "${avgdays}" != "" ] && avgdayshdr="${avgdays}-Day-Avg" || avgdayshdr=""
|
||||
[ "${PTYPE}" != "power" ] && GET_OFFSITEHOST_FANSPEED
|
||||
[ "${PTYPE}" != "power" ] && GET_OFFSITEHOST_FANSPEED &
|
||||
|
||||
if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]) && [ "${PTYPE}" != "esxi" ]; then
|
||||
echo
|
||||
DIVIDER . yellow 75
|
||||
echo -e "${idsCL[Yellow]}Mainsite Power Information ${idsCL[LightYellow]}${avgdayshdr}"
|
||||
DIVIDER . yellow 75
|
||||
|
||||
|
||||
echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... "
|
||||
|
||||
INVSTATSINFO=$(curl -s "http://${PW_INVERTER_IP}/stats.json")
|
||||
@@ -308,11 +307,10 @@ 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
|
||||
until [ "${FanSpeed}" != "0" ] && [ "${FanSpeed}" != "" ]; do
|
||||
tmp=tmp
|
||||
done
|
||||
echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]"
|
||||
rm -f ${PW_TMPFOLDER}/.fanspeed
|
||||
echo -en "${idsCL[LightCyan]} [FanSpeed=${FanSpeed}'%]"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user