diff --git a/powerwall.sh b/powerwall.sh index 8157bcc2..e4704158 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -572,7 +572,7 @@ CHECKPOWER(){ if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //') SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.4.1 | sed 's/.*: //') - [[ "${SVRRM_WATT}" == *"."* ]] && SVRRM_WATT=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT=`printf "%'.0f\n" ${SVRRM_WATT}` + [[ "${SVRRM_WATT}" == *"."* ]] && SVRRM_WATT_disp=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}` SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.3.1 | sed 's/.*: //') SVRRM_AMP=`echo "scale=1; ${SVRRM_AMP}/10" | bc` fi @@ -583,11 +583,11 @@ CHECKPOWER(){ # APCPDU_WATT=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //') APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` echo "HERE: $APCPDU_WATT" - [[ "${APCPDU_WATT}" == *"."* ]] && APCPDU_WATT=`printf "%'.1f\n" ${APCPDU_WATT}` || APCPDU_WATT=`printf "%'.0f\n" ${APCPDU_WATT}` + [[ "${APCPDU_WATT}" == *"."* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}` fi echo -e "${idsCL[LightCyan]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT}'W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'W${idsCL[Default]}" echo if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then @@ -606,7 +606,7 @@ CHECKPOWER(){ echo -e "${idsCL[LightCyan]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'V${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP}'V${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}'W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'W${idsCL[Default]}" echo fi