From 2c5f825452f2499f62fc17108cb06eb4259f514b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 9 May 2024 19:47:37 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 53894472..39297a93 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -26,7 +26,7 @@ CHECKTEMP(){ start=`date +%s` cw=25 cdt=$(date +%Y-%m-%d-%H-%M-%S) - REPORT=0 + REPORT=0; DETAILS=0 while [ $# -gt 0 ]; do case "$1" in -a|-avg) avgdays=${2};; @@ -36,6 +36,7 @@ CHECKTEMP(){ -e|-esxi) TTYPE="esxi";; -f|-fans) TTYPE="fans";; -s|-search) search=${2};; + -d|-detail) DETAILS=1;; -r|-report) REPORT=1 unset idsCL idsBG idsST @@ -129,7 +130,7 @@ CHECKTEMP(){ 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 + if [ ${DETAILS} = 0 ] && [ "${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 ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) if [ "${OLD_temp_f[1]}" != "" ]; then @@ -315,7 +316,7 @@ CHECKTEMP(){ reading="${lclr}${lmd}${spct}${temp_f}${GAUGESH}" echo -en "${idsCL[LightCyan]} ${sensorname}${spc}${idsCL[Default]}: ${reading} " - if [ "${temp_f}" != "" ] && [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then + if [ ${DETAILS} = 0 ] && [ "${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 ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))