diff --git a/defaults.inc b/defaults.inc index d10f0c44..07e63e9e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.2.72-10162023' +VERS='2.2.73-10172023' noheader=' update service dailytemp ' @@ -81,6 +81,15 @@ PW_HOST_IDRACS['vMS-iDrac7']='10.10.2.27' # PW_HOST_IDRACS['vMS-iDrac8']='10.2.1.28' PW_HOST_IDRACS['vMS-Offsite-iDrac1']='10.10.2.22' +declare -A PW_HOST_ADDRESSES +PW_HOST_IDRACS['vMS-iDrac0']='10.10.2.10' +PW_HOST_IDRACS['vMS-iDrac1']='10.10.2.11' +# PW_HOST_IDRACS['vMS-iDrac2']='10.10.2.12' +PW_HOST_IDRACS['vMS-iDrac6']='10.10.2.16' +PW_HOST_IDRACS['vMS-iDrac7']='10.10.2.17' +# PW_HOST_IDRACS['vMS-iDrac8']='10.2.1.18' +PW_HOST_IDRACS['vMS-Offsite-iDrac1']='10.2.1.11' + declare -A PW_ESXI_HOST_NAMES PW_ESXI_HOST_NAMES['10.10.2.10']='iDS-vMS-scsi.scity.us' PW_ESXI_HOST_NAMES['10.10.2.11']='iDS-vMS1.scity.us' diff --git a/powerwall.sh b/powerwall.sh index 47b76de5..f433f1d2 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -26,14 +26,16 @@ CHECKTEMP(){ if [ "${1}" == "" ] || [[ "${SENSOR}" = *"${1}"* ]]; then if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then - vHOSTIP=${PW_HOST_IDRACS[${SENSOR}]} - vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTIP}]} - echo -e "\r\033[K${idsCL[LightCyan]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[LightCyan]}- ${vHOSTIP}${idsCL[Default]}" + vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]} + 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}' ..." echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ..." if [ "$(CHECK_HOST ${vHOSTIP})" != "false" ]; then - vHOSTDATA=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${vHOSTIP} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep " Temp" 2>&1) + vHOSTDATA=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${vHOSTiDRACIP} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep " Temp" 2>&1) IFS=$'\n' read -rd '' -a vHOSTDATA <<<"${vHOSTDATA}"; unset IFS echo -en "\r\033[K" if [ ${#vHOSTDATA[@]} > 1 ]; then @@ -55,8 +57,8 @@ CHECKTEMP(){ echo -e "\r\033[K${idsCL[Red]}${SENSOR} Host is down" # if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/${SENSOR}.down)) -ge 1800 ]; then - # SENDNOTICE "${vHOSTIP} ERROR" "${vHOSTNAME} Host is down" 1 - # echo "($datetime) - ${vHOSTIP} - ${vHOSTNAME} Host is down" >> ${logtemp} + # SENDNOTICE "${vHOSTiDRACIP} ERROR" "${vHOSTNAME} Host is down" 1 + # echo "($datetime) - ${vHOSTiDRACIP} - ${vHOSTNAME} Host is down" >> ${logtemp} # touch ${PW_TMPFOLDER}/${EHOST}.down # fi fi