From 18dcb4aa274083d054fd1b05e1b1a5c6be695cf9 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 28 Jan 2024 15:42:13 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/temp.inc.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index fbb504ed..6a624efb 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.183-01282024' +VERS='2.5.184-01282024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 3e65a31a..ed36a0e6 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -76,7 +76,7 @@ CHECKTEMP(){ echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% " if [ "${avgdays}" != "noavg" ]; then echo -en "${idsCL[Yellow]}Calculating ${avgdays} Day average ... ${idsCL[LightCyan]}]" - fan_average=$(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed) + fan_average=$(bc <<< "scale=0; $(ROUNDHALVES $(bc <<< "scale=3; $(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed)/10"))*10/1") echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]" echo -e "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% AVG=${fan_average}'%)]${idsCL[Default]}" @@ -327,7 +327,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 ${interval}) AND NOW() ORDER BY id DESC;") if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then - average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 2 yes) + average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 2) elif [ "${sensorid}" == "19" ]; then # average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0)