From 23edf8bf621f727904e5bd141ba98d69f6c45a84 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 5 Nov 2023 22:20:45 -0600
Subject: [PATCH] update

---
 offsite-power-check.sh |  18 ++++----
 powerwall.sh           | 100 ++++++++++++++++++++---------------------
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/offsite-power-check.sh b/offsite-power-check.sh
index 3c44c8ec..d92e3879 100755
--- a/offsite-power-check.sh
+++ b/offsite-power-check.sh
@@ -10,17 +10,17 @@ PW_TMPFOLDER=${PW_FOLDER}/.tmp
 
 . /opt/idssys/powerwall/settings.conf
 
-SHUTDOWNSERVERS_AT_LOAD=70	#percent
-WAIT_TO_POWER_SERVERS=5		#minutes
-LOG_INTERVAL_NORMAL=60		#minutes
-LOG_INTERVAL_ABNORMAL=5		#minutes
+SHUTDOWNSERVERS_AT_LOAD=	70	#percent
+WAIT_TO_POWER_SERVERS=		5	#minutes
+LOG_INTERVAL_NORMAL=		60	#minutes
+LOG_INTERVAL_ABNORMAL=		5	#minutes
 
-# TEST=true  #full
+TEST=true  #full
 if [ "$TEST" != "" ]; then
-	SHUTDOWNSERVERS_AT_LOAD=95	#percent
-	WAIT_TO_POWER_SERVERS=1		#minutes
-	LOG_INTERVAL_NORMAL=1		#minutes
-	LOG_INTERVAL_ABNORMAL=1		#minutes
+	SHUTDOWNSERVERS_AT_LOAD=	95
+	WAIT_TO_POWER_SERVERS=		1
+	LOG_INTERVAL_NORMAL=		1
+	LOG_INTERVAL_ABNORMAL=		1
 	TESTMODE="### TEST MODE ACTIVE ###
 	
 	"
diff --git a/powerwall.sh b/powerwall.sh
index 15812024..a237556b 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -748,56 +748,56 @@ Shutting down all servers" 1
 		
 		######offsite check
 		
-		if [ "$(CHECK_HOST 10.2.1.1)" != "false" ]; then
-			upsinfo=$(ssh admin@10.2.1.1 'upsc CP1500PFCLCD')
-			OFFSITE_VOLTIN=$(echo "${upsinfo}" | grep 'input.voltage:' | sed 's/.*: //')
-			OFFSITE_BATT_RUNTIME=$(echo "${upsinfo}" | grep 'battery.runtime:' | sed 's/.*: //')
-			OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc`
-			OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //')
-			
-			if (( $(bc <<<"${OFFSITE_VOLTIN} >= ${min_acvolt}") )); then
-				if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Back to Normal Voltage" >> ${PW_LOGPOWER}
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
-					SENDNOTICE "OFFSITE POWER NOMINAL AGAIN" "Normal voltage detected
-VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
-					rm -f ${PW_TMPFOLDER}/power.offsite.ac.*
-				fi
-				if [ -f ${PW_TMPFOLDER}/power.offsite.off ]; then
-					if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then
-						touch ${PW_TMPFOLDER}/power.offsite.restored
-						
-					elif [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.restored)) -ge 60 ]; then
-						SENDNOTICE "OFFSITE HOST POWER" "Powering offsite host(s) back on after power was restored"
-						for offsite_host in "${PW_OFFSITEHOSTS[@]}"; do
-							HOSTPOWER ${offsite_host} on >/dev/null 2>&1
-						done
-						rm -f ${PW_TMPFOLDER}/power.offsite.*
-					fi
-					
-				else
-					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -le 300 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Normal Voltage" >> ${PW_LOGPOWER}
-				fi
-			else
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGFILE}
-				
-				if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 240 ]; then
-					SENDNOTICE "OFFSITE POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected
-BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent)
-BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1
-					touch ${PW_TMPFOLDER}/power.offsite.ac.low
-				fi
-				
-				if (( $(bc <<<"${OFFSITE_BATT_CAP} <= 95") )) && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then
-					SENDNOTICE "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1
-					SHUTDOWN_OFFSITE &
-					touch ${PW_TMPFOLDER}/power.offsite.off
-				fi
-			fi
-			
-			
-		fi
+# 		if [ "$(CHECK_HOST 10.2.1.1)" != "false" ]; then
+# 			upsinfo=$(ssh admin@10.2.1.1 'upsc CP1500PFCLCD')
+# 			OFFSITE_VOLTIN=$(echo "${upsinfo}" | grep 'input.voltage:' | sed 's/.*: //')
+# 			OFFSITE_BATT_RUNTIME=$(echo "${upsinfo}" | grep 'battery.runtime:' | sed 's/.*: //')
+# 			OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc`
+# 			OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //')
+#
+# 			if (( $(bc <<<"${OFFSITE_VOLTIN} >= ${min_acvolt}") )); then
+# 				if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then
+# 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Back to Normal Voltage" >> ${PW_LOGPOWER}
+# 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
+# 					SENDNOTICE "OFFSITE POWER NOMINAL AGAIN" "Normal voltage detected
+# VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
+# 					rm -f ${PW_TMPFOLDER}/power.offsite.ac.*
+# 				fi
+# 				if [ -f ${PW_TMPFOLDER}/power.offsite.off ]; then
+# 					if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then
+# 						touch ${PW_TMPFOLDER}/power.offsite.restored
+#
+# 					elif [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.restored)) -ge 60 ]; then
+# 						SENDNOTICE "OFFSITE HOST POWER" "Powering offsite host(s) back on after power was restored"
+# 						for offsite_host in "${PW_OFFSITEHOSTS[@]}"; do
+# 							HOSTPOWER ${offsite_host} on >/dev/null 2>&1
+# 						done
+# 						rm -f ${PW_TMPFOLDER}/power.offsite.*
+# 					fi
+#
+# 				else
+# 					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -le 300 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Normal Voltage" >> ${PW_LOGPOWER}
+# 				fi
+# 			else
+# 				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
+# 				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGFILE}
+#
+# 				if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 240 ]; then
+# 					SENDNOTICE "OFFSITE POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected
+# BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent)
+# BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1
+# 					touch ${PW_TMPFOLDER}/power.offsite.ac.low
+# 				fi
+#
+# 				if (( $(bc <<<"${OFFSITE_BATT_CAP} <= 95") )) && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then
+# 					SENDNOTICE "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1
+# 					SHUTDOWN_OFFSITE &
+# 					touch ${PW_TMPFOLDER}/power.offsite.off
+# 				fi
+# 			fi
+#
+#
+# 		fi
 		
 	    sleep 10s
 	done # &