From dcbe0147b876eefd29a99bb3c583e4fe7b3d7158 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 19 May 2025 22:13:43 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/temp.inc.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 4b34f7e3..1e111999 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.8.35-05192025' +PW_VERS='2.8.40-05192025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index b7232f61..3fd52215 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -47,6 +47,7 @@ CHECKTEMP(){ -s|-search) search=${2};; -x|-exclude) exclude=${2};; -d|-detail) DETAILS=1;; + -md|-minidetail) DETAILS=2;; -r|-report) REPORT=1 unset idsCL idsBG idsST @@ -140,7 +141,7 @@ CHECKTEMP(){ [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -en "${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} " - if [ ${DETAILS} -eq 0 ] && [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then + if [ ${DETAILS} -eq 2 ] && [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then for R in ${PW_TEMPIND_RANGE[@]}; do OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL $(expr ${R} + 1) MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 6) MINUTE) ORDER BY date ASC LIMIT 1")) if [ "${OLD_temp_f[1]}" != "" ]; then @@ -461,7 +462,7 @@ CHECKTEMP(){ reading="${lclr}${lmd}${spct}${temp_f}${GAUGESH}" echo -en "${idsCL[LightCyan]} ${sensorname}${spc}${idsCL[Default]}: ${reading} " - if [ ${DETAILS} -eq 0 ] && [ "${temp_f}" != "" ] && [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then + if [ ${DETAILS} -eq 2 ] && [ "${temp_f}" != "" ] && [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then for R in ${PW_TEMPIND_RANGE[@]}; do entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${sensorname// /_}' AND sensorid='${PW_SENSOR_ID[${SENSOR}]}'")) OLD_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 $(expr ${R} + 1) MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 6) MINUTE) ORDER BY date ASC LIMIT 1"))