From e6502a0b0cf3b3aa17f41a32abf9aaa3d77ec79e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 19 Jul 2025 20:56:06 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index d2492ee9..b9a7d081 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.12.4-07192025' +PW_VERS='2.12.6-07192025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 2e4dd177..f2af61e9 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -1340,10 +1340,15 @@ POWERLOGGER_SERVICE(){ OFFSITE_VOLTOUT=$(echo "${upsinfo}" | grep 'output.voltage:' | sed 's/.*: //' | tr -d $'\r') OFFSITE_LOAD=$(echo "${upsinfo}" | grep 'ups.load:' | sed 's/.*: //' | tr -d $'\r') OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | tr -d $'\r' | bc` + OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*$(echo "${upsinfo}" | grep 'ups.realpower.nominal:' | sed 's/.*: //')" | tr -d $'\r' | bc` + OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | tr -d $'\r' | bc` POWER_STRIP_DATA=$(kasa --type strip --json --host 10.2.1.234 energy) - OFFSITE_WATTS=$(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.power_mw')/1000" | tr -d $'\r' | bc -l) - OFFSITE_AMPS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.current_ma')/1000" | tr -d $'\r' | bc -l)) + OFFSITE_STRIP_WATTS=$(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.power_mw')/1000" | tr -d $'\r' | bc -l) + OFFSITE_STRIP_AMPS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.current_ma')/1000" | tr -d $'\r' | bc -l)) + OFFSITE_STRIP_VOLTS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.voltage_mv')/1000" | tr -d $'\r' | bc -l)) + QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['offsite-strip']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${OFFSITE_STRIP_VOLTS}','${OFFSITE_STRIP_AMPS}','${OFFSITE_STRIP_WATTS}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" if (( $(bc <<<"${OFFSITE_WATTS} < 100") )); then TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0