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

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-29 13:14:35 -06:00
parent b67314b5e4
commit 07b9e19b75
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inc/power.inc.sh
View File

@@ -299,7 +299,11 @@ CHECKPOWER(){
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)
FanSpeed=$(ROUND_NUMBER `echo "scale=2; ${vHOSTFAN}/21200" | bc` 0); FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc`
echo "H1: ${FanSpeed}"
FanSpeed=$(ROUND_NUMBER `echo "scale=2; ${vHOSTFAN}/21200" | bc` 0)
echo "H2: ${FanSpeed}"
FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc`
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')
echo -en "${idsCL[LightCyan]} [FanSpeed=${FanSpeed}'%]"

11
inc/temp.inc.sh
View File

@@ -468,24 +468,17 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
echo ${PW_THRESHOLDS[${SENSOR}]} | cut -d',' -f 2 | read temp_crit
echo ${PW_THRESHOLDS[${SENSOR}]} | cut -d',' -f 3 | read temp_crit_sys
fi
echo -en "HERE: "
# iDS-vMS-Offsite Fan Issue Workaround
if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ]; then
echo yes
vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
# vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
if [ "${vHOSTFAN}" != "" ]; then
echo "H1: ${FanSpeed}"
FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`
echo "H2: ${FanSpeed}"
FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'` 0)
echo "H3: ${FanSpeed}"
FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'` 0)
# FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
else
FanSpeed=''
fi
else
echo no
fi
if (( $(bc <<< "${temp_f} < ${temp_warn}") )); then