From 3f039bb2b3def763e922f6d5ca32fdcb28255eb5 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 4 Nov 2023 09:30:25 -0500 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 4e2b4375..9d2e02b3 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -625,32 +625,33 @@ CHECKPOWER(){ 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_disp}'W${idsCL[Default]}" echo - fi - - ######## - - DIVIDER . yellow 75 - echo -e "${idsCL[Yellow]}Offsite Power Information" - DIVIDER . yellow 75 - - if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then - OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //') - OFFSITE_VOLTIN=`echo "scale=2; ${OFFSITE_VOLTIN}/10" | bc` - OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //') - OFFSITE_VOLTOUT=`echo "scale=2; ${OFFSITE_VOLTOUT}/10" | bc` - OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //') - OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc` - OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*900" | bc` - OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc` - fi + ######## - echo -e "${idsCL[LightCyan]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'V${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'V${idsCL[Default]}" - echo - echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'A ~ estimate${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'W ~ estimate${idsCL[Default]}" - echo + DIVIDER . yellow 75 + echo -e "${idsCL[Yellow]}Offsite Power Information" + DIVIDER . yellow 75 + + if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then + OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //') + OFFSITE_VOLTIN=`echo "scale=2; ${OFFSITE_VOLTIN}/10" | bc` + OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //') + OFFSITE_VOLTOUT=`echo "scale=2; ${OFFSITE_VOLTOUT}/10" | bc` + OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //') + OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc` + OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*900" | bc` + OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc` + + fi + + echo -e "${idsCL[LightCyan]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'V${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'V${idsCL[Default]}" + echo + echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'A ~ estimate${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'W ~ estimate${idsCL[Default]}" + echo + + fi ######## @@ -677,8 +678,8 @@ CHECKPOWER(){ fi echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} ${idsCL[Default]}: ${hostpower}${idsCL[Default]}" - HOST_WATTS=$(snmpwalk -v 1 -c public ${host} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //') - echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} SNMP ${idsCL[Default]}: ${HOST_WATTS}${idsCL[Default]}" + # HOST_WATTS=$(snmpwalk -v 1 -c public ${host} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //') + # echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} SNMP ${idsCL[Default]}: ${HOST_WATTS}${idsCL[Default]}" mv ${hostfile} ${hostfile}.done