From 88060767ef01b7d8e7cb54a77c404396372ab423 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 29 Nov 2023 21:41:45 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index d83a5521..cf6e54dd 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -592,7 +592,7 @@ CHECKPOWER(){ # if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then APCPDU_AMP=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //') APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | bc` - # APCPDU_WATT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //') + APCPDU_WATT2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //') APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` [[ "${APCPDU_WATT}" == *"."* ]] && [[ "${APCPDU_WATT}" != *".0"* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}` # fi @@ -605,7 +605,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate${average_disp}${idsCL[Default]}" + echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate (${APCPDU_WATT2})${average_disp}${idsCL[Default]}" echo if [ "${SVRRM_VOLT}" != "" ]; then