voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-08-15 18:54:15 -05:00
parent 270ba99cf5
commit 745c5778a6
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
defaults.inc
View File

@@ -60,11 +60,11 @@ declare -A PW_SENSOR_ID
PW_SENSOR_ID['ServerRoomTH']='2' PW_SENSOR_ID['ServerRoomTH']='2'
PW_SENSOR_ID['RaspberryPI-CPU']='6' PW_SENSOR_ID['RaspberryPI-CPU']='6'
PW_SENSOR_ID['OctoPI-CPU']='7' PW_SENSOR_ID['OctoPI-CPU']='7'
# PW_SENSOR_ID['vMS-iDrac0']='8' PW_SENSOR_ID['vMS-iDrac0']='8'
# PW_SENSOR_ID['vMS-iDrac1']='9' PW_SENSOR_ID['vMS-iDrac1']='9'
# PW_SENSOR_ID['vMS-iDrac2']='10' PW_SENSOR_ID['vMS-iDrac2']='10'
# PW_SENSOR_ID['vMS-iDrac7']='11' PW_SENSOR_ID['vMS-iDrac7']='11'
# PW_SENSOR_ID['vMS-iDrac8']='12' PW_SENSOR_ID['vMS-iDrac8']='12'
declare -A PW_HOST_IDRACS declare -A PW_HOST_IDRACS
PW_HOST_IDRACS['vMS-iDrac0']='10.10.2.20' PW_HOST_IDRACS['vMS-iDrac0']='10.10.2.20'

9
powerwall.sh
View File

@@ -164,9 +164,8 @@ CHECKTEMP_SERVICE(){
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then 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) 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 vHOSTDATA <<<"${vHOSTDATA}"; unset IFS IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOSTDATA}"; unset IFS
SENSORS_CHECK=${vHOSTDATA}
else else
SENSORS_CHECK=(${SENSORa}) SENSORS_CHECK=(${SENSORa})
fi fi
@@ -213,7 +212,7 @@ CHECKTEMP_SERVICE(){
echo ${PW_TEMP_THRESHOLDS[${SENSOR}]} | cut -d',' -f 3 | read temp_crit_sys echo ${PW_TEMP_THRESHOLDS[${SENSOR}]} | cut -d',' -f 3 | read temp_crit_sys
fi fi
# echo "HERE: ${SENSOR} - ${temp_f} - ${temp_warn} - ${temp_crit}" echo "HERE: ${SENSOR} - ${temp_f} - ${temp_warn} - ${temp_crit}"
if [ "${last_temp[${SENSOR}]}" != "" ]; then if [ "${last_temp[${SENSOR}]}" != "" ]; then
temp_diff=`expr ${last_temp[${SENSOR}]%.*} - ${temp_f%.*}` temp_diff=`expr ${last_temp[${SENSOR}]%.*} - ${temp_f%.*}`
@@ -301,7 +300,7 @@ NORMAL TEMP: ${temp_f}'F"
else else
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSOR}]}','${datetime}','${temp_f}')" QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSOR}]}','${datetime}','${temp_f}')"
fi fi
${mysql_conn} -e "${QRY}" # ${mysql_conn} -e "${QRY}"
touch ${PW_TMPFOLDER}/${SENSOR}.insert touch ${PW_TMPFOLDER}/${SENSOR}.insert
fi fi
else else