diff --git a/powerwall.sh b/powerwall.sh index 78452b17..f1e4b021 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -188,9 +188,7 @@ CHECKTEMP_SERVICE(){ [ ! -f ${logtemp} ] && touch ${logtemp} logtime=$(expr `date +%s` - $(stat -c %Y ${logtemp})) [ ${logtime} -ge 3600 ] && relog=1 || relog=0 - - echo "A: ${SENSORa} - ${PW_SENSOR_TYPE[${SENSORa}]} - ${PW_HOST_IDRACS[${SENSORa}]} - ${PW_HOST_ADDRESSES[${SENSORa}]}" - + if ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ]) || ([ "${PW_HOST_ADDRESSES[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_HOST_ADDRESSES[${SENSORa}]})" != "false" ]); then # if ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ]); then if [ -f ${PW_TMPFOLDER}/${SENSORa}.down ]; then @@ -199,7 +197,6 @@ CHECKTEMP_SERVICE(){ rm -f ${PW_TMPFOLDER}/${SENSORa}.down fi - if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then # unset IFS @@ -209,22 +206,15 @@ CHECKTEMP_SERVICE(){ # for i in ${SENSORS_CHECK[@]}; do echo $i; done - echo -en "H: ${PW_HOST_IDRACS[${SENSORa}]} = " # iDS-vMS-Offsite Fan Issue Workaround if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ]; then vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1) FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') - echo -en "${FanSpeed} - ${vHOSTFAN} = " if [ ${FanSpeed} -gt 90 ]; then - echo yes SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Workaround commands sent to set the Fans at 30(percent)" 1 ssh root@${PW_RACADM_ACCESS} "ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P '${PW_ESXI_PASS}' raw 0x30 0x30 0x01 0x00" ssh root@${PW_RACADM_ACCESS} "ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P '${PW_ESXI_PASS}' raw 0x30 0x30 0x02 0xff 0x1E" - else - echo no fi - else - echo fi else