diff --git a/powerwall.sh b/powerwall.sh index 1ee0cce2..53afdaaf 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -546,14 +546,14 @@ CHECKPOWER(){ start=`date +%s` rm -f ${PW_TMPFOLDER}/*.hostpower* - if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then - for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then - GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} & - fi - done - check_GETHOSTPOWER & - fi + # if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then + # for SENSOR in ${PW_SENSOR_ORD[@]}; do + # if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then + # GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} & + # fi + # done + # check_GETHOSTPOWER & + # fi if [ "${1}" == "" ] || [ "${1}" == "sensors" ]; then DIVIDER . yellow 75 @@ -661,6 +661,17 @@ CHECKPOWER(){ DIVIDER . yellow 75 if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then + + for SENSOR in ${PW_SENSOR_ORD[@]}; do + if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ "$(CHECK_HOST ${PW_HOST_IDRACS[${SENSOR}]})" != "false" ]; then + 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/.*: //') + else + HOST_WATTS='Host offline' + fi + echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} ${idsCL[Default]}: ${HOST_WATTS}${idsCL[Default]}" + done + + finalcheck="" until [ "${finalcheck}" != "" ]; do for hostfile in ${PW_TMPFOLDER}/*.hostpower; do @@ -678,9 +689,6 @@ 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]}" - mv ${hostfile} ${hostfile}.done elif [ "${host}" == "done" ]; then