diff --git a/defaults.inc b/defaults.inc index e35e1eff..8af1f3a1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.167-01272024' +VERS='2.5.168-01272024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index c9d1286c..b697857d 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -325,6 +325,8 @@ CHECKTEMP_SERVICE(){ runEvery=60 #SECONDS SCAN_THREADS=4 [ "${PW_DEFAULT_ESXI_FANSPEED}" != "" ] && DEFAULT_ESXI_FANSPEED=${PW_DEFAULT_ESXI_FANSPEED} || DEFAULT_ESXI_FANSPEED=30 + [ "${PW_DEFAULT_ESXI_EXHAUST_MIN}" != "" ] && DEFAULT_ESXI_EXHAUST_MIN=${PW_DEFAULT_ESXI_EXHAUST_MIN} || DEFAULT_ESXI_EXHAUST_MIN=85 + echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Temp' Service Startup" >> ${PW_LOGFILE} SENDTEMPS "TEMP Service Startup" & [ ! -d ${PW_TMPFOLDER}/.lastfancheck ] && mkdir ${PW_TMPFOLDER}/.lastfancheck || rm -f ${PW_TMPFOLDER}/.lastfancheck/*.set @@ -546,7 +548,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ elif [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${SENSORa}]}"* ]] && [[ "${vSENSOR}" = *"Exhaust"* ]]; then if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set)) -ge 600 ]; then - if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] && (( $(bc <<< "${temp_f} < 100") )); then + if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] && (( $(bc <<< "${temp_f} < ${DEFAULT_ESXI_EXHAUST_MIN}") )); then if [ ${FanSpeed} -ne ${DEFAULT_ESXI_FANSPEED} ]; then if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${SENSORa}]}"* ]]; then SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "Settings fans back to normal ${DEFAULT_ESXI_FANSPEED}%" @@ -562,7 +564,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ ([ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa} ] || [ "$(cat ${PW_TMPFOLDER}/.lastfancheck/${SENSORa})" != "${FanSpeed}" ]) && echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SENSORa} echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set - elif (( $(bc <<< "${temp_f} >= 100") )); then + elif (( $(bc <<< "${temp_f} >= ${DEFAULT_ESXI_EXHAUST_MIN}") )); then [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] && NEW_FanSpeed=$(expr ${DEFAULT_ESXI_FANSPEED} + 5) || NEW_FanSpeed=$(expr ${FanSpeed} + 5) if [ ${NEW_FanSpeed} -le 104 ]; then [ ${NEW_FanSpeed} -gt 100 ] && NEW_FanSpeed=100