Merge remote-tracking branch 'origin/master' into feature-google-analytics

This commit is contained in:
Louis Lam
2023-02-04 15:40:13 +08:00
14 changed files with 342 additions and 19 deletions

View File

@@ -1255,7 +1255,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