diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 0a13eabb..6d230d68 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -95,10 +95,13 @@ CHECKPOWER(){ [ "${TEST_INPUTACV}" != "" ] && echo -e " ${idsCL[Yellow]}***TEST MODE***" || echo "" echo -e "${idsCL[White]}Inverter Input Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTA}`'amps" echo - echo -e "${idsCL[White]}Inverter Output Volts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTV}`'volts / `IDS_NUMBER_FORMAT ${OUTPUTV2}`'volts" - echo -e "${idsCL[White]}Inverter Output Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTA}`'amps / `IDS_NUMBER_FORMAT ${OUTPUTA2}`'amps" - echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTW}`'watts" - echo + if [ ${REPORT} -eq 0 ]; then + echo -e "${idsCL[White]}Inverter Output Volts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTV}`'volts / `IDS_NUMBER_FORMAT ${OUTPUTV2}`'volts" + echo -e "${idsCL[White]}Inverter Output Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTA}`'amps / `IDS_NUMBER_FORMAT ${OUTPUTA2}`'amps" + echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTW}`'watts" + echo + fi + echo -en "${idsCL[White]}Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTV}`'volts ~ `IDS_NUMBER_FORMAT ${BATTLIFE}`%" [ "${TEST_BATTVOLT}" != "" ] && echo -e " ${idsCL[Yellow]}***TEST MODE***" || echo "" echo -e "${idsCL[White]}Battery Amps Chg/DChg ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}" @@ -135,36 +138,38 @@ CHECKPOWER(){ VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc` fi - [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" - echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" + if [ ${REPORT} -eq 0 ]; then + echo -en "\r\033[K" + echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" - MSG="${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate" - echo -en "${MSG}" - if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" - echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" - else - echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)" + MSG="${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate" + echo -en "${MSG}" + if [ "${avgdays}" != "" ]; then + echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" + else + echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)" + fi + echo -e "${idsCL[Default]}" + + DIVIDER . lightCyan 75 + + echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}" + MSG="${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ${idsCL[Default]}~ estimate" + echo -en "${MSG}" + if [ "${avgdays}" != "" ]; then + echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" + else + echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)" + fi + echo -e "${idsCL[Default]}" + + # echo + DIVIDER . lightCyan 75 fi - echo -e "${idsCL[Default]}" - - DIVIDER . lightCyan 75 - - echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}" - MSG="${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ${idsCL[Default]}~ estimate" - echo -en "${MSG}" - if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" - echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" - else - echo -en " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)" - fi - echo -e "${idsCL[Default]}" - - # echo - DIVIDER . lightCyan 75 echo -e "${idsCL[White]}Server Room Voltage IN ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTIN}'volts${idsCL[Default]}" echo -e "${idsCL[White]}Server Room Voltage OUT ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}" @@ -328,10 +333,8 @@ CHECKPOWER(){ fi done fi - - - end=`date +%s`; runtime=$((end-start)); echo -e "\nruntime: ${runtime}" - [ "${PW_ACTION}" != "" ] && echo + [ ${REPORT} -eq 0 ] && end=`date +%s`; runtime=$((end-start)); echo -e "\nruntime: ${runtime}" + [ "${PW_ACTION}" != "" ] && [ ${REPORT} -eq 0 ] && echo } CHECKPOWER_SERVICE(){