From 323b3cf2cac2a7dc6c98e6cd9d4de2e1c6a446a8 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 24 Jan 2024 21:28:15 -0600
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 1891059b..3c73038c 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -1,8 +1,3 @@
-GET_OFFSITEHOST_FANSPEED(){
-	vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r 10.2.1.21 -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
-	FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
-	echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed
-}
 GET_HOST_FANSPEED(){
 	vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${1}]}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
 	if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then
@@ -10,7 +5,7 @@ GET_HOST_FANSPEED(){
 	else
 		FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
 	fi
-	echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${1}]}
+	echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${1}]}.${2}
 }
 START_POWERWALL_FAN(){
 	pwmconfig &
@@ -25,7 +20,8 @@ START_POWERWALL_FAN(){
 }
 CHECKTEMP(){
 	start=`date +%s`
-	cw=25;
+	cw=25
+	cdt=$(date +%Y-%m-%d-%H-%M-%S)
 	while [ $# -gt 0 ]; do
 		case "$1" in
 			-a|-avg) avgdays=${2};;
@@ -38,7 +34,7 @@ CHECKTEMP(){
 	if [ "${temptype}" != "sensors" ]; then
 		for ESXIHOST in "${PW_ALLHOSTS[@]}"; do
 			if [ ! -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.down ]; then
-				GET_HOST_FANSPEED ${ESXIHOST} &
+				GET_HOST_FANSPEED ${ESXIHOST} ${cdt} &
 			fi
 		done
 	fi
@@ -71,9 +67,9 @@ CHECKTEMP(){
 				if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then
 					echo -en "${idsCL[LightCyan]}	Getting FanSpeed..."
 					RPM=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
-					[ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR} ]; do tmp=tmp; done
+					[ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ]; do tmp=tmp; done
 					echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]"
-					echo -e "${idsCL[LightCyan]}	   [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR})'% ($(IDS_NUMBER_FORMAT ${RPM})'RPM)]${idsCL[Default]}"
+					echo -e "${idsCL[LightCyan]}	   [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% ($(IDS_NUMBER_FORMAT ${RPM})'RPM)]${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Default]}"
 				fi