diff --git a/powerwall.sh b/powerwall.sh index b0672219..7414f83f 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -727,11 +727,18 @@ CHECKPOWER(){ unset IFS found=0 for s in {1..5}; do - # echo "HERE: [${PW_HOST_IDRACS[${SENSOR}]}] $(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.8.1.${s} | sed 's/.*: //') = $(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/.*: //')" - if [[ "$(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.8.1.${s} | sed 's/.*: //')" = *"System Board"* ]]; then + DP=$(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.8.1.${s} | sed 's/.*: //') + if [[ "${DP}" = *"System Board"* ]]; then found=1 HOST_WATTS=$(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/.*: //') - break + # break + + elif [[ "${DP}" = *"PS1"* ]]; then + PS1=$(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/.*: //') + PS1=`echo "scale=1; ${PS1}/10" | bc` + elif [[ "${DP}" = *"PS2"* ]]; then + 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/.*: //') + PS2=`echo "scale=1; ${PS2}/10" | bc` fi done if [ ${found} -eq 1 ]; then @@ -746,7 +753,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}" + echo -e "${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp} [PS1=${PS1}'A,PS2=${PS2}'A]${average_disp}${idsCL[Default]}" fi fi done