diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index cc206814..0a286d3a 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -392,9 +392,7 @@ AVERAGETEMP(){ elif [[ "${daysback}" =~ ^[0-9]+$ ]]; then interval="${daysback} DAY" 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 if ([ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]) || [ "${sensorid}" == "19" ]; then val=${speed} @@ -404,7 +402,6 @@ AVERAGETEMP(){ if [ "${val}" != "" ] && [ "${val}" != "0" ] && [[ "${val}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then temptotal=$(bc <<< "scale=2; ${temptotal}+${val}") ((logsfound++)) - echo "${logsfound} : ${date} : ${val} = ${temptotal}" 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 @@ -414,10 +411,8 @@ AVERAGETEMP(){ average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0) else average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") - echo "${temptotal}/${logsfound}" fi (( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}" - echo ${average} # echo ${logsfound} }