From 98c8055ed6a4d600051a63bf2ddee365111f707b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 31 Oct 2023 13:25:55 -0500 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/powerwall.sh b/powerwall.sh index 18a7a3f2..bb1aa0ed 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -551,6 +551,7 @@ CHECKPOWER(){ OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` OUTPUTA2=`echo "scale=1; ${OUTPUTA}*2" | bc` OUTPUTW=`echo ${INVSTATSINFO} | jq '.outputs .outW'` + OUTPUTW=`printf "%'.3f\n" ${OUTPUTW}` BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` fi @@ -569,6 +570,7 @@ CHECKPOWER(){ if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //') SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.4.1 | sed 's/.*: //') + SVRRM_WATT=`printf "%'.3f\n" ${SVRRM_WATT}` SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.3.1 | sed 's/.*: //') SVRRM_AMP=`echo "scale=1; ${SVRRM_AMP}/10" | bc` fi @@ -578,6 +580,7 @@ CHECKPOWER(){ APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc` # APCPDU_WATT=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //') APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` + APCPDU_WATT=`printf "%'.3f\n" ${APCPDU_WATT}` fi echo -e "${idsCL[LightCyan]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A${idsCL[Default]}" @@ -588,6 +591,7 @@ CHECKPOWER(){ if [ "$(CHECK_HOST 10.10.1.210)" != "false" ]; then NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` + NETRK_WATT=`printf "%'.3f\n" ${NETRK_WATT}` fi VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc` fi @@ -610,7 +614,7 @@ CHECKPOWER(){ if [ -f ${hostfile} ] && [ "${hostfile}" != "${PW_TMPFOLDER}/*.hostpower" ]; then host=${hostfile%.*}; host=${host##*/} if [ "${host}" != "*" ] && [ "${host}" != "done" ]; then - watts=$(cat ${hostfile}) + watts=`printf "%'.3f\n" $(cat ${hostfile}) if [ "${watts}" == "down" ]; then hostpower="${idsCL[Red]}Host Offline" elif [ "${watts}" == "0" ]; then hostpower="${idsCL[Default]}n/a" else hostpower="${idsCL[Green]}${watts}'W"