diff --git a/powerwall.sh b/powerwall.sh index d19e7535..9eb019a3 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -755,11 +755,6 @@ Shutting down all servers" 1 OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc` OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //') - # OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //') - # OFFSITE_VOLTIN=`echo "scale=2; ${OFFSITE_VOLTIN}/10" | bc` - # OFFSITE_BATT_RUNTIME=$(snmpwalk -t 1 -r 0 -v 1 -c public 10.2.1.100 iso.3.6.1.2.1.33.1.2.3.0 | sed 's/.*: //') - # OFFSITE_BATT_CAP=$(snmpwalk -t 1 -r 0 -v 1 -c public 10.2.1.100 iso.3.6.1.2.1.33.1.2.4.0 | 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} @@ -767,6 +762,18 @@ Shutting down all servers" 1 SENDNOTICE "OFFSITE POWER NOMINAL AGAIN" "Normal voltage detected VOLTAGE: ${OFFSITE_VOLTIN}'Volts" rm -f ${PW_TMPFOLDER}/power.offsite.* + + elif [ -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 + 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 @@ -781,8 +788,10 @@ BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1 touch ${PW_TMPFOLDER}/power.offsite.ac.low fi - if (( $(bc <<<"${OFFSITE_BATT_CAP} <= 70") )); then - [ ! -f ${PW_TMPFOLDER}/power.offsite.off ] && SHUTDOWN_OFFSITE & + if (( $(bc <<<"${OFFSITE_BATT_CAP} <= 95") )) && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then + SHUTDOWN_OFFSITE & + touch ${PW_TMPFOLDER}/power.offsite.off + rm -f ${PW_TMPFOLDER}/power.offsite.ac.low fi fi