From cff3430ce3afe32e6c389d658d0da46085d3cebb Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 16 Feb 2024 22:32:05 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 2 +- inc/temp.inc.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 7ad93f24..2b8accc2 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.34-02142024' +VERS='2.6.35-02162024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 82a3ed0f..58a7a384 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -342,7 +342,7 @@ CHECKPOWER(){ IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS AD1="${PW_MISCSENSOR_DESC[${mSENSOR}]}"; c=0; spc1=''; spca=`expr 25 - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done AD2=$(IDS_NUMBER_FORMAT ${AMP} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done - AD3=$(IDS_NUMBER_FORMAT ${WATT} 2 yes); c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done + AD3=$(IDS_NUMBER_FORMAT ${WATT} 2 yes); if [ "${avgdays}" != "" ]; then c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done; done echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W" if [ "${avgdays}" == "" ]; then echo -e "${spc3}${VOLT}'V${idsCL[Default]}" diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 0a286d3a..8b7fb6ad 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -648,7 +648,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ ### GOLDILOCK ZONE ### if ((( $(bc <<< "${temp_f} >= ${GL_LOW}") )) && (( $(bc <<< "${temp_f} <= ${GL_HIGH}") ))) || [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ]; then if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl ] && [ -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] && [ $(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}]} FAN CONTROL" "Goldilock Zone Found at ${FanSpeed}%" echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.gl [ "${SENSORa}" == "iDS-vMS-Host7" ] && [ ! -f ${PW_TMPFOLDER}/iDS-vMS-Host6.down ] && echo "${FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/iDS-vMS-Host6.gl echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SENSORa} - Goldilock Zone Found (1HR)" >> ${logtemp}