Update power.inc.sh
This commit is contained in:
@@ -205,12 +205,9 @@ CHECKPOWER(){
|
|||||||
APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
|
APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
|
||||||
echo -en "\r\033[K"
|
echo -en "\r\033[K"
|
||||||
fi
|
fi
|
||||||
AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes)
|
AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
|
||||||
c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
|
echo -e "${idsCL[White]}Server Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'watts ${idsCL[Default]}"
|
||||||
echo -e "${idsCL[White]}ServerRack ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'watts ${idsCL[Default]}~ est"
|
|
||||||
|
|
||||||
|
|
||||||
DIVIDER . lightCyan ${PRI_WIDTH}
|
|
||||||
if [ "${avgdays}" != "" ]; then
|
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_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} both)
|
||||||
@@ -218,10 +215,9 @@ CHECKPOWER(){
|
|||||||
NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
|
NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
|
||||||
echo -en "\r\033[K"
|
echo -en "\r\033[K"
|
||||||
fi
|
fi
|
||||||
echo -en "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes`'amps ${idsCL[Default]}~ est"
|
AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
|
||||||
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${NETRK_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
|
echo -e "${idsCL[White]}Network Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}"
|
||||||
echo -en "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}~ est"
|
|
||||||
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 0` watts) ${idsCL[Default]}~ est${idsCL[Default]}"
|
|
||||||
|
|
||||||
DIVIDER . lightCyan ${PRI_WIDTH}
|
DIVIDER . lightCyan ${PRI_WIDTH}
|
||||||
if [ "${avgdays}" != "" ]; then
|
if [ "${avgdays}" != "" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user