voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-15 08:04:34 -06:00
parent 0dfaa86522
commit ef65cab082
4 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
VERS='2.5.25-12142023'
VERS='2.5.26-12152023'
noheader=' update service dailytemp confsync '

8
inc/power.inc.sh
View File

@@ -392,16 +392,12 @@ BATT VOLTAGE: ${BATTVOLT}'volts" 1
rm -f ${PW_TMPFOLDER}/power.ac.good
touch ${PW_TMPFOLDER}/power.ac.low
##### SHUTDOWN OFFSITE SERVER WHILE ITS AT MAINSITE
SHUTDOWN_SERVER 10.2.1.11 &
fi
# if [ ! -f ${PW_TMPFOLDER}/power.ac.conserve ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.low)) -ge $(echo "scale=0; ${PW_CONSERVE_AFTER}*60" | bc) ]; then
if [ ! -f ${PW_TMPFOLDER}/power.ac.conserve ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.low)) -ge 30 ]; then
echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Shutting down iSCSI VM's and Host to conserve power" >> ${PW_LOGPOWER}
SENDNOTICE "POWER ALERT - Conserving Power" "Shutting down iSCSI VM's and Host to conserve power" 1
SHUTDOWN_SERVER ${PW_HOST_IDRACS['iDS-vMS-Host0']} &
SHUTDOWN_SERVER ${PW_HOST_IDRACS['iDS-vMS-Host0']} -esxi off &
touch ${PW_TMPFOLDER}/power.ac.conserve
fi
fi
@@ -450,7 +446,7 @@ Shutting down main servers" 1
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'volts - Shutting down main servers..." >> ${PW_LOGPOWER}
SENDNOTICE "BATT-VOLT LOW: SHUTDOWN MAIN SERVERS" "Battery Voltage LOW: ${BATTVOLT}'volts
Shutting down main servers" 1
SHUTDOWN_MAIN POWER &
SHUTDOWN_MAIN POWER &
fi
volt_diff=`echo "scale=1; ${last_battvolt}-${BATTVOLT}" | bc`

2
inc/temp.inc.sh
View File

