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

Update temp.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2024-02-14 22:41:54 -06:00
parent 0cb16f4c3e
commit b7a6d5d2d9
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
inc/temp.inc.sh
View File

@@ -392,9 +392,7 @@ AVERAGETEMP(){
elif [[ "${daysback}" =~ ^[0-9]+$ ]]; then elif [[ "${daysback}" =~ ^[0-9]+$ ]]; then
interval="${daysback} DAY" interval="${daysback} DAY"
fi fi
echo "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;"
while IFS=$'\t' read date temp hum speed ;do while IFS=$'\t' read date temp hum speed ;do
if ([ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]) || [ "${sensorid}" == "19" ]; then if ([ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]) || [ "${sensorid}" == "19" ]; then
val=${speed} val=${speed}
@@ -404,7 +402,6 @@ AVERAGETEMP(){
if [ "${val}" != "" ] && [ "${val}" != "0" ] && [[ "${val}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then if [ "${val}" != "" ] && [ "${val}" != "0" ] && [[ "${val}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
temptotal=$(bc <<< "scale=2; ${temptotal}+${val}") temptotal=$(bc <<< "scale=2; ${temptotal}+${val}")
((logsfound++)) ((logsfound++))
echo "${logsfound} : ${date} : ${val} = ${temptotal}"
fi fi
done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;") done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;")
if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then
@@ -414,10 +411,8 @@ AVERAGETEMP(){
average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0) average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0)
else else
average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") average=$(bc <<< "scale=2; ${temptotal}/${logsfound}")
echo "${temptotal}/${logsfound}"
fi fi
(( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}" (( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}"
echo ${average} echo ${average}
# echo ${logsfound} # echo ${logsfound}
} }