From 00adae1aa7fd40caec3644aade22bedc4acecc00 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 29 Nov 2023 21:44:16 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/powerwall.sh b/powerwall.sh index cf6e54dd..91f33466 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -593,6 +593,7 @@ CHECKPOWER(){ 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_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_WATT2_disp=`printf "%'.0f\n" ${APCPDU_WATT2}` 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 +606,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate (${APCPDU_WATT2})${average_disp}${idsCL[Default]}" + echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate (${APCPDU_WATT2_disp} watts)${average_disp}${idsCL[Default]}" echo if [ "${SVRRM_VOLT}" != "" ]; then