diff --git a/powerwall.sh b/powerwall.sh index ab9bc317..93f3779e 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -507,6 +507,11 @@ DAILYTEMP(){ CHECKPOWER(){ + declare -A vHOSTPOWER + for ESXIHOST in "${!PW_iDRACHOST_SHORTNAMES[@]}"; do + [ "${ESXIHOST}" != "10.10.2.26" ] && vHOSTPOWER[${ESXIHOST}]=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${ESXIHOST} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Pwr" 2>&1) & + done + INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json") INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` @@ -551,12 +556,11 @@ CHECKPOWER(){ echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}" echo - for ESXIHOST in "${!PW_iDRACHOST_SHORTNAMES[@]}"; do - vHOSTPOWER=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${ESXIHOST} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Pwr" 2>&1) + for ESXIHOST in "${!vHOSTPOWER[@]}"; do if [ "${ESXIHOST}" == "10.10.2.26" ]; then watts=0 else - watts=$(echo ${vHOSTPOWER} | awk '/ / {print $6}' | sed -e 's/Watts//g') + watts=$(echo ${vHOSTPOWER[${ESXIHOST}]} | awk '/ / {print $6}' | sed -e 's/Watts//g') fi echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${ESXIHOST}]}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"