From 41cf271fbbc248965216404d8b407a6930d8151f Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 24 Oct 2024 22:37:44 -0500
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 416c737d..e2881d9b 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -1070,6 +1070,13 @@ POWERLOGGER_SERVICE(){
 			AIRCON_AMP=0
 		fi
 		
+		if [ "${SVRRM_WATT}" != "" ]; then
+			SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l)
+			SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l)
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total-wac']}','${LogDataTime}','${SVRRM_AMP_WAC}','${SVRRM_WATT_WAC}')"
+			${mysql_conn} -e "USE servermonitor; ${QRY}"
+		fi
+		
 		### KYLE
 		KYLE_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['KP-Power']}:8888/status/${PW_SENSOR_DEVICEID['KP-Power']} | jq '.dps')
 		if [ "${KYLE_INFO}" != "" ]; then
@@ -1087,13 +1094,7 @@ POWERLOGGER_SERVICE(){
 			KYLE_AMP=0
 			KYLE_WATT=0
 		fi
-		if [ "${SVRRM_WATT}" != "" ]; then
-			SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l)
-			SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l)
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total-wac']}','${LogDataTime}','${SVRRM_AMP_WAC}','${SVRRM_WATT_WAC}')"
-			${mysql_conn} -e "USE servermonitor; ${QRY}"
-		fi
-		KYLE_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['KP-SAS']}:8888/status/${PW_SENSOR_DEVICEID['KP-Power']} | jq '.dps')
+		KYLE_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['KP-SAS']}:8888/status/${PW_SENSOR_DEVICEID['KP-SAS']} | jq '.dps')
 		if [ "${KYLE_INFO}" != "" ]; then
 			KYLE_AMP=$(echo "${KYLE_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
 			KYLE_AMP=$(ROUND_NUMBER $(echo "scale=3; ${KYLE_AMP}/1000" | bc -l) 2)
@@ -1102,19 +1103,14 @@ POWERLOGGER_SERVICE(){
 			KYLE_VOLT=$(echo "${KYLE_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
 			KYLE_VOLT=$(echo "scale=3; ${KYLE_VOLT}/10" | bc -l)
 			
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['KP-Power']}','${LogDataTime}','${KYLE_VOLT}','${KYLE_AMP}','${KYLE_WATT}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['KP-SAS']}','${LogDataTime}','${KYLE_VOLT}','${KYLE_AMP}','${KYLE_WATT}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 			
 		else
 			KYLE_AMP=0
 			KYLE_WATT=0
 		fi
-		if [ "${SVRRM_WATT}" != "" ]; then
-			SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l)
-			SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l)
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total-wac']}','${LogDataTime}','${SVRRM_AMP_WAC}','${SVRRM_WATT_WAC}')"
-			${mysql_conn} -e "USE servermonitor; ${QRY}"
-		fi		
+			
 		
 		if [ "${PW_OFFSITE_MONITOR}" = "$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" ]; then
 			upsinfo=$(upsc CP1500PFCLCD 2>&1)