From 73d31c4f7cc668483aabd12afa8878f2d706ab0d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 14 May 2023 16:47:05 -0500 Subject: [PATCH] update --- powerwall.sh | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 3b774bb1..2869f8d0 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -16,23 +16,29 @@ VERBOSE=false #ssh root@10.5.10.35 '/vmfs/volumes/NFS_ESXi-Vault/esxi-shutdown.sh > /dev/null 2>&1' & > /dev/null 2>&1 CHECKTEMP(){ - mqtt_message=`${mqtt_conn} -t tele/${1}/SENSOR -C 1` - echo $mqtt_message | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c - if [ "$temp_c" != "null" ] && [ "$temp_c" != "" ]; then - temp_f=`echo "scale=2; $temp_c*1.8 + 32" | bc` - #echo "$temp_c -> $temp_f" - - echo ${TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn - echo ${TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit - - if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then - echo "WARNING: $temp_f°F" - elif [ $(bc -l <<< "$temp_f >= $temp_crit") -eq 1 ]; then - echo "CRITICAL: $temp_f°F" - else - echo "normal: $temp_f°F" - fi - fi + [ "${1}" != "" ] && SENSORS=("${1}") || SENSORS=${SENSOR_ID[@]} + + for SENSOR in ${SENSORS[@]}; do + echo "HERE: $SENSOR" + done + + # mqtt_message=`${mqtt_conn} -t tele/${1}/SENSOR -C 1` + # echo $mqtt_message | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c + # if [ "$temp_c" != "null" ] && [ "$temp_c" != "" ]; then + # temp_f=`echo "scale=2; $temp_c*1.8 + 32" | bc` + # #echo "$temp_c -> $temp_f" + # + # echo ${TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn + # echo ${TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit + # + # if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then + # echo "WARNING: $temp_f°F" + # elif [ $(bc -l <<< "$temp_f >= $temp_crit") -eq 1 ]; then + # echo "CRITICAL: $temp_f°F" + # else + # echo "normal: $temp_f°F" + # fi + # fi } CHECKTEMP_SERVICE(){ @@ -40,10 +46,8 @@ CHECKTEMP_SERVICE(){ [ ! -f ${logsrvc} ] && touch ${logsrvc} last_temp=0 mqtt_message=`${mqtt_conn} -t tele/${1}/SENSOR -C 1` - while true - do - ${mqtt_conn} -t tele/${1}/SENSOR | while read -r mqtt_message - do + while true; do + ${mqtt_conn} -t tele/${1}/SENSOR | while read -r mqtt_message; do echo $mqtt_message | cut -d':' -f 7 | cut -d',' -f 1 | read temp_h echo $mqtt_message | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c echo $mqtt_message | cut -d'T' -f 2 | cut -d"\"" -f 3 | read temp_d @@ -207,8 +211,7 @@ CHECKACV_SERVICE(){ } POWERLOGGER_SERVICE(){ - while true - do + while true; do datetime=`date +'%Y-%m-%d %H:%M:%S'` JSONSTATS=$(curl -s "http://10.10.0.61/stats.json")