From a473955f9e6b05d4aea4138b7c389e3c110b4f0d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 6 Nov 2023 08:45:12 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 0d3a86e6..bc5a5a3b 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -859,14 +859,14 @@ POWERLOGGER_SERVICE(){ ${mysql_conn} -e "USE servermonitor; ${QRY}" fi - if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then - OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //') - OFFSITE_VOLTOUT=`echo "scale=1; ${OFFSITE_VOLTOUT}/10" | bc` - OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //') + upsinfo=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 admin@10.2.1.1 'upsc CP1500PFCLCD') + if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then + OFFSITE_VOLTOUT=$(echo "${upsinfo}" | grep 'output.voltage:' | sed 's/.*: //') + OFFSITE_LOAD=$(echo "${upsinfo}" | grep 'ups.load:' | sed 's/.*: //') OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc` - OFFSITE_WATTS=`echo "scale=1; ${OFFSITE_LOAD}*900" | bc` - OFFSITE_AMPS=`echo "scale=1; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc` - + OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*$(echo "${upsinfo}" | grep 'ups.realpower.nominal:' | sed 's/.*: //')" | bc` + OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc` + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('15','${LogDataTime}','${OFFSITE_VOLTOUT}','${OFFSITE_AMPS}','${OFFSITE_WATTS}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" fi @@ -1547,9 +1547,9 @@ fi logrotate) LOGROTATE;; update) - # echo -en "${idsCL[LightCyan]}Will reboot monitoring services in the background to apply updates ... " - # RESTARTALL_SERVICES >/dev/null 2>&1 & - # echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" + echo -en "${idsCL[LightCyan]}Will reboot monitoring services in the background to apply updates ... " + RESTARTALL_SERVICES >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" ;; status) CHECKPOWER