diff --git a/defaults.inc b/defaults.inc index 899fbf07..2b81d769 100755 --- a/defaults.inc +++ b/defaults.inc @@ -57,8 +57,8 @@ PW_REMOTE_SENSORS['Powerwall-CPU']='127.0.0.1' PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10' PW_REMOTE_SENSORS['OctoPI-CPU']='10.10.1.80' -PW_SENSOR_ORD=(ServerRoomTH Powerwall-CPU OctoPI-CPU iDS-vMS-Host0 iDS-vMS-Host1 iDS-vMS-Host6 iDS-vMS-Host7 OFF-vMS-Host1) -# PW_SENSOR_ORD=(OFF-vMS-Host1) +#PW_SENSOR_ORD=(ServerRoomTH Powerwall-CPU OctoPI-CPU iDS-vMS-Host0 iDS-vMS-Host1 iDS-vMS-Host6 iDS-vMS-Host7 OFF-vMS-Host1) +PW_SENSOR_ORD=(iDS-vMS-Host1) declare -A PW_SENSOR_ID PW_SENSOR_ID['ServerRoomTH']='2' diff --git a/powerwall.sh b/powerwall.sh index b202c7b1..10ac2970 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -627,7 +627,7 @@ CHECKPOWER(){ for SENSOR in ${PW_SENSOR_ORD[@]}; do if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then 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.3 | sed 's/.*: //') - [[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}" + [[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'W" echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}" fi done