diff --git a/defaults.inc b/defaults.inc index 47578857..67d39315 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.181-01282024' +VERS='2.5.182-01282024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 0b7f01db..37a81b6b 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -73,7 +73,17 @@ CHECKTEMP(){ RPM=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) [ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ]; do tmp=tmp; done 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})'% ($(IDS_NUMBER_FORMAT ${RPM})'RPM)]${idsCL[Default]}" + 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) + echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]" + echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% AVG=${fan_average}'%)]${idsCL[Default]}" + + else + echo -e "($(IDS_NUMBER_FORMAT ${RPM})'RPM)]${idsCL[Default]}" + fi + else echo -e "${idsCL[Default]}" fi