From 2528adcdc473ea1da1732f6cf94affef3109bc7d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 22:17:11 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 8182249a..34099c5b 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -220,7 +220,7 @@ CHECKPOWER(){ 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 ... " + echo -en "${idsCL[Yellow]} Calculating Server Rack 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) @@ -235,19 +235,19 @@ CHECKPOWER(){ DIVIDER . darkGray ${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 - MSG="${idsCL[LightCyan]}Equipment Subtotal ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W" + MSG="${idsBG[Blue]}${idsCL[White]}Equipment Subtotal ${idsCL[Default]}: ${idsCL[LightGreen]}${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 ... " + echo -en "${idsCL[Yellow]} Calculating Equipment Subtotal 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" 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 "${MSG}${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${idsBG[Default]}" else - echo + echo -e "${idsBG[Default]}" fi DIVIDER . lightCyan ${PRI_WIDTH}