diff --git a/inc/power.inc.sh b/inc/power.inc.sh index eea2245c..83ca5cfc 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -291,6 +291,9 @@ CHECKPOWER(){ PS2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //') fi done + PS1V=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1 | sed 's/.*: //') + PS2V=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2 | sed 's/.*: //') + if [ ${found} -eq 1 ] && [ "${HOST_WATTS}" != "0" ] && [ "${HOST_WATTS}" != "" ]; then [ "${PS1}" != "0.0" ] && PS1=`echo "scale=1; ${PS1}/10" | bc` && (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}" [ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}" @@ -343,7 +346,7 @@ CHECKPOWER(){ fi elif [ ${HOST_WATTS} -gt 0 ]; then - echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]" + echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A @ ${PS1V}'V${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A @ ${PS2V}'V${idsCL[Cyan]}]" fi # fi echo -e "${idsCL[Default]}"