From 8e36e689a37443c8ab5ef38d0e11b467e70833d5 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 29 Apr 2024 09:39:11 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 05fdea93..f24d41c9 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -84,18 +84,19 @@ CHECKTEMP(){ DIVIDER . yellow ${PRI_WIDTH} if [ "${avgdays}" = "noavg" ]; then - sensorsqry='' + sensorsqry=''; sq=0 for SENSOR in ${PW_SENSOR_ORD[@]}; do if [[ "${SENSOR}" != *"FAN"* ]]; then if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && [[ "${SENSOR}" = *"Room"* ]])); then [ "${sensorsqry}" != "" ] && sensorsqry="${sensorsqry},${PW_SENSOR_ID[${SENSOR}]}" || sensorsqry=${PW_SENSOR_ID[${SENSOR}]} + ((sq++)) fi fi done if [ "${sensorsqry}" != "" ]; then declare -A RANGE_TEMPS for R in ${PW_TEMPIND_RANGE[@]}; do - lookup=($(${mysql_conn} -e "SELECT sensorid,temp FROM servermonitor.sensor_data WHERE sensorid IN (${sensorqry}) AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) + lookup=($(${mysql_conn} -e "SELECT sensorid,temp FROM servermonitor.sensor_data WHERE sensorid IN (${sensorqry}) AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT ${sq}")) RANGE_TEMPS["${R}-${lookup[2]}"]=${lookup[3]} RANGE_TEMPS["${R}-${lookup[4]}"]=${lookup[5]} done