diff --git a/defaults.inc b/defaults.inc index df5eadda..ce2b4efb 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.133-01122024' +VERS='2.5.134-01122024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 66c67a40..957baccb 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -153,12 +153,15 @@ CHECKPOWER(){ fi if [ "${avgdays}" != "" ]; then - APCPDU_AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays} amp) - APCPDU_WATT_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}) - NETRK_AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} amp) - NETRK_WATT_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}) - SVRRM_AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} amp) - SVRRM_WATT_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays}) + 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) + 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) + 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) fi if [ ${REPORT} -eq 0 ]; then