add retries for pinging function

backend:
- new field for monitor: maxretries
- new pending status while service is retrying: 2
- pending status event is not marked important
- pending pings however register as downtime in the calculation

frontend:
- added pending status while service is retrying
- added color for new pending status
- added field to configure amount of retries

database:
- IMPORTANT: THIS REQUIRES MIGRATION!!!!
- added field: maxretries with default value 0
This commit is contained in:
Sam
2021-07-19 18:23:06 +02:00
parent cbb9d3f91b
commit a8b102ad4a
11 changed files with 41 additions and 8 deletions

View File

@@ -16,7 +16,6 @@ const {Notification} = require("../notification")
* 1 = UP
*/
class Monitor extends BeanModel {
async toJSON() {
let notificationIDList = {};
@@ -35,6 +34,7 @@ class Monitor extends BeanModel {
url: this.url,
hostname: this.hostname,
port: this.port,
maxretries: this.maxretries,
weight: this.weight,
active: this.active,
type: this.type,
@@ -46,6 +46,7 @@ class Monitor extends BeanModel {
start(io) {
let previousBeat = null;
let retries = 0;
const beat = async () => {
console.log(`Monitor ${this.id}: Heartbeat`)
@@ -109,12 +110,18 @@ class Monitor extends BeanModel {
bean.status = 1;
}
retries = 0;
} catch (error) {
if ((this.maxretries > 0) && (retries < this.maxretries)) {
retries++;
bean.status = 2;
}
bean.msg = error.message;
}
// Mark as important if status changed
if (! previousBeat || previousBeat.status !== bean.status) {
// Mark as important if status changed, ignore pending pings
if ((! previousBeat || previousBeat.status !== bean.status) && bean.status !== 2) {
bean.important = true;
// Do not send if first beat is UP
@@ -233,7 +240,7 @@ class Monitor extends BeanModel {
}
total += value;
if (row.status === 0) {
if (row.status === 0 || row.status === 2) {
downtime += value;
}
}

View File

@@ -219,6 +219,7 @@ let needSetup = false;
bean.url = monitor.url
bean.interval = monitor.interval
bean.hostname = monitor.hostname;
bean.maxretries = monitor.maxretries;
bean.port = monitor.port;
bean.keyword = monitor.keyword;