diff --git a/inc/power.inc.sh b/inc/power.inc.sh index fef934b5..4070a61c 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -148,8 +148,8 @@ CHECKPOWER(){ AC_WATT=$(echo "${AC_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') AC_WATT=$(ROUND_NUMBER $(echo "scale=3; ${AC_WATT}/10" | bc -l) 2) - SVRRM_AMP=$(echo "scale=2; ${SVRRM_AMP}+${AC_AMP}" | bc -l) - SVRRM_WATT=$(echo "scale=2; ${SVRRM_WATT}+${AC_WATT}" | bc -l) + SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AC_AMP}" | bc -l) + SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AC_WATT}" | bc -l) # fi # # if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then @@ -220,9 +220,9 @@ CHECKPOWER(){ 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]}" [ ${REPORT} -eq 0 ] && echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}" - echo -en "${idsCL[White]}Server Room Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps" + echo -en "${idsCL[White]}Server Room Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]} w/AC(${idsCL[Green]}${SVRRM_AMP_WAC}'amps${idsCL[Default]})" [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${SVRRM_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}" - echo -en "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts" + echo -en "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts${idsCL[Default]} w/AC(${idsCL[Green]}${SVRRM_WATT_WAC}'watts${idsCL[Default]})" [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}" [ ${REPORT} -eq 0 ] && echo