From f1585c0e0028e534d72863f40f3b3c74a02180fd Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 09:53:35 -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 9b5dcf1f..ca021e79 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -203,7 +203,7 @@ CHECKPOWER(){ 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" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating NetworkRack Averages ... " + 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) @@ -217,7 +217,7 @@ CHECKPOWER(){ 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" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating ServerRack Averages ... " + 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) @@ -231,7 +231,7 @@ CHECKPOWER(){ 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 ... " + 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) @@ -249,7 +249,7 @@ CHECKPOWER(){ 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" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating Server Room Total Averages ... " + 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) @@ -265,7 +265,7 @@ CHECKPOWER(){ 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" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating Server Room w/AIR Total Averages ... " + 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)