From a8b102ad4a0f8a146af04fd12e17adce7ff3662f Mon Sep 17 00:00:00 2001
From: Sam <earthstamper@gmail.com>
Date: Mon, 19 Jul 2021 18:23:06 +0200
Subject: [PATCH] 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
---
 .gitignore                      |   1 +
 db/kuma.db                      | Bin 57344 -> 61440 bytes
 server/model/monitor.js         |  15 +++++++++++----
 server/server.js                |   1 +
 src/assets/vars.scss            |   3 ++-
 src/components/HeartbeatBar.vue |   6 +++++-
 src/components/Status.vue       |   6 +++++-
 src/components/Uptime.vue       |   2 ++
 src/mixins/socket.js            |   5 +++++
 src/pages/DashboardHome.vue     |   2 ++
 src/pages/EditMonitor.vue       |   8 +++++++-
 11 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d435974f..9caa313cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ dist-ssr
 
 /data
 !/data/.gitkeep
+.vscode
\ No newline at end of file
diff --git a/db/kuma.db b/db/kuma.db
index 07c93cf89abb94bac751a47894d5e0fff94aa17b..6e02ccc01fefc1d40029c18cbec08a6039cf723f 100644
GIT binary patch
delta 1162
zcmd^9y>Hq;6t}@OU}Bu8Qcy*tT&yYrDQbX-p;K|;NZlHP%uyv1a>6Nb%U6s`5_KR$
zrHn0N>d=L?Q-!+s&*+%{phK8Cl-?O5l4k1Asgj?q`@PS5zxRCc&3|#_{}5YI7>1FE
zh(uT-qruirLSY^~`7ZKPM&wi`(u+J4{o=LoShx=51Czj~fXX9IUHa<V_%is&_W3Ed
z6W!isFW)-mK?8SB8V5B8H#;@=SWDjlq?`d21OZZ>Y7oeG^fHJGA=#?SAyr3k7aBk>
zA)r?^ZHwS7vx()<OU1}NQ;c{j6G<j0Y#usRk0^$}La_~Ue$&Nv?M4i0W3?P?_sj;d
zN-eGRsg+F*2<{=OcFsFDBBy6@PqB4$>?}&j!-7)P5J)GJN$Pam?mD+iN@p@|MV+?2
z@S~=OHZ~nxuhq$$WKF3>SV2m$Om(mE`DxoGSDs&N9;IoX+1Rly+;yvd(5G3;hFVmN
zeeeSA$7!R0Qbi?ICw(nK9ntKCk^$9SeP%K5MFJSG01c?;U<J4xl3n)%DCr;%HAqOQ
zK)2QW)VJ=EdbA+*T`&@ezKX@z%Nf{gw=Ab^d!Ij8_0YfL^8cc;@(-vS{tR#Wgv1c>
zpSiHiJRkc5>l_zZV~69-@O!qXNqm$rcw)8c_{^INk1F0<OI6Rqz1eus1){Sd-(qt<
zPQutH`tI|rG-0I4SO8bjD*1z~2Hk}gSbr?&xs8%wlqFAglwBT_!z@2uS^gmn%J&HR
E8=nh4_W%F@

delta 226
zcmZp8z}#?vd4jZ{0|NsC9}vU9+=)8I>JAKg!3n&4G7P+IAq;$Fd@8)myq~$1xGcFo
zbGop9VV}$H$@ZTuWV4{aIo8P`Y^zy3c-X`@GqcOHur$Z9vTs)7?q{6*fs@U>Ait<2
zR>9LR#MRw3NJoK}OF<zzxhOTUBsC>I1xUs!gn0V828THM20&%AQ!C5!i&A10!W@H~
zJsg8Hj7&{6H#6}v39~T>Ffi~x-^``(fL~0Kv$Qz12<T`5ri|3YqLL(_nKg}z3=|e6
M2rNoSSmdAp0JVHNSpWb4

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 162772875..4545541e3 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -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;
                 }
             }
diff --git a/server/server.js b/server/server.js
index bd5894775..567ff490c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -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;
 
diff --git a/src/assets/vars.scss b/src/assets/vars.scss
index 31b0262d8..ebec378a5 100644
--- a/src/assets/vars.scss
+++ b/src/assets/vars.scss
@@ -1,7 +1,8 @@
 $primary: #5CDD8B;
 $danger: #DC3545;
+$warning: #f8a306;
 $link-color: #111;
 $border-radius: 50rem;
 
 $highlight: #7ce8a4;
-$highlight-white: #e7faec;
+$highlight-white: #e7faec;
\ No newline at end of file
diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue
index 48ffd2926..03cdceca6 100644
--- a/src/components/HeartbeatBar.vue
+++ b/src/components/HeartbeatBar.vue
@@ -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"
@@ -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;
diff --git a/src/components/Status.vue b/src/components/Status.vue
index c5fec2241..1eaf17f2d 100644
--- a/src/components/Status.vue
+++ b/src/components/Status.vue
@@ -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"
             }
@@ -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"
             }
@@ -34,6 +38,6 @@ export default {
 
 <style scoped>
     span {
-        width: 45px;
+        width: 54px;
     }
 </style>
diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index ad8114fcb..322b35f70 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -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"
             }
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index f0a3b1a6a..42de1eb3f 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -274,6 +274,11 @@ export default {
                         text: "Down",
                         color: "danger"
                     };
+                } else if (lastHeartBeat.status === 2) {
+                    result[monitorID] = {
+                        text: "Pending",
+                        color: "warning"
+                    };
                 } else {
                     result[monitorID] = unknown;
                 }
diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue
index 820842bac..87380c7c2 100644
--- a/src/pages/DashboardHome.vue
+++ b/src/pages/DashboardHome.vue
@@ -90,6 +90,8 @@ export default {
                         result.up++;
                     } else if (beat.status === 0) {
                         result.down++;
+                    } else if (beat.status === 2) {
+                        result.up++;                
                     } else {
                         result.unknown++;
                     }
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 01af50610..e4898c33d 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -48,6 +48,11 @@
                         <input type="number" class="form-control" id="interval" v-model="monitor.interval" required min="20" step="1">
                     </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>
                         <button class="btn btn-primary" type="submit" :disabled="processing">Save</button>
                     </div>
@@ -61,7 +66,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 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]">
 
                     <label class="form-check-label" :for=" 'notification' + notification.id">
@@ -119,6 +124,7 @@ export default {
                     name: "",
                     url: "https://",
                     interval: 60,
+                    maxretries: 0,                    
                     notificationIDList: {},
                 }
             } else if (this.isEdit) {