diff --git a/powerwall.sh b/powerwall.sh index 8743024d..f994e368 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -515,6 +515,9 @@ CHECKPOWER(){ 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` + NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` + NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` + echo echo -e "${idsCL[Yellow]}Power Information" DIVIDER . yellow 75 @@ -523,12 +526,15 @@ CHECKPOWER(){ echo -e "${idsCL[LightCyan]}Inverter Output Power ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}V (${OUTPUTV2}V) / ${OUTPUTA}A (${OUTPUTA2}A @ ${OUTPUTV2}V)" echo -e "${idsCL[LightCyan]}Battery Power ${idsCL[Default]}: ${idsCL[Green]}${BATTV}V / ${BATTA}A ${idsCL[Default]}" echo - echo -e "${idsCL[LightCyan]}APC-PDU Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}APC-PDU Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT}W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT}W${idsCL[Default]}" + echo + echo -e "${idsCL[LightCyan]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT}W${idsCL[Default]}" echo echo -e "${idsCL[LightCyan]}ServerRoom Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}V${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}ServerRoom Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}ServerRoom Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}" [ "${action}" != "" ] && echo }