From f331cb1e7c1094e5229949a9d4a52aa848cbc770 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 27 Oct 2023 16:50:40 -0500
Subject: [PATCH] update

---
 defaults.inc |  2 +-
 powerwall.sh | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 5d6b6a49..2c0725ca 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.3.17-10252023'
+VERS='2.3.20-10272023'
 
 noheader=' update service dailytemp '
 
diff --git a/powerwall.sh b/powerwall.sh
index 8d05fb7d..097722aa 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -663,15 +663,31 @@ POWERLOGGER(){
 	outA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
 	battV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 	xfA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
-	APCPDU_WATT=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
 	
+	APCPDU_WATT=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
+	APCPDU_AMP=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
+	APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc`
+	
+	SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //')
+	SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.4.1 | sed 's/.*: //')
+	SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.3.1 | sed 's/.*: //')
+	SVRRM_AMP=`echo "scale=1; ${SVRRM_AMP}/10" | bc`
+	
+	NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
+	NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
+		
 	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${inV}','${inA}')"
 	${mysql_conn} -e "USE servermonitor; ${QRY}"
 	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('4','${datetime}','${outV}','${outA}')"
 	${mysql_conn} -e "USE servermonitor; ${QRY}"
 	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('5','${datetime}','${battV}','${xfA}')"
 	${mysql_conn} -e "USE servermonitor; ${QRY}"
-	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('11','${datetime}','${battV}','${xfA}')"
+
+	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('11','${datetime}','${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')"
+	${mysql_conn} -e "USE servermonitor; ${QRY}"
+	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('12','${datetime}','${SVRRM_VOLT}','${APCPDU_AMP}','${APCPDU_WATT}')"
+	${mysql_conn} -e "USE servermonitor; ${QRY}"
+	QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('13','${datetime}','${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"
 	${mysql_conn} -e "USE servermonitor; ${QRY}"
 	
 	QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${INVSTATSINFO}')"