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

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ dist-ssr
/data /data
!/data/.gitkeep !/data/.gitkeep
.vscode

Binary file not shown.

View File

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

View File

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

View File

@ -1,7 +1,8 @@
$primary: #5CDD8B; $primary: #5CDD8B;
$danger: #DC3545; $danger: #DC3545;
$warning: #f8a306;
$link-color: #111; $link-color: #111;
$border-radius: 50rem; $border-radius: 50rem;
$highlight: #7ce8a4; $highlight: #7ce8a4;
$highlight-white: #e7faec; $highlight-white: #e7faec;

View File

@ -3,7 +3,7 @@
<div class="hp-bar-big" :style="barStyle"> <div class="hp-bar-big" :style="barStyle">
<div <div
class="beat" class="beat"
:class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0) }" :class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0), 'pending' : (beat.status === 2) }"
:style="beatStyle" :style="beatStyle"
v-for="(beat, index) in shortBeatList" v-for="(beat, index) in shortBeatList"
:key="index" :key="index"
@ -166,6 +166,10 @@ export default {
background-color: $danger; background-color: $danger;
} }
&.pending {
background-color: $warning;
}
&:not(.empty):hover { &:not(.empty):hover {
transition: all ease-in-out 0.15s; transition: all ease-in-out 0.15s;
opacity: 0.8; opacity: 0.8;

View File

@ -14,6 +14,8 @@ export default {
return "danger" return "danger"
} else if (this.status === 1) { } else if (this.status === 1) {
return "primary" return "primary"
} else if (this.status === 2) {
return "warning"
} else { } else {
return "secondary" return "secondary"
} }
@ -24,6 +26,8 @@ export default {
return "Down" return "Down"
} else if (this.status === 1) { } else if (this.status === 1) {
return "Up" return "Up"
} else if (this.status === 2) {
return "Pending"
} else { } else {
return "Unknown" return "Unknown"
} }
@ -34,6 +38,6 @@ export default {
<style scoped> <style scoped>
span { span {
width: 45px; width: 54px;
} }
</style> </style>

View File

@ -30,6 +30,8 @@ export default {
return "danger" return "danger"
} else if (this.lastHeartBeat.status === 1) { } else if (this.lastHeartBeat.status === 1) {
return "primary" return "primary"
} else if (this.lastHeartBeat.status === 2) {
return "warning"
} else { } else {
return "secondary" return "secondary"
} }

View File

@ -274,6 +274,11 @@ export default {
text: "Down", text: "Down",
color: "danger" color: "danger"
}; };
} else if (lastHeartBeat.status === 2) {
result[monitorID] = {
text: "Pending",
color: "warning"
};
} else { } else {
result[monitorID] = unknown; result[monitorID] = unknown;
} }

View File

@ -90,6 +90,8 @@ export default {
result.up++; result.up++;
} else if (beat.status === 0) { } else if (beat.status === 0) {
result.down++; result.down++;
} else if (beat.status === 2) {
result.up++;
} else { } else {
result.unknown++; result.unknown++;
} }

View File

@ -48,6 +48,11 @@
<input type="number" class="form-control" id="interval" v-model="monitor.interval" required min="20" step="1"> <input type="number" class="form-control" id="interval" v-model="monitor.interval" required min="20" step="1">
</div> </div>
<div class="mb-3">
<label for="interval" class="form-label">Retry Pings</label>
<input type="number" class="form-control" id="interval" v-model="monitor.maxretries" required min="0" step="1">
</div>
<div> <div>
<button class="btn btn-primary" type="submit" :disabled="processing">Save</button> <button class="btn btn-primary" type="submit" :disabled="processing">Save</button>
</div> </div>
@ -61,7 +66,7 @@
<h2>Notifications</h2> <h2>Notifications</h2>
<p v-if="$root.notificationList.length === 0">Not available, please setup.</p> <p v-if="$root.notificationList.length === 0">Not available, please setup.</p>
<div class="form-check form-switch mb-3" v-for="notification in $root.notificationList"> <div class="form-check form-switch mb-3" :key="notification.id" v-for="notification in $root.notificationList">
<input class="form-check-input" type="checkbox" :id=" 'notification' + notification.id" v-model="monitor.notificationIDList[notification.id]"> <input class="form-check-input" type="checkbox" :id=" 'notification' + notification.id" v-model="monitor.notificationIDList[notification.id]">
<label class="form-check-label" :for=" 'notification' + notification.id"> <label class="form-check-label" :for=" 'notification' + notification.id">
@ -119,6 +124,7 @@ export default {
name: "", name: "",
url: "https://", url: "https://",
interval: 60, interval: 60,
maxretries: 0,
notificationIDList: {}, notificationIDList: {},
} }
} else if (this.isEdit) { } else if (this.isEdit) {