voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2024-06-01 13:36:10 -05:00
parent e79b3ffb28
commit 3758aaacf3
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
inc/temp.inc.sh
View File

@@ -374,7 +374,13 @@ CHECKTEMP(){
echo -en "${idsCL[LightCyan]} Getting FanSpeed..." echo -en "${idsCL[LightCyan]} Getting FanSpeed..."
fi fi
[ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ]; do tmp=tmp; done [ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ]; do tmp=tmp; done
RPM=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) # RPM=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
RPMs=($(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1 -O vq))
RPM_tot=0
for RPMn in "${RPMs[@]}"; do
RPM_tot=$(expr ${RPM_tot} + ${RPMn})
done
RPM=$(ROUND_NUMBER $(bc <<< "scale=0; ${RPM_tot}/${#RPMs[@]}"))
[ "${avgdays}" != "noavg" ] && fan_average=$(bc <<< "scale=0; $(ROUNDHALVES $(bc <<< "scale=3; $(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed)/10"))*10/1") [ "${avgdays}" != "noavg" ] && fan_average=$(bc <<< "scale=0; $(ROUNDHALVES $(bc <<< "scale=3; $(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed)/10"))*10/1")
echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]" echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]"
[ "${SENSOR}" == "iDS-vMS-Host6" ] && cSENSOR="iDS-vMS-Host7" || cSENSOR=${SENSOR} [ "${SENSOR}" == "iDS-vMS-Host6" ] && cSENSOR="iDS-vMS-Host7" || cSENSOR=${SENSOR}
@@ -1333,6 +1339,11 @@ Previous Temp: ${last_temp}${GAUGESH}"
fi fi
done done
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
fi
fi fi
else else

14
powerwall.sh
View File

@@ -909,17 +909,11 @@ fi
#SENDTEMP ${2} #SENDTEMP ${2}
# OFFSITE_SENDPOWER "OFFSITE POWER Service Startup TEST" # OFFSITE_SENDPOWER "OFFSITE POWER Service Startup TEST"
#AVERAGETEMP "ServerRoomTH" ${2} #AVERAGETEMP "ServerRoomTH" ${2}
RPMs=($(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1 -O vq)) vHOST_FANS=$(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.8.1 -O vq | sed -e 's/"//g')
RPM_tot=0 IFS=$'\n'; read -rd '' -a vHOST_FANS <<<"${vHOST_FANS}"; unset IFS
for RPMn in "${RPMs[@]}"; do for vHOST_FAN in "${vHOST_FANS[@]}"; do
echo "${RPMn}" echo $vHOST_FAN
RPM_tot=$(expr ${RPM_tot} + ${RPMn})
done done
echo "TOTs: ${RPM_tot} / ${#RPMs[@]}"
RPM=$(bc <<< "scale=0; ${RPM_tot}/${#RPMs[@]}")
echo "AVG1: ${RPM}"
RPM=$(ROUND_NUMBER $(bc <<< "scale=0; ${RPM_tot}/${#RPMs[@]}"))
echo "AVG2: ${RPM}"
;; ;;