From db7e75cfcde8e12f8be5cb6b32b1c169725ba74f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 31 Oct 2023 11:19:45 -0500 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 54e946c8..16a10f6a 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -565,20 +565,20 @@ CHECKPOWER(){ echo -e "${idsCL[Yellow]}Power Information" DIVIDER . yellow 75 - echo -e "${idsCL[LightCyan]}Inverter Input Power ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}V / ${INPUTA}A" - 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 -e "${idsCL[LightCyan]}Inverter Input Power ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}V / ${INPUTA} A" + 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]}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 -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]}${NETRK_AMP}A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP} A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT} W${idsCL[Default]}" echo - echo -e "${idsCL[LightCyan]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}V${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP}V${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]}" + echo -e "${idsCL[LightCyan]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT} V${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP} V${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]}" echo # for SENSOR in ${PW_SENSOR_ORD[@]}; do # if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then @@ -598,8 +598,10 @@ CHECKPOWER(){ host=${hostfile%.*}; host=${host##*/} if [ "${host}" != "*" ] && [ "${host}" != "done" ]; then watts=$(cat ${hostfile}) - echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${host}]}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}" - # echo -e "${idsCL[LightCyan]}HOST '${host}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}" + if [ "${watts}" == "down" ]; then hostpower="${idsCL[Red]}Host Offline" + elif [ "${watts}" == "0" ]; then hostpower="${idsCL[Default]}n/a" + else hostpower="${idsCL[Green]}${watts} W" + echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${host}]}' ${idsCL[Default]}: ${hostpower}${idsCL[Default]}" mv ${hostfile} ${hostfile}.done elif [ "${host}" == "done" ]; then @@ -789,6 +791,7 @@ POWERLOGGER_SERVICE(){ 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` + APCPDU_AMP=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //') 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/.*: //')