diff --git a/defaults.inc b/defaults.inc index 26bfca1c..1be3231d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -44,11 +44,11 @@ declare -A PW_SENSOR_TYPE PW_SENSOR_TYPE['ServerRoomTH']='mqtt' PW_SENSOR_TYPE['RaspberryPI-CPU']='system' PW_SENSOR_TYPE['OctoPI-CPU']='remotesystem' -PW_SENSOR_TYPE['vMS-Host0']='esxi' -PW_SENSOR_TYPE['vMS-Host1']='esxi' -PW_SENSOR_TYPE['vMS-Host2']='esxi' -PW_SENSOR_TYPE['vMS-Host7']='esxi' -PW_SENSOR_TYPE['vMS-Host8']='esxi' +PW_SENSOR_TYPE['vMS-iDrac0']='esxi' +PW_SENSOR_TYPE['vMS-iDrac1']='esxi' +PW_SENSOR_TYPE['vMS-iDrac2']='esxi' +PW_SENSOR_TYPE['vMS-iDrac7']='esxi' +PW_SENSOR_TYPE['vMS-iDrac8']='esxi' declare -A PW_REMOTE_SENSORS PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10' @@ -58,18 +58,18 @@ declare -A PW_SENSOR_ID PW_SENSOR_ID['ServerRoomTH']='2' PW_SENSOR_ID['RaspberryPI-CPU']='6' PW_SENSOR_ID['OctoPI-CPU']='7' -PW_SENSOR_ID['vMS-Host0']='8' -PW_SENSOR_ID['vMS-Host1']='9' -PW_SENSOR_ID['vMS-Host2']='10' -PW_SENSOR_ID['vMS-Host7']='11' -PW_SENSOR_ID['vMS-Host8']='12' +PW_SENSOR_ID['vMS-iDrac0']='8' +PW_SENSOR_ID['vMS-iDrac1']='9' +PW_SENSOR_ID['vMS-iDrac2']='10' +PW_SENSOR_ID['vMS-iDrac7']='11' +PW_SENSOR_ID['vMS-iDrac8']='12' declare -A PW_HOST_IDRACS -PW_HOST_IDRACS['vMS-Host0']='10.10.2.20' -PW_HOST_IDRACS['vMS-Host1']='10.10.2.21' -PW_HOST_IDRACS['vMS-Host2']='10.10.2.22' -PW_HOST_IDRACS['vMS-Host7']='10.10.2.27' -PW_HOST_IDRACS['vMS-Host8']='10.2.1.28' +PW_HOST_IDRACS['vMS-iDrac0']='10.10.2.20' +PW_HOST_IDRACS['vMS-iDrac1']='10.10.2.21' +PW_HOST_IDRACS['vMS-iDrac2']='10.10.2.22' +PW_HOST_IDRACS['vMS-iDrac7']='10.10.2.27' +PW_HOST_IDRACS['vMS-iDrac8']='10.2.1.28' 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 fdd894f1..5e06db6b 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -39,7 +39,7 @@ CHECKTEMP(){ 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_warn=`echo ${(echo ${sensordata} | cut -d'p' -f2 | awk '/ / {print $7}' | sed -e 's/C//g')/ /} | awk '{print int($1+0.5)}'` 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} - 1`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done