From b4534f24316025bede0ff9eae8658ca6d486689c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 24 Feb 2024 10:31:12 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 57c6a1a4..9ea7b603 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -492,17 +492,20 @@ AVERAGETEMP(){ ((logsfound++)) 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;") - if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then - average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 2) - elif [ "${sensorid}" == "19" ]; then - # average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") - average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0) + if [ ${logsfound} -gt 0 ]; then + if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then + average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 2) + elif [ "${sensorid}" == "19" ]; then + # average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") + average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0) + else + average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") + fi + (( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}" + echo ${average} else - average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") + echo 0 fi - (( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}" - echo ${average} - # echo ${logsfound} } CHECKTEMP_SERVICE(){