diff --git a/defaults.inc b/defaults.inc index 89abe4e6..13a07d72 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.2.73-10172023' +VERS='2.2.74-10172023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index 0b75c5f0..edf44e76 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -27,9 +27,7 @@ CHECKTEMP(){ if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]} - vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]} - echo "vhostip=${vHOSTIP}" - + vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]} vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTiDRACIP}]} echo -e "\r\033[K${idsCL[LightCyan]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[LightCyan]}- ${vHOSTiDRACIP}${idsCL[Default]}" # echo -en "${idsCL[Yellow]}Pulling data and calculating averages for '${SENSOR}' ..." @@ -178,7 +176,8 @@ CHECKTEMP_SERVICE(){ logtime=$(expr `date +%s` - $(stat -c %Y ${logtemp})) [ ${logtime} -ge 3600 ] && relog=1 || relog=0 - if [ "${PW_REMOTE_SENSORS[${SENSORa}]}" == "" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ]); then + 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 [ -f ${PW_TMPFOLDER}/${SENSORa}.down ]; then SENDNOTICE "${SENSORa} Online" "${SENSORa} Sensor is back online" echo "($datetime) - ${SENSORa} - Sensor is back online" >> ${logtemp}