From eb7714dd8c71243180f3fff4f0618bbc42f66f3c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 5 Jan 2024 11:40:13 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 2 +- powerwall.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 0476bf44..f73d41cf 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.107-01052024' +VERS='2.5.108-01052024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 7b546d6f..fb5aa526 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -651,7 +651,7 @@ POWERLOGGER_SERVICE(){ fi for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then + if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ]; 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') if [[ "${HOST_WATTS}" != *"Timeout"* ]] && [ "${HOST_WATT_SENSORS}" != "" ]; then IFS=$'\n' diff --git a/powerwall.sh b/powerwall.sh index 94b75b38..82a596e6 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -310,7 +310,7 @@ SHUTDOWN_SERVER(){ if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ]; then ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 & sleep 10s - echo -e "${idsCL[Green]}Done${idsCL[Default]}" + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" else echo -e "${idsCL[Yellow]}Host Offline${idsCL[Default]}" fi