From dd91c26ba118dd9de8ef8c615ffbaa1bdb7be65e Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 9 Jan 2024 11:08:04 -0600
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 59 +++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 5de6662e..ae279388 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -348,7 +348,25 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 			unset IFS
 			[ -f ${PW_TMPFOLDER}/power.${SENSORa}.off ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.${SENSORa}.off)) -ge 300 ] && rm-f ${PW_TMPFOLDER}/power.${SENSORa}.off
 			t=1
-	
+			
+			####### Fan Issue Workaround #######
+			if [ ! -f ${PW_TMPFOLDER}/${SENSORa}.down ] && ([ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] || [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.10.2.27" ]); then
+				if [ ! -f ${PW_TMPFOLDER}/.fancheck ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.fancheck)) -ge 300 ]; then
+					# vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
+					vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
+					if [ "${vHOSTFAN}" != "" ]; then
+						# FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'` 0)
+						if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then
+							FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $9}' | sed -e 's/%//g')
+						else
+							FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
+						fi
+					else
+						FanSpeed=''
+					fi
+				fi
+			fi
+				
 		else
 			SENSORS_CHECK=(${SENSORa})
 		fi
@@ -474,22 +492,6 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 						echo ${PW_THRESHOLDS[${SENSOR}]} | cut -d',' -f 2 | read temp_crit
 						echo ${PW_THRESHOLDS[${SENSOR}]} | cut -d',' -f 3 | read temp_crit_sys
 					fi
-			
-					####### Fan Issue Workaround #######
-					# if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] || [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.10.2.27" ]; then
-					# 	# vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
-					# 	vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
-					# 	if [ "${vHOSTFAN}" != "" ]; then
-					# 		# FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'` 0)
-					# 		if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then
-					# 			FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $9}' | sed -e 's/%//g')
-					# 		else
-					# 			FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
-					# 		fi
-					# 	else
-					# 		FanSpeed=''
-					# 	fi
-					# fi
 					
 					if [[ "${SENSORa}" != *"-Usage"* ]] && (( $(bc <<< "${temp_f} < ${temp_warn}") )); then
 						if (( $(bc <<< "${last_temp} >= 1") )); then
@@ -519,16 +521,18 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 						fi
 				
 						####### Fan Issue Workaround #######
-						# if [ "${FanSpeed}" != "" ] && ([ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] || [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.10.2.27" ]); then
-						# 	# if [ ${FanSpeed} -lt 26 ] || [ ${FanSpeed} -gt 34 ]; then
-						# 	if [ ${FanSpeed} -ne 30 ]; then
-						# 		SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Settings fans back to normal 30%"
-						# 		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
-						# 		ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x1E >/dev/null 2>&1
-						# 		echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SENSOR} - Resetting FanSpeed back to 30%" >> ${logtemp}
-						# 		echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SENSOR} - Resetting FanSpeed back to 30%" >> ${PW_LOGFILE}
-						# 	fi
-						# fi
+						if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ ! -f ${PW_TMPFOLDER}/${SENSORa}.down ] && [ "${FanSpeed}" != "" ] && ([ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] || [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.10.2.27" ]) && [ "${SENSOR}" == "CPU1" ]; then
+							if [ ! -f ${PW_TMPFOLDER}/.fancheck ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.fancheck)) -ge 300 ]; then
+								# if [ ${FanSpeed} -lt 26 ] || [ ${FanSpeed} -gt 34 ]; then
+								if [ ${FanSpeed} -ne 30 ]; then
+									SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Settings fans back to normal 30%"
+									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
+									ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x1E >/dev/null 2>&1
+									echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SENSOR} - Resetting FanSpeed back to 30%" >> ${logtemp}
+									echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SENSOR} - Resetting FanSpeed back to 30%" >> ${PW_LOGFILE}
+								fi
+							fi
+						fi
 				
 					elif [[ "${SENSORa}" != *"-Usage"* ]]; then
 						
@@ -666,6 +670,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 					fi	
 				fi
 			done
+			[ ! -f ${PW_TMPFOLDER}/.fancheck ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.fancheck)) -ge 300 ] && touch ${PW_TMPFOLDER}/.fancheck
 		fi
 		
 	else