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-12-03 18:03:08 -06:00
parent 60145cbed2
commit c5fac6185d
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -63,7 +63,7 @@ PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10'
PW_REMOTE_SENSORS['OctoPi-CPU']='10.10.1.80' PW_REMOTE_SENSORS['OctoPi-CPU']='10.10.1.80'
PW_REMOTE_SENSORS['OctoPi-CPU-Usage']='10.10.1.80' PW_REMOTE_SENSORS['OctoPi-CPU-Usage']='10.10.1.80'
PW_SENSOR_ORD=(ServerRoomTH Powerwall-CPU OctoPi-CPU iDS-vMS-Host0 iDS-vMS-Host1 iDS-vMS-Host6 iDS-vMS-Host7 OFF-vMS-Host1) PW_SENSOR_ORD=(ServerRoomTH Powerwall-CPU Powerwall-CPU-Usage OctoPi-CPU OctoPi-CPU-Usage iDS-vMS-Host0 iDS-vMS-Host1 iDS-vMS-Host6 iDS-vMS-Host7 OFF-vMS-Host1)
# PW_SENSOR_ORD=(iDS-vMS-Host0) # PW_SENSOR_ORD=(iDS-vMS-Host0)
declare -A PW_SENSOR_ID declare -A PW_SENSOR_ID

26
powerwall.sh
View File

@@ -91,13 +91,13 @@ CHECKTEMP(){
c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}" echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then # if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then
SENSOR="${SENSOR}-Usage" # SENSOR="${SENSOR}-Usage"
echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... " # echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
reading=$(CHECKTEMPSENSOR ${SENSOR}) # reading=$(CHECKTEMPSENSOR ${SENSOR})
c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done # c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}" # echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
fi # fi
fi fi
echo echo
fi fi
@@ -299,6 +299,18 @@ CHECKTEMP_SERVICE(){
vSENSOR=${SENSOR} vSENSOR=${SENSOR}
SENSOR="${SENSORa}-${vSENSOR// /_}" SENSOR="${SENSORa}-${vSENSOR// /_}"
((t++)) ((t++))
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
if [ "${SENSORa}" == "Powerwall-CPU-Usage" ]; then
temp_c=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
else
temp_c=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
fi
echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 1 | read temp_warn
echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 2 | read temp_crit
temp_crit_sys=${temp_crit}
temp_h=''
fi fi
logtemp=${PW_LOGFOLDER}/log-temp-${SENSOR} logtemp=${PW_LOGFOLDER}/log-temp-${SENSOR}