From 4a5b5ec92facd47de0a34db340a32db310f3e661 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 9 May 2024 22:00:11 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 0666711d..6edf1c60 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -50,7 +50,7 @@ CHECKTEMP(){ done if [ "${TTYPE}" != "sensors" ]; then for ESXIHOST in "${PW_ALLHOSTS[@]}"; do - if [ ! -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.down ] && ([ "${search}" == "" ] || ([[ "${PW_ESXI_HOST_NAMES[${ESXIHOST}],,}" = *"${search,,}"* ]] && [[ "${PW_ESXI_HOST_NAMES[${ESXIHOST}],,}" != *"${exclude,,}"* ]])); then + if [ ! -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.down ] && ([ "${search}" == "" ] || ([[ "${PW_ESXI_HOST_NAMES[${ESXIHOST}],,}" = *"${search,,}"* ]] && [[ ! "${PW_ESXI_HOST_NAMES[${ESXIHOST}],,}" = *"${exclude,,}"* ]])); then GET_HOST_FANSPEED ${ESXIHOST} ${cdt} & fi done @@ -86,7 +86,7 @@ CHECKTEMP(){ DIVIDER . yellow ${PRI_WIDTH} for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && [[ "${SENSOR,,}" = *"${exclude,,}"* ]] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && ([[ "${SENSOR}" = *"Room"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}]}" = *"Room" ]]))); then + if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && ([[ "${SENSOR}" = *"Room"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}]}" = *"Room" ]]))); then [ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR} if [ "${PW_THRESHOLDS[${SENSOR}]}" != "" ]; then echo ${PW_THRESHOLDS[${SENSOR}]} | cut -d',' -f 1 | read temp_warn @@ -279,7 +279,7 @@ CHECKTEMP(){ fi DIVIDER . yellow ${PRI_WIDTH} for SENSOR in ${PW_SENSOR_ORD[@]}; do - if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && [[ "${SENSOR,,}" != *"${exclude,,}"* ]] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then + if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]} vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]} vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTiDRACIP}]}