From bfb69be4760e71700ef72bfa3c0612bd19c1565d Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 12 Jan 2024 08:09:29 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/power.inc.sh | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 65995f40..df5eadda 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.5.132-01112024'
+VERS='2.5.133-01122024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index cfd384d8..659d53f8 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -252,6 +252,10 @@ CHECKPOWER(){
 		SENSOR_TOTAL_AMPS_MAINSITE=0
 		SENSOR_TOTAL_WATTS_OFFSITE=0
 		SENSOR_TOTAL_AMPS_OFFSITE=0
+		if [ "${avgdays}" != "" ]; then
+			AVERAGE_WATTS_MAINSITE=0
+			AVERAGE_WATTS_OFFSITE=0
+		fi
 		for SENSOR in ${PW_SENSOR_ORD[@]}; do
 			if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
 				if [ "${STYPE}" == "" ] || ([ "${STYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then
@@ -315,6 +319,11 @@ CHECKPOWER(){
 							echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
 							average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average}`'watts"
 							echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
+							if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
+								AVERAGE_WATTS_MAINSITE=$(expr ${AVERAGE_WATTS_MAINSITE} + ${average})
+							else
+								AVERAGE_WATTS_OFFSITE=$(expr ${AVERAGE_WATTS_OFFSITE} + ${average})
+							fi
 						else
 							echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
 						fi
@@ -324,8 +333,14 @@ CHECKPOWER(){
 			fi
 		done
 		DIVIDER . lightCyan 75
-		[ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ] && echo -e "${idsCL[LightCyan]}Mainsite Total           ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE}`'watts"
-		[ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total            ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
+		if [ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]; then
+			echo -en "${idsCL[LightCyan]}Mainsite Total           ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE}`'watts"
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE}`'watts" || echo
+		fi
+		if [ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ]; then
+			echo -e "${idsCL[LightCyan]}Offsite Total            ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE}`'watts" || echo
+		fi
 	fi
 	if [ ${REPORT} -eq 0 ]; then
 		end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}s"