@@ -413,7 +413,7 @@ Previous Temp: ${last_temp[${SENSOR//-/}]}${GAUGESH}"
# elif [ ! -f ${PW_TMPFOLDER}/power.${SENSORa}.off ]; then
# SENDNOTICE "${SENSORa} TEMP CRITICAL" "Host system and VMs shutting down!!" 1
# SHUTDOWN_SERVER ${SENSORa} &
# SHUTDOWN_SERVER ${SENSORa} -esxi off &
# touch ${PW_TMPFOLDER}/power.${SENSORa}.off
fi

41
powerwall.sh
View File

@@ -80,16 +80,12 @@ CHECK_SERVICES(){
SHUTDOWN_MAIN(){
if [ "${1}" == "ServerRoomTH" ] || [ "${1}" == "TEMP" ]; then
# SHUTDOWN_SERVER MAIN ${1}
SHUTDOWN_SERVER main
# HOSTMGMT main -e off >/dev/null 2>&1
SHUTDOWN_SERVER main -esxi off
reason='Server Room Overheated!'
sendnotice=true
elif [ "${1}" == "POWER" ]; then
# SHUTDOWN_SERVER MAIN ${1}
SHUTDOWN_SERVER main
# HOSTMGMT main -e off >/dev/null 2>&1
SHUTDOWN_SERVER main -esxi off
reason='Low Power!'
sendnotice=true
@@ -107,16 +103,12 @@ ${reason}" 1
}
SHUTDOWN_SYS(){
if [ "${1}" == "ServerRoomTH" ] || [ "${1}" == "TEMP" ]; then
# SHUTDOWN_SERVER SYS ${1}
[ ! -f ${PW_TMPFOLDER}/shutdown.MAIN ] && SHUTDOWN_SERVER mainsite || SHUTDOWN_SERVER sys
# HOSTMGMT sys -e off >/dev/null 2>&1
[ ! -f ${PW_TMPFOLDER}/shutdown.MAIN ] && SHUTDOWN_SERVER mainsite -esxi off || SHUTDOWN_SERVER sys -esxi off
reason='Server Room Overheated!'
sendnotice=true
elif [ "${1}" == "POWER" ]; then
# SHUTDOWN_SERVER SYS ${1}
[ ! -f ${PW_TMPFOLDER}/shutdown.MAIN ] && SHUTDOWN_SERVER mainsite || SHUTDOWN_SERVER sys
# HOSTMGMT sys -e off >/dev/null 2>&1
[ ! -f ${PW_TMPFOLDER}/shutdown.MAIN ] && SHUTDOWN_SERVER mainsite -esxi off || SHUTDOWN_SERVER sys -esxi off
reason='Low Power!'
sendnotice=true
@@ -161,7 +153,7 @@ SHUTDOWN_OFFSITE(){
if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then
SENDNOTICE "OFFSITE SHUTDOWN - POWER OFF/LOW!!" "Shutting down offsite host(s)" 1
for offsite_host in "${PW_OFFSITEHOSTS[@]}"; do
SHUTDOWN_SERVER ${offsite_host} &
SHUTDOWN_SERVER ${offsite_host} -esxi off &
done
fi
}
@@ -205,7 +197,6 @@ SHUTDOWN_SERVER(){
hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
fi
fi
[ "${2}" == "maintenance" ] && MM=1 || MM=0
while [ $# -gt 0 ]; do
case "$1" in
-p|-power) POWER=${2}; MODE="power";;
@@ -222,6 +213,7 @@ SHUTDOWN_SERVER(){
esac
shift 1
done
([ "${ESXI,,}" == "maint" ] || [ "${ESXI,,}" == "maintenance" ] || [ "${ESXI,,}" == "mm" ]) && MM=1 || MM=0
if [ ${MN} -eq 1 ]; then
ESXI_HOSTS=PW_${ESXI_HOST}HOSTS[@]
@@ -533,25 +525,21 @@ HOSTMGMT(){
if [ "${MODE}" == "esxi" ]; then
if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "OFFSITE" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "SYS" ]; then
if [ "${ESXI,,}" == "maint" ] || [ "${ESXI,,}" == "maintenance" ] || [ "${ESXI,,}" == "mm" ]; then
if [ ${MN} -eq 1 ]; then
echo -e "${idsCL[LightGreen]}PUTTING '${ESXI_HOST}' HOSTS INTO MAINTENANCE MODE${idsCL[Default]}\n"
# SHUTDOWN_SERVER ${ESXI_HOST,,} maintenance
SHUTDOWN_SERVER ${ESXI_HOST,,} maintenance
SHUTDOWN_SERVER ${ESXI_HOST,,} -esxi maintenance
else
echo -e "${idsCL[LightGreen]}SHUTTING DOWN '${ESXI_HOST}' HOSTS${idsCL[Default]}\n"
# SHUTDOWN_SERVER ${ESXI_HOST,,}
SHUTDOWN_SERVER ${ESXI_HOST,,}
SHUTDOWN_SERVER ${ESXI_HOST,,} -esxi off
fi
else
if [ "${ESXI,,}" == "maint" ] || [ "${ESXI,,}" == "maintenance" ] || [ "${ESXI,,}" == "mm" ]; then
if [ ${MN} -eq 1 ]; then
echo -e "${idsCL[LightGreen]}PUTTING '${ESXI_HOST}' HOST INTO MAINTENANCE MODE${idsCL[Default]}\n"
# SHUTDOWN_SERVER ${HOST} maintenance
SHUTDOWN_SERVER ${HOST} maintenance
SHUTDOWN_SERVER ${HOST} -esxi maintenance
else
echo -e "${idsCL[LightGreen]}SHUTTING DOWN HOST${idsCL[Default]}\n"
# SHUTDOWN_SERVER ${HOST}
SHUTDOWN_SERVER ${HOST}
SHUTDOWN_SERVER ${HOST} -esxi off
fi
fi
@@ -913,10 +901,7 @@ fi
iscsi-vm-shutdown)
[ "${2^^}" == "SYS" ] && ISCSISYSVMSHUTDOWN || ISCSIVMSHUTDOWN
;;
shutdownhost) SHUTDOWN_SERVER ${2} ${3};;
shutdowntest) SHUTDOWN_SERVER ${2} ${3};;
shutdown_servers) SHUTDOWN_SERVER ${2} ${3};;
shutdownhost) SHUTDOWN_SERVER ${2} ${3} ${4} ${5};;
hostpower) HOSTPOWER ${2} ${3};;
host) HOSTMGMT ${2} ${3} ${4} ${5} ${6} ${7};;