From d2a05b3044ff3ab62efc447848daba4c5055cc96 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 20 Feb 2026 19:34:49 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 5e675d99..7f7918eb 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -229,24 +229,25 @@ CHECKPOWER(){ echo -en "${idsCL[LightCyan]}Totals Amps Watts" [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo - # if [ ${REPORT} -eq 0 ]; then - # echo -en "\r\033[K" - # AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - # MSG="${idsCL[White]}Network Rack ~est~ ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 1 yes`'W" - # echo -en "${MSG}" - # if [ "${avgdays}" != "" ]; then - # 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) - # echo -en "\r\033[K" - # - # AS=$(IDS_NUMBER_FORMAT ${NETRK_WATT} 1 yes); c=0; spcA=''; spc1=`expr ${wspc} - ${#AS} + 5`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; ((c++)); done - # AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP_avg} 2 yes); c=0; spcB=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; ((c++)); done - # echo -e "${MSG}${idsCL[LightYellow]}${spcA}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 1 yes`'W" - # else - # echo - # fi + if [ ${REPORT} -eq 0 ]; then + + # echo -en "\r\033[K" + # AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + # MSG="${idsCL[White]}Network Rack ~est~ ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 1 yes`'W" + # echo -en "${MSG}" + # if [ "${avgdays}" != "" ]; then + # 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) + # echo -en "\r\033[K" + # + # AS=$(IDS_NUMBER_FORMAT ${NETRK_WATT} 1 yes); c=0; spcA=''; spc1=`expr ${wspc} - ${#AS} + 5`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; ((c++)); done + # AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP_avg} 2 yes); c=0; spcB=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; ((c++)); done + # echo -e "${MSG}${idsCL[LightYellow]}${spcA}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 1 yes`'W" + # else + # echo + # fi AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done MSG="${idsCL[White]}Server Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 1 yes`'W"