diff --git a/defaults.inc b/defaults.inc index 3745f254..fa2815a0 100755 --- a/defaults.inc +++ b/defaults.inc @@ -72,6 +72,13 @@ PW_SENSOR_ID['OFF-vMS-Host1']='10' # PW_SENSOR_ID['iDS-vMS-Host2']='10' # PW_SENSOR_ID['vMS-iDrac8']='12' +declare -A PW_POWERSENSOR_ID +PW_POWERSENSOR_ID['iDS-vMS-Host0']='20' +PW_POWERSENSOR_ID['iDS-vMS-Host1']='20' +PW_POWERSENSOR_ID['iDS-vMS-Host6']='26' +PW_POWERSENSOR_ID['iDS-vMS-Host7']='27' +PW_POWERSENSOR_ID['OFF-vMS-Host1']='31' + declare -A PW_HOST_IDRACS PW_HOST_IDRACS['iDS-vMS-Host0']='10.10.2.20' PW_HOST_IDRACS['iDS-vMS-Host1']='10.10.2.21' diff --git a/powerwall.sh b/powerwall.sh index f70c481c..9093c163 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -913,9 +913,8 @@ POWERLOGGER_SERVICE(){ 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/.*: //') - # if [ "${HOST_WATTS}" = "" ]; then - HOST_WATT_SENSORS=$(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 -O vq | sed -e 's/"//g') + HOST_WATT_SENSORS=$(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 -O vq | sed -e 's/"//g') + if [ "${HOST_WATT_SENSORS}" != "" ]; then IFS=$'\n' read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}" unset IFS @@ -924,9 +923,10 @@ POWERLOGGER_SERVICE(){ [[ "${ss}" = *"System Board"* ]] && break || ((s++)) done 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/.*: //') - # fi - [[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts" - echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}" + + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID[${SENSOR}]}','${LogDataTime}','${HOST_WATTS}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" + fi fi done