Update power.inc.sh

This commit is contained in:
2024-02-11 09:33:49 -06:00
parent c60c1b2c42
commit eec1d80a08

View File

@@ -194,7 +194,8 @@ CHECKPOWER(){
# echo
DIVIDER . lightCyan ${PRI_WIDTH}
echo -e "${idsCL[LightCyan]}Totals : Amps Watts${idsCL[Default]}"
echo -en "${idsCL[LightCyan]}Totals : Amps Watts"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} Amps Watts" || echo
if [ ${REPORT} -eq 0 ]; then
echo -en "\r\033[K"
@@ -207,7 +208,7 @@ CHECKPOWER(){
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]}${APCPDU_AMP}'A `IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W"
[ "${avgdays}" != "" ] && echo -e " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W" || echo
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W" || echo
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages ... "
@@ -218,7 +219,7 @@ CHECKPOWER(){
fi
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]}${NETRK_AMP}'A `IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W"
[ "${avgdays}" != "" ] && echo -e " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W" || echo
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W" || echo
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages ... "
@@ -229,7 +230,7 @@ CHECKPOWER(){
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]}${AIRCON_AMP}'A `IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W"
[ "${avgdays}" != "" ] && echo -e " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W" || echo
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W" || echo
DIVIDER . lightCyan ${PRI_WIDTH}
if [ "${avgdays}" != "" ]; then
@@ -245,13 +246,13 @@ CHECKPOWER(){
echo -en "${idsCL[White]}Server Room ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
if [ "${avgdays}" != "" ]; then
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 " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo
echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo
fi
echo -en "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP_WAC}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
if [ "${avgdays}" != "" ]; then
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 " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo
echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo
fi
DIVIDER . lightCyan ${PRI_WIDTH}