diff --git a/powerwall.sh b/powerwall.sh index d9b17b3f..c7f6d77e 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -505,15 +505,15 @@ DAILYTEMP(){ } GETHOSTPOWER(){ - if [ "$(CHECK_HOST ${1})" != "false" ]; then + # if [ "$(CHECK_HOST ${1})" != "false" ]; then if [ "${1}" == "10.10.2.26" ]; then temp=0 else temp=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${1} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Pwr" | awk '/ / {print $6}' | sed -e 's/Watts//g' 2>&1) fi - else - temp=down - fi + # else + # temp=down + # fi echo ${temp} >| ${PW_TMPFOLDER}/${1}.hostpower } check_GETHOSTPOWER(){ @@ -530,6 +530,7 @@ check_GETHOSTPOWER(){ CHECKPOWER(){ + start=`date +%s` for SENSOR in ${PW_SENSOR_ORD[@]}; do if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} & @@ -537,29 +538,38 @@ CHECKPOWER(){ done check_GETHOSTPOWER & - INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json") - INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` - INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` - OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'` - OUTPUTV2=`echo "scale=1; ${OUTPUTV}/2" | bc` - OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` - BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` - BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` - - 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_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` + # if [ "$(CHECK_HOST inv1.scity.us)" != "false" ]; then + INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json") + INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` + INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` + OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'` + OUTPUTV2=`echo "scale=1; ${OUTPUTV}/2" | bc` + OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` + BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` + BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` + # fi - 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/.*: //') - APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` - - NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` - NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` + # 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_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 - VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc` + # if [ "$(CHECK_HOST 10.10.1.210)" != "false" ]; then + 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/.*: //') + APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` + # fi + + # if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then + # 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` + # fi + VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc` + # fi echo echo -e "${idsCL[Yellow]}Power Information" @@ -580,17 +590,6 @@ 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} W${idsCL[Default]}" echo - # for SENSOR in ${PW_SENSOR_ORD[@]}; do - # if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then - # checked="" - # until [ "${checked}" != "" ]; do - # [ -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower ] && checked=good - # done - # watts=$(cat ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower) - # echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${PW_HOST_IDRACS[${SENSOR}]}]}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}" - # rm -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower - # fi - # done until [ "${checked}" != "" ]; do for hostfile in ${PW_TMPFOLDER}/*.hostpower; do @@ -612,7 +611,8 @@ CHECKPOWER(){ fi done done - + + end=`date +%s`; runtime=$((end-start)); echo -e "\nruntime: ${runtime}" [ "${action}" != "" ] && echo }