From 7b4f97a146d3c77140bf497132d7fc33abd5b09a Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 24 Apr 2024 17:23:06 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 46a10ac4..5471b790 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -840,10 +840,11 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ elif [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${SENSORa}]}"* ]] && [[ "${vSENSOR}" = *"Exhaust"* ]] && [ "${FanSpeed}" != "" ]; then if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ]; then - SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "Re-enabling Host Fan control to Powerwall. Setting fans back to defaults: ${ESXI_DEF_FANSPEED}%" + NEW_FanSpeed=$(GET_DEFAULT_FANSPEED ${SENSORa} ${FanSpeed}) + SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "Re-enabling Host Fan control to Powerwall. Setting fans back to defaults: ${NEW_FanSpeed}%" ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 [ "${SENSORa}" == "iDS-vMS-Host7" ] && ipmitool -I lanplus -H 10.10.2.26 -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 - SET_ESXI_FANSPEED ${ESXI_DEF_FANSPEED} ${SENSORa} e >/dev/null 2>&1 & + SET_ESXI_FANSPEED ${NEW_FanSpeed} ${SENSORa} e >/dev/null 2>&1 & fi ### GOLDILOCK ZONE ### @@ -1495,7 +1496,7 @@ SERVERROOM_TEMP_DIFFERENCE(){ } GET_DEFAULT_FANSPEED(){ - [ "${2}" != "" ] && [ $(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${1}]} .1.3.6.1.4.1.674.10892.5.2.5 -O vq | sed -e 's/"//g') -ge 1800 ] && echo ${2} || echo ${PW_ESXI_DEF_FANSPEED} + ([ "${2}" != "" ] && [ $(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${1}]} .1.3.6.1.4.1.674.10892.5.2.5 -O vq | sed -e 's/"//g') -ge 1800 ]) && echo ${2} || echo ${PW_ESXI_DEF_FANSPEED} } GET_TUYA_TEMP(){