From d82ea9c28f32bf863aa4309468defcea8a2548b8 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 1 Jun 2024 13:03:37 -0500
Subject: [PATCH] update

---
 inc/temp.inc.sh |  6 +-----
 powerwall.sh    | 12 +++---------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 08039360..9646a61f 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -2,11 +2,7 @@ GET_HOST_FANSPEED(){
 	if [ -f ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]} ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})) -lt 600 ] && ([ ! -f ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]}.set ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})) -lt $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]}.set)) ]); then
 		FanSpeed=$(cat ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})
 	else
- 		# vHOSTFAN=$(ssh -q -o ConnectTimeout=3 -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)
- 		vHOSTFANS=$(ssh -q -o ConnectTimeout=3 -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 Fan" 2>&1)
-		
-		
-		
+ 		vHOSTFAN=$(ssh -q -o ConnectTimeout=3 -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
  			FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $9}' | sed -e 's/%//g')
  		else
diff --git a/powerwall.sh b/powerwall.sh
index 9705d9fb..1502737a 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -909,15 +909,9 @@ fi
 			#SENDTEMP ${2}
 			# OFFSITE_SENDPOWER "OFFSITE POWER Service Startup TEST"
 			#AVERAGETEMP "ServerRoomTH" ${2}
-	 		vHOSTFANS=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r 10.10.2.27 -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan" 2>&1)
-			for vHOSTFAN in "${vHOSTFANS[@]}"; do
-				echo "${vHOSTFAN}" | awk '/ / {print $5}'
-				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
-				echo "${FanSpeed}"
+	 		RPMs=$(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1 -O vq)
+			for RPM in "${RPMs[@]}"; do
+				echo ${RPM}
 			done