Update power.inc.sh
This commit is contained in:
@@ -951,7 +951,6 @@ POWERLOGGER_SERVICE(){
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
|
||||
for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
|
||||
IFS=: read -r AMP WATT VOLT <<< $(GET_TUYA_POWER ${mSENSOR}); unset IFS
|
||||
if [ "${VOLT}" != "" ] && [ "${PW_POWERSENSOR_ID[${mSENSOR}]}" != "" ]; then
|
||||
@@ -960,32 +959,6 @@ POWERLOGGER_SERVICE(){
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
OFFSITE_FIREWALL_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-firewall']} | jq '.dps')
|
||||
if [ "${OFFSITE_FIREWALL_INFO}" != "" ]; then
|
||||
OFFSITE_FIREWALL_AMP=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
OFFSITE_FIREWALL_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_FIREWALL_AMP}/1000" | bc -l) 2)
|
||||
OFFSITE_FIREWALL_WATT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
OFFSITE_FIREWALL_WATT=$(echo "scale=1; ${OFFSITE_FIREWALL_WATT}/10" | bc -l)
|
||||
OFFSITE_FIREWALL_VOLT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
OFFSITE_FIREWALL_VOLT=$(echo "scale=1; ${OFFSITE_FIREWALL_VOLT}/10" | bc -l)
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`, \`volt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-firewall']}','${LogDataTime}','${OFFSITE_FIREWALL_AMP}','${OFFSITE_FIREWALL_WATT}','${OFFSITE_FIREWALL_VOLT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
OFFSITE_WIFI_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-wifi']} | jq '.dps')
|
||||
if [ "${OFFSITE_WIFI_INFO}" != "" ]; then
|
||||
OFFSITE_WIFI_AMP=$(echo "${OFFSITE_WIFI_INFO}" | grep '"4":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
OFFSITE_WIFI_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_WIFI_AMP}/1000" | bc -l) 2)
|
||||
OFFSITE_WIFI_WATT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"5":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
OFFSITE_WIFI_WATT=$(echo "scale=1; ${OFFSITE_WIFI_WATT}/10" | bc -l)
|
||||
OFFSITE_WIFI_VOLT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"6":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
OFFSITE_WIFI_VOLT=$(echo "scale=1; ${OFFSITE_WIFI_VOLT}/10" | bc -l)
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`, \`volt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-wifi']}','${LogDataTime}','${OFFSITE_WIFI_AMP}','${OFFSITE_WIFI_WATT}','${OFFSITE_WIFI_VOLT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
for SENSOR in ${PW_SENSOR_ORD[@]}; do
|
||||
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ]; 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')
|
||||
|
||||
Reference in New Issue
Block a user