diff --git a/defaults.inc b/defaults.inc index 92923d1d..2feb07bf 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.203-01302024' +VERS='2.5.204-01302024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 819b2b37..ae704578 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -617,13 +617,16 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ elif (( $(bc <<< "${temp_f} >= ${GL_LOW}") )) && (( $(bc <<< "${temp_f} <= ${GL_HIGH}") )); then ##GOLDILOCK ZONE [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] && echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set - [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl ] && echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl - if [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl)) -ge 3600 ] && (( $(bc <<< "$(expr ${DEFAULT_ESXI_FANSPEED} + 5) < ${FanSpeed}") )); then + if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set)) -ge 3600 ]; then SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FAN CONTROL" "Goldilock Zone Found at ${FanSpeed}%" - # SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "GL Zone Alert: Resetting fans back to normal ${DEFAULT_ESXI_FANSPEED}%" - # SET_ESXI_FANSPEED ${DEFAULT_ESXI_FANSPEED} ${SENSORa} >/dev/null 2>&1 & - # rm -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl - touch ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl + echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl + echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - Goldilock Zone Found (1HR)" >> ${logtemp} + echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - Goldilock Zone Found (1HR)" >> ${PW_LOGFOLDER}/esxi-fanspeeds.log + + elif [ -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl)) -ge 21600 ]; then + SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FAN CONTROL" "DAAAMMMNN GOLDIE!!!! You found this shit 6 hours ago! BAM ${FanSpeed}%" + echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - DAAAMMMNN GOLDIE!!!! Goldilock Zone (6HR)" >> ${logtemp} + echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - DAAAMMMNN GOLDIE!!!! Goldilock Zone (6HR)" >> ${PW_LOGFOLDER}/esxi-fanspeeds.log fi elif (( $(bc <<< "${temp_f} >= ${DEFAULT_ESXI_EXHAUST_MIN}") )); then @@ -852,10 +855,10 @@ SET_ESXI_FANSPEED(){ else MSG="Increasing fans to ${SET_FanSpeed}%" fi - [ ! -f ${PW_LOGFOLDER}./esxi-fanspeeds.log ] && touch ${PW_LOGFOLDER}./esxi-fanspeeds.log + [ ! -f ${PW_LOGFOLDER}/esxi-fanspeeds.log ] && touch ${PW_LOGFOLDER}/esxi-fanspeeds.log [ "${logtemp}" != "" ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - ${MSG}" >> ${logtemp} [ ${FanSpeed} -ge 70 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - ${MSG}" >> ${PW_LOGFILE} - echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - ${MSG}" >> ${PW_LOGFOLDER}./esxi-fanspeeds.log + echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SET_HOST} - ${MSG}" >> ${PW_LOGFOLDER}/esxi-fanspeeds.log echo "${SET_FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SET_HOST}.set [ "${SET_HOST}" == "iDS-vMS-Host7" ] && SET_ESXI_FANSPEED ${SET_FanSpeed} iDS-vMS-Host6 >/dev/null 2>&1 & }