From 2050e9487f0bed84a2061bb1f791e1180ef15a8e Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 6 Nov 2023 21:57:14 -0600
Subject: [PATCH] update

---
 defaults.inc |  5 +++--
 powerwall.sh | 26 +++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 4b2392c1..3745f254 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -65,10 +65,11 @@ PW_SENSOR_ID['Powerwall-CPU']='6'
 PW_SENSOR_ID['OctoPI-CPU']='7'
 PW_SENSOR_ID['iDS-vMS-Host0']='8'
 PW_SENSOR_ID['iDS-vMS-Host1']='9'
-# PW_SENSOR_ID['iDS-vMS-Host2']='10'
-PW_SENSOR_ID['OFF-vMS-Host1']='10'
 PW_SENSOR_ID['iDS-vMS-Host6']='13'
 PW_SENSOR_ID['iDS-vMS-Host7']='11'
+PW_SENSOR_ID['OFF-vMS-Host1']='10'
+
+# PW_SENSOR_ID['iDS-vMS-Host2']='10'
 # PW_SENSOR_ID['vMS-iDrac8']='12'
 
 declare -A PW_HOST_IDRACS
diff --git a/powerwall.sh b/powerwall.sh
index e119700c..f70c481c 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -652,8 +652,8 @@ CHECKPOWER(){
 				gochk=1
 			fi
 			if [ ${gochk} -eq 1 ]; then
-				HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //')
-				if [ "${HOST_WATTS}" = "" ]; then
+				# HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //')
+				# if [ "${HOST_WATTS}" = "" ]; then
 					HOST_WATT_SENSORS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 -O vq | sed -e 's/"//g')
 					IFS=$'\n'
 					read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}"
@@ -663,7 +663,7 @@ CHECKPOWER(){
 						[[ "${ss}" = *"System Board"* ]] && break || ((s++))
 					done				
 					HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //')
-				fi
+				# fi
 				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
 				echo -e "${idsCL[LightCyan]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}"
 			fi
@@ -911,6 +911,26 @@ POWERLOGGER_SERVICE(){
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
 		
+		for SENSOR in ${PW_SENSOR_ORD[@]}; do
+			if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
+				# HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //')
+				# if [ "${HOST_WATTS}" = "" ]; then
+					HOST_WATT_SENSORS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 -O vq | sed -e 's/"//g')
+					IFS=$'\n'
+					read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}"
+					unset IFS
+					s=1
+					for ss in "${HOST_WATT_SENSORS[@]}"; do
+						[[ "${ss}" = *"System Board"* ]] && break || ((s++))
+					done				
+					HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //')
+				# fi
+				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
+				echo -e "${idsCL[LightCyan]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}"
+			fi
+		done		
+		
+		
 		if [ "$(compgen -G "${PW_TMPFOLDER}/temp.*")" != "" ] || [ "$(compgen -G "${PW_TMPFOLDER}/power.*")" != "" ]; then
 			sleep 1m
 		else