diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index eccf1135..d7228ba3 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -193,12 +193,17 @@ CHECKTEMPSENSOR(){ fi if [ $(bc -l <<< "${temp_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_f} < ${temp_crit}") -eq 1 ]; then - [ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f_disp}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" + lclr="${idsCL[Yellow]}" + lmd="WARNING " elif [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ]; then - [ "${average}" != "" ] && echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f_disp}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" + lclr="${idsCL[LightRed]}" + lmd="CRITICAL" else - [ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal ${spct}${temp_f_disp}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}" + lclr="${idsCL[Green]}" + lmd="Normal " fi + echo -en "${lclr}Normal ${spct}${temp_f_disp}${GAUGESH}" + [ "${average}" != "" ] && echo -en " /${spca}${averagedisp}${GAUGESH}" tmp="${spct}${temp_f_disp}${GAUGESH}" c=0; spc=''; spc1=`expr 12 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done @@ -263,7 +268,7 @@ AVERAGETEMP(){ ((logsfound++)) done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then - average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") + average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}")) else average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") fi