Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement retries (#56) #86

Merged
merged 9 commits into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
LICENSE
README.md
.editorconfig
.vscode
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ dist-ssr

/data
!/data/.gitkeep
.vscode
Spiritreader marked this conversation as resolved.
Show resolved Hide resolved
Binary file modified db/kuma.db
Binary file not shown.
37 changes: 37 additions & 0 deletions db/patch3.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
-- Add maxretries column to monitor
PRAGMA foreign_keys=off;

BEGIN TRANSACTION;

create table monitor_dg_tmp
(
id INTEGER not null
primary key autoincrement,
name VARCHAR(150),
active BOOLEAN default 1 not null,
user_id INTEGER
references user
on update cascade on delete set null,
interval INTEGER default 20 not null,
url TEXT,
type VARCHAR(20),
weight INTEGER default 2000,
hostname VARCHAR(255),
port INTEGER,
created_date DATETIME,
keyword VARCHAR(255),
maxretries INTEGER NOT NULL DEFAULT 0
);

insert into monitor_dg_tmp(id, name, active, user_id, interval, url, type, weight, hostname, port, created_date, keyword) select id, name, active, user_id, interval, url, type, weight, hostname, port, created_date, keyword from monitor;

drop table monitor;

alter table monitor_dg_tmp rename to monitor;

create index user_id on monitor (user_id);

COMMIT;

PRAGMA foreign_keys=on;
16 changes: 12 additions & 4 deletions server/model/monitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const {Notification} = require("../notification")
* 1 = UP
*/
class Monitor extends BeanModel {

async toJSON() {

let notificationIDList = {};
Expand All @@ -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,
Expand All @@ -46,6 +46,7 @@ class Monitor extends BeanModel {

start(io) {
let previousBeat = null;
let retries = 0;

const beat = async () => {
if (! previousBeat) {
Expand Down Expand Up @@ -107,12 +108,19 @@ 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,
// Don't notify if disrupted changes to up
if ((! previousBeat || previousBeat.status !== bean.status) && bean.status !== 2 && !(previousBeat.status === 2 && bean.status !== 0)) {
bean.important = true;

// Do not send if first beat is UP
Expand Down Expand Up @@ -237,7 +245,7 @@ class Monitor extends BeanModel {
}

total += value;
if (row.status === 0) {
if (row.status === 0 || row.status === 2) {
downtime += value;
}
}
Expand Down
1 change: 1 addition & 0 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,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;

Expand Down
3 changes: 2 additions & 1 deletion src/assets/vars.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
$primary: #5CDD8B;
$danger: #DC3545;
$warning: #f8a306;
$link-color: #111;
$border-radius: 50rem;

$highlight: #7ce8a4;
$highlight-white: #e7faec;
$highlight-white: #e7faec;
6 changes: 5 additions & 1 deletion src/components/HeartbeatBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="hp-bar-big" :style="barStyle">
<div
class="beat"
:class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0) }"
:class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0), 'pending' : (beat.status === 2) }"
:style="beatStyle"
v-for="(beat, index) in shortBeatList"
:key="index"
Expand Down Expand Up @@ -166,6 +166,10 @@ export default {
background-color: $danger;
}

&.pending {
background-color: $warning;
}

&:not(.empty):hover {
transition: all ease-in-out 0.15s;
opacity: 0.8;
Expand Down
6 changes: 5 additions & 1 deletion src/components/Status.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export default {
return "danger"
} else if (this.status === 1) {
return "primary"
} else if (this.status === 2) {
return "warning"
} else {
return "secondary"
}
Expand All @@ -24,6 +26,8 @@ export default {
return "Down"
} else if (this.status === 1) {
return "Up"
} else if (this.status === 2) {
return "Pending"
} else {
return "Unknown"
}
Expand All @@ -34,6 +38,6 @@ export default {

<style scoped>
span {
width: 45px;
width: 54px;
}
</style>
2 changes: 2 additions & 0 deletions src/components/Uptime.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export default {
return "danger"
} else if (this.lastHeartBeat.status === 1) {
return "primary"
} else if (this.lastHeartBeat.status === 2) {
return "warning"
} else {
return "secondary"
}
Expand Down
5 changes: 5 additions & 0 deletions src/mixins/socket.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ export default {
text: "Down",
color: "danger"
};
} else if (lastHeartBeat.status === 2) {
result[monitorID] = {
text: "Pending",
color: "warning"
};
} else {
result[monitorID] = unknown;
}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/DashboardHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ export default {
result.up++;
} else if (beat.status === 0) {
result.down++;
} else if (beat.status === 2) {
result.up++;
} else {
result.unknown++;
}
Expand Down
9 changes: 8 additions & 1 deletion src/pages/EditMonitor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<input type="number" class="form-control" id="interval" v-model="monitor.interval" required min="20" step="1">
</div>

<div class="mb-3">
<label for="maxRetries" class="form-label">Retries</label>
<input type="number" class="form-control" id="maxRetries" v-model="monitor.maxretries" required min="0" step="1">
<div class="form-text">Maximum retries before the service is marked as down and send notifications</div>
louislam marked this conversation as resolved.
Show resolved Hide resolved
</div>

<div>
<button class="btn btn-primary" type="submit" :disabled="processing">Save</button>
</div>
Expand All @@ -61,7 +67,7 @@
<h2>Notifications</h2>
<p v-if="$root.notificationList.length === 0">Not available, please setup.</p>

<div class="form-check form-switch mb-3" v-for="(notification, index) in $root.notificationList" :key="index">
<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]">

<label class="form-check-label" :for=" 'notification' + notification.id">
Expand Down Expand Up @@ -119,6 +125,7 @@ export default {
name: "",
url: "https://",
interval: 60,
maxretries: 0,
notificationIDList: {},
}
} else if (this.isEdit) {
Expand Down