diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 09ba1299..7e8f2ce2 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -317,7 +317,8 @@ CHECKPOWER(){ UPS_AMPSIN=`echo "scale=2; ${UPS_AMPSIN}/10" | bc` UPS_AMPSOUT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.2.1.33.1.4.4.1.3.1 | sed 's/.*: //')\ UPS_AMPSOUT=`echo "scale=2; ${UPS_AMPSOUT}/10" | bc` - UPS_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.2.2.1.7.3 | sed 's/.*: //') + UPS_WATTS1=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.2.2.1.7.3 | sed 's/.*: //') + UPS_WATTS2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.2.2.1.8.3 | sed 's/.*: //') UPS_BATT_RUNTIME=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.1.18.0 | sed 's/.*: //') UPS_BATT_VOLT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.1.10.0 | sed 's/.*: //') UPS_BATT_CAP=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.1.19.0 | sed 's/.*: //') @@ -340,7 +341,8 @@ CHECKPOWER(){ echo -e "${idsCL[White]}UPS Amps Out ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_AMPSOUT}`'A${idsCL[Default]}" fi echo -e "${idsCL[White]}UPS Load Usage ${idsCL[Default]}: ${idsCL[Green]}${UPS_LOAD}'%${idsCL[Default]}" - echo -e "${idsCL[White]}UPS Watts ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS}'W${idsCL[Default]}" + echo -e "${idsCL[White]}UPS Watts1 ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS1}'W${idsCL[Default]}" + echo -e "${idsCL[White]}UPS Watts2 ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS2}'W${idsCL[Default]}" [ ${REPORT} -eq 0 ] && echo echo -e "${idsCL[White]}UPS Battery Capacity ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_BATT_CAP}`'%${idsCL[Default]}" echo -e "${idsCL[White]}UPS Battery Runtime ${idsCL[Default]}: ${idsCL[Green]}${UPS_BATT_RUNTIME}'mins${idsCL[Default]}"