From 4284aa9b0eecc15d2d6bc0d3e63c2a07244b4cb2 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 20 Feb 2026 19:34:00 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index ce91ab19..5e675d99 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -183,8 +183,8 @@ CHECKPOWER(){
 			# if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then
 				APCPDU_AMP=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
 				APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | tr -d $'\r' | bc`
-				APCPDU_WATT2=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
-				APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLTOUT}" | tr -d $'\r' | bc`
+				APCPDU_WATT=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
+        # APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLTOUT}" | tr -d $'\r' | bc`
 			# fi
 			if [ "${SVRRM_VOLTIN}" != "" ]; then
 				if [ "${APCPDU_AMP}" != "" ]; then
@@ -229,24 +229,24 @@ 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"