From 22a975e08a751e3df59aa40a30c4878f46cc9dca Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 10 Feb 2024 23:40:34 -0600
Subject: [PATCH] Update power.inc.sh

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

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 01721447..2ce0b618 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -201,7 +201,7 @@ CHECKPOWER(){
 				APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
 			fi
-			echo -en "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps"
+			echo -en "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes`'amps"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${APCPDU_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 			echo -en "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'watts ${idsCL[Default]}~ est"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "		${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
@@ -214,7 +214,7 @@ CHECKPOWER(){
 				NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
 			fi
-			echo -en "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ est"
+			echo -en "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes`'amps ${idsCL[Default]}~ est"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 			echo -en "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}~ est"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "		${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 0` watts) ${idsCL[Default]}~ est${idsCL[Default]}"
@@ -836,15 +836,25 @@ POWERLOGGER_SERVICE(){
 		fi
 		
 		AIRCON_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps')
-		AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
-		AIRCON_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AIRCON_AMP}/1000" | bc -l) 2)
-		AIRCON_WATT=$(echo "${AIRCON_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
-		AIRCON_WATT=$(echo "scale=1; ${AIRCON_WATT}/10" | bc -l)
-		AIRCON_VOLT=$(echo "${AIRCON_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
-		AIRCON_VOLT=$(echo "scale=3; ${AIRCON_VOLT}/10" | bc -l)
+		if [ "${AIRCON_INFO}" != "" ]; then
+			AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
+			AIRCON_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AIRCON_AMP}/1000" | bc -l) 2)
+			AIRCON_WATT=$(echo "${AIRCON_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
+			AIRCON_WATT=$(echo "scale=1; ${AIRCON_WATT}/10" | bc -l)
+			AIRCON_VOLT=$(echo "${AIRCON_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
+			AIRCON_VOLT=$(echo "scale=3; ${AIRCON_VOLT}/10" | bc -l)
 		
-		QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['ServerRoom-AC']}','${LogDataTime}','${AIRCON_VOLT}','${AIRCON_AMP}','${AIRCON_WATT}')"
-		${mysql_conn} -e "USE servermonitor; ${QRY}"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['ServerRoom-AC']}','${LogDataTime}','${AIRCON_VOLT}','${AIRCON_AMP}','${AIRCON_WATT}')"
+			${mysql_conn} -e "USE servermonitor; ${QRY}"
+			
+			if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then
+				SVRRM_WATT_WAC=$(expr ${SVRRM_WATT} + ${AIRCON_WATT})
+				SVRRM_AMP_WAC=$(expr ${SVRRM_AMP} + ${AIRCON_AMP})
+			
+				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
+		fi
 				
 		# upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 admin@10.2.1.1 'upsc CP1500PFCLCD')
 		upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc CP1500PFCLCD' 2>&1)