Merge branch 'master' into group-monitors

This commit is contained in:
Peace
2023-02-16 21:38:53 +01:00
committed by GitHub
58 changed files with 4845 additions and 1767 deletions

View File

@@ -1299,7 +1299,7 @@ class Monitor extends BeanModel {
*/
static async getPreviousHeartbeat(monitorID) {
return await R.getRow(`
SELECT status, time FROM heartbeat
SELECT ping, status, time FROM heartbeat
WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
`, [
monitorID