From 0dd4b5eeca707410e4339ae1940645a05003bde1 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 11 Feb 2024 13:52:16 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 60 +++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 3a22dbae..029c5f0c 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -201,83 +201,85 @@ CHECKPOWER(){
 		if [ ${REPORT} -eq 0 ]; then
 			echo -en "\r\033[K"
 			AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -en "${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W"
+			MSG="${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W"
+			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}	Calculating NetworkRack Averages  ... "
 				NETRK_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} both)
 				NETRK_AMP_avg=$(echo ${NETRK_avg} | cut -d'~' -f 1)
 				NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
-				echo -en "${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W"
 				
 				AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W"
+				echo -e "${MSG}${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W"
 			else
 				echo
 			fi
 						
 			AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -en "${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W"
+			MSG="${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W"
+			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}	Calculating ServerRack Averages  ... "
 				APCPDU_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays} both)
 				APCPDU_AMP_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 1)
 				APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
-				echo -en "${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W"
 				
 				AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W"
+				echo -e "${MSG}${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W"
 			else
 				echo
 			fi
 			
-			AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -en "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W"
-			if [ "${avgdays}" != "" ]; then
-				echo -en "${idsCL[Yellow]}	Calculating Air Conidtioner Averages  ... "
-				AIRCON_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ServerRoom-AC']} ${avgdays} both)
-				AIRCON_AMP_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 1)
-				AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2)
-				echo -en "\r\033[K"
-				echo -en "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W"
-				
-				AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W"
-			else
-				echo
-			fi
-						
 			DIVIDER . lightCyan ${PRI_WIDTH}
-
+			
 			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -en "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
+			MSG="${idsCL[White]}Equipment Subtotal       ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
+			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}	Calculating Server Room Total Averages  ... "
 				SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both)
 				SVRRM_AMP_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 1)
 				SVRRM_WATT_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
-				echo -en "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
 				
 				AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W"
+				echo -e "${MSG}${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W"
+			else
+				echo
+			fi
+			
+			DIVIDER . lightCyan ${PRI_WIDTH}
+			
+			AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			MSG="${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W"
+			echo -en "${MSG}"
+			if [ "${avgdays}" != "" ]; then
+				echo -en "${idsCL[Yellow]}	Calculating Air Conidtioner Averages  ... "
+				AIRCON_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ServerRoom-AC']} ${avgdays} both)
+				AIRCON_AMP_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 1)
+				AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2)
+				echo -en "\r\033[K"
+				
+				AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+				echo -e "${MSG}${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W"
 			else
 				echo
 			fi
 			
 			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -en "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
+			MSG="${idsCL[White]}Server Room Total w/AIR  ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
+			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}	Calculating Server Room w/AIR Total Averages  ... "
 				SVRRM_WAC_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total-wac']} ${avgdays} both)
 				SVRRM_AMP_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 1)
 				SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2)
 				echo -en "\r\033[K"
-				echo -en "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
 				
 				AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W"
+				echo -e "${MSG}${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W"
 			else
 				echo
 			fi