From 9ebe149dbf3ab429c4b9b59da9c65b15ac3bddbb Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 29 Apr 2024 10:29:09 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 60 ++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 7a31142f..b17fe684 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -124,30 +124,27 @@ CHECKTEMP(){ lclr="${idsCL[Green]}" lmd="Normal " fi - c=0; spct=''; [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && spc1=`expr 6 - ${#temp_f}` || spc1=`expr 7 - ${#temp_f}` - until [ ${c} = ${spc1} ]; do spct="${spct} "; ((c++)); done - reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}" - echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} " if [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then for R in ${PW_TEMPIND_RANGE[@]}; do + lookback='' OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) if [ "${OLD_temp_f[1]}" != "" ]; then if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD_temp_f[1]}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f[1]}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then - echo -en "${idsCL[White]}\u23F9 " + lookback="${lookback}${idsCL[White]}\u23F9 " elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD_temp_f[1]}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - echo -en "${idsCL[LightRed]}\u25B2 " + lookback="${lookback}${idsCL[LightRed]}\u25B2 " elif [ $(bc -l <<< "${OLD_temp_f[1]} < ${temp_f}") -eq 1 ]; then - echo -en "${idsCL[Magenta]}\u25B2 " + lookback="${lookback}${idsCL[Magenta]}\u25B2 " elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD_temp_f[1]}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then - echo -en "${idsCL[LightGreen]}\u25BC " + lookback="${lookback}${idsCL[LightGreen]}\u25BC " elif [ $(bc -l <<< "${temp_f} < ${OLD_temp_f[1]}") -eq 1 ]; then - echo -en "${idsCL[LightCyan]}\u25BC " + lookback="${lookback}${idsCL[LightCyan]}\u25BC " else - echo -en " " + lookback="${lookback} " fi else - echo -en "${idsCL[Default]}\u22C5 " + lookback="${lookback}${idsCL[Default]}\u22C5 " fi done elif [ "${avgdays}" = "noavg" ]; then @@ -155,6 +152,12 @@ CHECKTEMP(){ echo -en " " fi + c=0; spct=''; [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && spc1=`expr 6 - ${#temp_f}` || spc1=`expr 7 - ${#temp_f}` + until [ ${c} = ${spc1} ]; do spct="${spct} "; ((c++)); done + reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}" + echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} " + [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]] && echo -en "${lookup}" + else temp_f_disp=" " lclr="${idsCL[Yellow]}" @@ -325,10 +328,6 @@ CHECKTEMP(){ c=0; spca=''; until [ ${c} = ${#PW_TEMPIND_RANGE[@]} ]; do spca="${spca} "; ((c++)); done lookback="${lookback} " fi - - # entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${sensorname// /_}' AND sensorid='${PW_SENSOR_ID[${SENSOR}]}'")) - # OLD1_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL 30 MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL 20 MINUTE) ORDER BY date ASC LIMIT 1")); OLD1_temp_f=${OLD1_temp_f[1]} - # OLD2_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL 50 MINUTE) ORDER BY date ASC LIMIT 1")); OLD2_temp_f=${OLD2_temp_f[1]} if [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ] || ([ "${TTYPE}" == "fans" ] && [ $(bc -l <<< "${temp_f} > $(bc <<< "scale=2; ${GL_HIGH}+5")") -eq 1 ]); then lclr="${idsCL[LightRed]}" @@ -349,37 +348,6 @@ CHECKTEMP(){ if [ "${temp_f}" != "" ] && [ "${average}" = "" ] && [ "${lookback}" != "" ]; then echo -en " ${lookback}" - - # if [ $(bc -l <<< "${temp_f} <= $(echo "scale=2; ${OLD1_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "${temp_f} >= $(echo "scale=2; ${OLD1_temp_f}-${PW_TEMPIND_DIFF}" | bc)") -eq 1 ]; then - # echo -en " ${idsCL[White]}\u23F9 " - # elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD1_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - # echo -en " ${idsCL[LightRed]}\u25B2 " - # elif [ $(bc -l <<< "${OLD1_temp_f} < ${temp_f}") -eq 1 ]; then - # echo -en " ${idsCL[Magenta]}\u25B2 " - # elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD1_temp_f}-(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - # echo -en " ${idsCL[LightGreen]}\u25BC " - # elif [ $(bc -l <<< "${temp_f} < ${OLD1_temp_f}") -eq 1 ]; then - # echo -en " ${idsCL[LightCyan]}\u25BC " - # else - # echo -en " " - # fi - # if [ "${OLD2_temp_f}" != "" ]; then - # if [ $(bc -l <<< "${temp_f} <= $(echo "scale=2; ${OLD2_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "${temp_f} >= $(echo "scale=2; ${OLD2_temp_f}-${PW_TEMPIND_DIFF}" | bc)") -eq 1 ]; then - # echo -en "${idsCL[White]}\u23F9 " - # elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD2_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - # echo -en "${idsCL[LightRed]}\u25B2 " - # elif [ $(bc -l <<< "${OLD2_temp_f} < ${temp_f}") -eq 1 ]; then - # echo -en "${idsCL[Magenta]}\u25B2 " - # elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD2_temp_f}-(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - # echo -en "${idsCL[LightGreen]}\u25BC " - # elif [ $(bc -l <<< "${temp_f} < ${OLD2_temp_f}") -eq 1 ]; then - # echo -en "${idsCL[LightCyan]}\u25BC " - # else - # echo -en " " - # fi - # else - # echo -en " " - # fi elif [ "${avgdays}" = "noavg" ]; then echo -en " " fi