From 10d7232494104980adc255018b9e0dba547c8aae Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 14 Aug 2023 18:54:03 -0500 Subject: [PATCH] update --- defaults.inc | 10 +++++----- powerwall.sh | 25 +++++++++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/defaults.inc b/defaults.inc index 09b1defd..0d26bec9 100755 --- a/defaults.inc +++ b/defaults.inc @@ -65,11 +65,11 @@ PW_SENSOR_ID['vMS-Host7']='11' PW_SENSOR_ID['vMS-Host8']='12' declare -A PW_ESXI_MON_HOSTS -PW_ESXI_MON_HOSTS['vMS-Host0']='10.10.2.20' -PW_ESXI_MON_HOSTS['vMS-Host1']='10.10.2.21' -PW_ESXI_MON_HOSTS['vMS-Host2']='10.10.2.22' -PW_ESXI_MON_HOSTS['vMS-Host7']='10.10.2.27' -PW_ESXI_MON_HOSTS['vMS-Host8']='10.2.1.28' +PW_ESXI_MON_HOSTS['vMS-Host0']='10.10.2.10' +PW_ESXI_MON_HOSTS['vMS-Host1']='10.10.2.11' +PW_ESXI_MON_HOSTS['vMS-Host2']='10.10.2.12' +PW_ESXI_MON_HOSTS['vMS-Host7']='10.10.2.17' +PW_ESXI_MON_HOSTS['vMS-Host8']='10.2.1.18' declare -A PW_ESXI_HOST_NAMES PW_ESXI_HOST_NAMES['10.10.2.10']='iDS-vMS-scsi.scity.us' diff --git a/powerwall.sh b/powerwall.sh index 51140c5e..c5975953 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -33,18 +33,23 @@ CHECKTEMP(){ echo -en "\r\033[K" vHOSTDATA=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${vHOSTIP} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep " Temp" 2>&1) IFS=$'\n' read -rd '' -a vHOSTDATA <<<"${vHOSTDATA}"; unset IFS - - for sensordata in "${vHOSTDATA[@]}"; do - vSENSOR=$(echo ${sensordata} | cut -d'T' -f1 | xargs) - temp_c=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $2}' | sed -e 's/C//g'); temp_c=${temp_c/ /} - temp_warn=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $7}' | sed -e 's/C//g'); temp_warn=${temp_warn/ /} - temp_crit=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $4}' | sed -e 's/C//g'); temp_crit=${temp_crit/ /} + + if (( $(grep -c . <<<"${vHOSTDATA}") > 1 )); then + echo -e "${idsCL[LightCyan]}${vSENSOR}${spc}${idsCL[Default]}" + + for sensordata in "${vHOSTDATA[@]}"; do + vSENSOR=$(echo ${sensordata} | cut -d'T' -f1 | xargs) + temp_c=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $2}' | sed -e 's/C//g'); temp_c=${temp_c/ /} + temp_warn=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $7}' | sed -e 's/C//g'); temp_warn=${temp_warn/ /} + temp_crit=$(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $4}' | sed -e 's/C//g'); temp_crit=${temp_crit/ /} - reading=$(CHECKTEMPSENSOR ${SENSOR} ${temp_c} ${temp_warn} ${temp_crit}) - c=0; spc=''; spc1=`expr ${cw} - ${#vSENSOR}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -e "${idsCL[LightCyan]}${vSENSOR}${spc}${idsCL[Default]}: ${reading}" + reading=$(CHECKTEMPSENSOR ${SENSOR} ${temp_c} ${temp_warn} ${temp_crit}) + c=0; spc=''; spc1=`expr ${cw} - ${#vSENSOR}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -e "${idsCL[LightCyan]}${vSENSOR}${spc}${idsCL[Default]}: ${reading}" - done + done + + fi else #host down echo -e "\r\033[K${idsCL[Red]}${SENSOR} Host is down"