From 6327319006016f53c1b5c65d0e71962865e6444e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 21 Jun 2025 18:01:12 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 44534f43..9ef0cd1c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.10.26-06212025' +PW_VERS='2.10.28-06212025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 84e8d6a1..7c7e89ea 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -677,7 +677,7 @@ CHECKPOWER(){ AD=$(IDS_NUMBER_FORMAT ${HOST_AMPS} 1 true); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done HOST_WATTS_disp="${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W" - elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" chassis power status | grep off)" != "" ]; then + elif [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" chassis power status | grep off)" != "" ]; then HOST_WATTS_disp="${idsCL[LightRed]}Host powered down" HOST_WATTS=-1 elif [ "${HOST_WATTS}" = "0" ]; then @@ -1355,7 +1355,6 @@ POWERLOGGER_SERVICE(){ for SENSOR in ${PW_SENSOR_ORD[@]}; do [[ "${PW_HOST_IDRACS[${SENSOR}]}" = "10.6."* ]] && ESXI_PASS=${PW_ESXI_PASS_KP} || ESXI_PASS=${PW_ESXI_PASS} - echo "HERE:1: ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P ${ESXI_PASS}" if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${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 @@ -1447,7 +1446,6 @@ POWERLOGGER_SERVICE(){ for SENSOR in ${PW_SENSOR_ORD[@]}; do [[ "${PW_HOST_IDRACS[${SENSOR}]}" = "10.6."* ]] && ESXI_PASS=${PW_ESXI_PASS_KP} || ESXI_PASS=${PW_ESXI_PASS} - echo "HERE:2: ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P ${ESXI_PASS}" if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${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