Update power.inc.sh

This commit is contained in:
2024-02-11 22:17:11 -06:00
parent 3d6bbc80ec
commit 2528adcdc4

View File

@@ -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}