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

update

Browse Source
This commit is contained in:
David Schroeder
2025-07-12 09:49:56 -05:00
parent 2e64a7b023
commit b9a430ea78
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PW_VERS='2.11.8-07122025' PW_VERS='2.11.9-07122025'
noheader=' update service dailytemp confsync -r -report test ' noheader=' update service dailytemp confsync -r -report test '

4
inc/power.inc.sh
View File

@@ -1362,7 +1362,7 @@ POWERLOGGER_SERVICE(){
read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}" read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}"
unset IFS unset IFS
if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.disable ] || ([ -f ${PW_TMPFOLDER}/${SENSOR}.disable ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.disable)) -ge 120 ]); then if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.disable ] || ([ -f ${PW_TMPFOLDER}/${SENSOR}.disable ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.disable)) -ge 120 ]); then
[ -f ${PW_TMPFOLDER}/shutdown.${SENSOR} ] && rm -f ${PW_TMPFOLDER}/shutdown.${SENSOR} [ -f ${PW_TMPFOLDER}/${SENSOR}.shutdown ] && rm -f ${PW_TMPFOLDER}/${SENSOR}.shutdown
[ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL [ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL
[[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE [[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE
[[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE
@@ -1453,7 +1453,7 @@ POWERLOGGER_SERVICE(){
read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}" read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}"
unset IFS unset IFS
if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.disable ] || ([ -f ${PW_TMPFOLDER}/${SENSOR}.disable ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.disable)) -ge 120 ]); then if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.disable ] || ([ -f ${PW_TMPFOLDER}/${SENSOR}.disable ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.disable)) -ge 120 ]); then
[ -f ${PW_TMPFOLDER}/shutdown.${SENSOR} ] && rm -f ${PW_TMPFOLDER}/shutdown.${SENSOR} [ -f ${PW_TMPFOLDER}/${SENSOR}.shutdown ] && rm -f ${PW_TMPFOLDER}/${SENSOR}.shutdown
[ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL [ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL
[[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE [[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE
[[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE

2
inc/temp.inc.sh
View File

@@ -921,7 +921,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
SENDNOTICE "${SENSOR_DESC} Data" "${SENSORa} is reporting data again" SENDNOTICE "${SENSOR_DESC} Data" "${SENSORa} is reporting data again"
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} - Sensor is reporting data again" >> ${logtemp} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} - Sensor is reporting data again" >> ${logtemp}
fi fi
rm -f ${PW_TMPFOLDER}/*${SENSORa}* rm -f ${PW_TMPFOLDER}/${SENSORa}*
[ "${PW_ESXI_DEF_EXHAUST_MIN}" != "" ] && ESXI_DEFAULT_EXHAUST_MIN=${PW_ESXI_DEF_EXHAUST_MIN} [ "${PW_ESXI_DEF_EXHAUST_MIN}" != "" ] && ESXI_DEFAULT_EXHAUST_MIN=${PW_ESXI_DEF_EXHAUST_MIN}
[ "${SENSOR}" == "iDS-vMS-Host7" ] && ESXI_DEFAULT_EXHAUST_MIN=$(bc <<< "scale=2; ${ESXI_DEFAULT_EXHAUST_MIN}+${PW_ESXI_HOST7_FAN_DIFF}") [ "${SENSOR}" == "iDS-vMS-Host7" ] && ESXI_DEFAULT_EXHAUST_MIN=$(bc <<< "scale=2; ${ESXI_DEFAULT_EXHAUST_MIN}+${PW_ESXI_HOST7_FAN_DIFF}")
GL_HIGH=$(bc <<< "scale=2; ${ESXI_DEFAULT_EXHAUST_MIN}+${ESXI_FANSPEED_GL_ZONE}") GL_HIGH=$(bc <<< "scale=2; ${ESXI_DEFAULT_EXHAUST_MIN}+${ESXI_FANSPEED_GL_ZONE}")

10
powerwall.sh
View File

@@ -500,11 +500,11 @@ SHUTDOWN_SERVER(){
fi fi
[ "${ESXI_HOST}" != "${PW_MAIN_ISCSI}" ] && echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be shutdown momentarily ... \n" [ "${ESXI_HOST}" != "${PW_MAIN_ISCSI}" ] && echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be shutdown momentarily ... \n"
touch ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown
touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.disable touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.disable
else else
echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be in maintenance mode momentarily ... \n" echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be in maintenance mode momentarily ... \n"
touch ${PW_TMPFOLDER}/maintmode.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.maintmode
fi fi
## DECREASE CPU OVERCOMMIT ## DECREASE CPU OVERCOMMIT
@@ -665,7 +665,7 @@ HOSTMGMT(){
elif [ "${MODE}" == "power" ]; then elif [ "${MODE}" == "power" ]; then
if [ ${MN} -eq 1 ]; then if [ ${MN} -eq 1 ]; then
[ -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} [ -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown ] && rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown
# if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]); then # if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]); then
# HOSTPOWER ${PW_MAIN_ISCSI} on # HOSTPOWER ${PW_MAIN_ISCSI} on
@@ -675,7 +675,7 @@ HOSTMGMT(){
var=PW_${ESXI_HOST}HOSTS[@]; v=1 var=PW_${ESXI_HOST}HOSTS[@]; v=1
for vhost in "${!var}"; do for vhost in "${!var}"; do
HOSTPOWER ${vhost} ${POWER} HOSTPOWER ${vhost} ${POWER}
[ -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${vhost}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${vhost}]} [ -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${vhost}]}.shutdown ] && rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${vhost}]}.shutdown
sleep 3s sleep 3s
done done
@@ -693,7 +693,7 @@ HOSTMGMT(){
# fi # fi
else else
HOSTPOWER ${ESXI_HOST} ${POWER} HOSTPOWER ${ESXI_HOST} ${POWER}
[ -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} [ -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown ] && rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}.shutdown
fi fi
fi fi
echo echo