From 745c5778a61e25e53e5bfeea5ab88995a312a21b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 15 Aug 2023 18:54:15 -0500 Subject: [PATCH] update --- defaults.inc | 10 +++++----- powerwall.sh | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/defaults.inc b/defaults.inc index 2b11500e..04b0bd5c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -60,11 +60,11 @@ 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-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' +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-iDrac0']='10.10.2.20' diff --git a/powerwall.sh b/powerwall.sh index f6ffa3b7..5500d243 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -164,9 +164,8 @@ CHECKTEMP_SERVICE(){ if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then - vHOSTDATA=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep " Temp" 2>&1) - IFS=$'\n' read -rd '' -a vHOSTDATA <<<"${vHOSTDATA}"; unset IFS - SENSORS_CHECK=${vHOSTDATA} + SENSORS_CHECK=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep " Temp" 2>&1) + IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOSTDATA}"; unset IFS else SENSORS_CHECK=(${SENSORa}) fi @@ -213,7 +212,7 @@ CHECKTEMP_SERVICE(){ echo ${PW_TEMP_THRESHOLDS[${SENSOR}]} | cut -d',' -f 3 | read temp_crit_sys fi - # echo "HERE: ${SENSOR} - ${temp_f} - ${temp_warn} - ${temp_crit}" + echo "HERE: ${SENSOR} - ${temp_f} - ${temp_warn} - ${temp_crit}" if [ "${last_temp[${SENSOR}]}" != "" ]; then temp_diff=`expr ${last_temp[${SENSOR}]%.*} - ${temp_f%.*}` @@ -301,7 +300,7 @@ NORMAL TEMP: ${temp_f}'F" else QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSOR}]}','${datetime}','${temp_f}')" fi - ${mysql_conn} -e "${QRY}" + # ${mysql_conn} -e "${QRY}" touch ${PW_TMPFOLDER}/${SENSOR}.insert fi else