Update powerwall.sh
This commit is contained in:
@@ -524,6 +524,7 @@ AVERAGEPOWER(){
|
|||||||
while IFS=$'\t' read date temp hum ;do
|
while IFS=$'\t' read date temp hum ;do
|
||||||
temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}")
|
temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}")
|
||||||
((logsfound++))
|
((logsfound++))
|
||||||
|
echo "$temptotal-$logsfound"
|
||||||
done < <(${mysql_conn} -se "USE servermonitor; SELECT date,volt,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
|
done < <(${mysql_conn} -se "USE servermonitor; SELECT date,volt,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
|
||||||
average=$(bc <<< "scale=2; ${temptotal}/${logsfound}")
|
average=$(bc <<< "scale=2; ${temptotal}/${logsfound}")
|
||||||
echo ${average}
|
echo ${average}
|
||||||
@@ -678,7 +679,7 @@ CHECKPOWER(){
|
|||||||
# fi
|
# fi
|
||||||
[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
|
[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
|
||||||
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} 1)
|
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} 1)
|
||||||
average_disp="${idsCL[LightCyan]} ${average}'watts"
|
average_disp="${idsCL[LightCyan]} ${average}'watts"
|
||||||
echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}"
|
echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user