diff --git a/db/patch-add-retry-interval-monitor.sql b/db/patch-add-retry-interval-monitor.sql
new file mode 100644
index 00000000..adb64623
--- /dev/null
+++ b/db/patch-add-retry-interval-monitor.sql
@@ -0,0 +1,7 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE monitor
+ ADD retry_interval INTEGER default 0 not null;
+
+COMMIT;
\ No newline at end of file
diff --git a/server/database.js b/server/database.js
index 31cb795e..39b723ce 100644
--- a/server/database.js
+++ b/server/database.js
@@ -32,6 +32,7 @@ class Database {
"patch-improve-performance.sql": true,
"patch-monitor-public.sql": true,
"patch-2fa.sql": true,
+ "patch-add-retry-interval-monitor.sql": true,
"patch-monitor-public-weight.sql": true,
}
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 3b445078..e74af935 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -58,6 +58,7 @@ class Monitor extends BeanModel {
active: this.active,
type: this.type,
interval: this.interval,
+ retryInterval: this.retryInterval,
keyword: this.keyword,
ignoreTls: this.getIgnoreTls(),
upsideDown: this.isUpsideDown(),
@@ -309,12 +310,17 @@ class Monitor extends BeanModel {
bean.important = false;
}
+ let beatInterval = this.interval;
+
if (bean.status === UP) {
- console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${this.interval} seconds | Type: ${this.type}`)
+ console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${beatInterval} seconds | Type: ${this.type}`)
} else if (bean.status === PENDING) {
- console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Type: ${this.type}`)
+ if (this.retryInterval !== this.interval) {
+ beatInterval = this.retryInterval;
+ }
+ console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Retry: ${retries} | Retry Interval: ${beatInterval} seconds | Type: ${this.type}`)
} else {
- console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
+ console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Interval: ${beatInterval} seconds | Type: ${this.type}`)
}
io.to(this.user_id).emit("heartbeat", bean.toJSON());
@@ -326,7 +332,7 @@ class Monitor extends BeanModel {
previousBeat = bean;
if (! this.isStop) {
- this.heartbeatInterval = setTimeout(beat, this.interval * 1000);
+ this.heartbeatInterval = setTimeout(beat, beatInterval * 1000);
}
}
diff --git a/server/server.js b/server/server.js
index 4eed8d47..70db99a7 100644
--- a/server/server.js
+++ b/server/server.js
@@ -490,6 +490,7 @@ exports.entryPage = "dashboard";
bean.type = monitor.type
bean.url = monitor.url
bean.interval = monitor.interval
+ bean.retryInterval = monitor.retryInterval;
bean.hostname = monitor.hostname;
bean.maxretries = monitor.maxretries;
bean.port = monitor.port;
@@ -931,7 +932,7 @@ exports.entryPage = "dashboard";
}
});
- socket.on("uploadBackup", async (uploadedJSON, callback) => {
+ socket.on("uploadBackup", async (uploadedJSON, importHandle, callback) => {
try {
checkLogin(socket)
@@ -939,54 +940,80 @@ exports.entryPage = "dashboard";
console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`)
- let notificationList = backupData.notificationList;
- let monitorList = backupData.monitorList;
+ let notificationListData = backupData.notificationList;
+ let monitorListData = backupData.monitorList;
- if (notificationList.length >= 1) {
- for (let i = 0; i < notificationList.length; i++) {
- let notification = JSON.parse(notificationList[i].config);
- await Notification.save(notification, null, socket.userID)
+ if (importHandle == "overwrite") {
+ for (let id in monitorList) {
+ let monitor = monitorList[id]
+ await monitor.stop()
}
+ await R.exec("DELETE FROM heartbeat");
+ await R.exec("DELETE FROM monitor_notification");
+ await R.exec("DELETE FROM monitor_tls_info");
+ await R.exec("DELETE FROM notification");
+ await R.exec("DELETE FROM monitor");
}
- if (monitorList.length >= 1) {
- for (let i = 0; i < monitorList.length; i++) {
- let monitor = {
- name: monitorList[i].name,
- type: monitorList[i].type,
- url: monitorList[i].url,
- interval: monitorList[i].interval,
- hostname: monitorList[i].hostname,
- maxretries: monitorList[i].maxretries,
- port: monitorList[i].port,
- keyword: monitorList[i].keyword,
- ignoreTls: monitorList[i].ignoreTls,
- upsideDown: monitorList[i].upsideDown,
- maxredirects: monitorList[i].maxredirects,
- accepted_statuscodes: monitorList[i].accepted_statuscodes,
- dns_resolve_type: monitorList[i].dns_resolve_type,
- dns_resolve_server: monitorList[i].dns_resolve_server,
- notificationIDList: {},
- }
-
- let bean = R.dispense("monitor")
+ if (notificationListData.length >= 1) {
+ let notificationNameList = await R.getAll("SELECT name FROM notification");
+ let notificationNameListString = JSON.stringify(notificationNameList);
- let notificationIDList = monitor.notificationIDList;
- delete monitor.notificationIDList;
+ for (let i = 0; i < notificationListData.length; i++) {
+ if ((importHandle == "skip" && notificationNameListString.includes(notificationListData[i].name) == false) || importHandle == "keep" || importHandle == "overwrite") {
- monitor.accepted_statuscodes_json = JSON.stringify(monitor.accepted_statuscodes);
- delete monitor.accepted_statuscodes;
+ let notification = JSON.parse(notificationListData[i].config);
+ await Notification.save(notification, null, socket.userID)
- bean.import(monitor)
- bean.user_id = socket.userID
- await R.store(bean)
+ }
+ }
+ }
- await updateMonitorNotification(bean.id, notificationIDList)
+ if (monitorListData.length >= 1) {
+ let monitorNameList = await R.getAll("SELECT name FROM monitor");
+ let monitorNameListString = JSON.stringify(monitorNameList);
+
+ for (let i = 0; i < monitorListData.length; i++) {
+ if ((importHandle == "skip" && monitorNameListString.includes(monitorListData[i].name) == false) || importHandle == "keep" || importHandle == "overwrite") {
+
+ let monitor = {
+ name: monitorListData[i].name,
+ type: monitorListData[i].type,
+ url: monitorListData[i].url,
+ interval: monitorListData[i].interval,
+ hostname: monitorListData[i].hostname,
+ maxretries: monitorListData[i].maxretries,
+ port: monitorListData[i].port,
+ keyword: monitorListData[i].keyword,
+ ignoreTls: monitorListData[i].ignoreTls,
+ upsideDown: monitorListData[i].upsideDown,
+ maxredirects: monitorListData[i].maxredirects,
+ accepted_statuscodes: monitorListData[i].accepted_statuscodes,
+ dns_resolve_type: monitorListData[i].dns_resolve_type,
+ dns_resolve_server: monitorListData[i].dns_resolve_server,
+ notificationIDList: {},
+ }
+
+ let bean = R.dispense("monitor")
+
+ let notificationIDList = monitor.notificationIDList;
+ delete monitor.notificationIDList;
+
+ monitor.accepted_statuscodes_json = JSON.stringify(monitor.accepted_statuscodes);
+ delete monitor.accepted_statuscodes;
+
+ bean.import(monitor)
+ bean.user_id = socket.userID
+ await R.store(bean)
+
+ await updateMonitorNotification(bean.id, notificationIDList)
+
+ if (monitorListData[i].active == 1) {
+ await startMonitor(socket.userID, bean.id);
+ } else {
+ await pauseMonitor(socket.userID, bean.id);
+ }
- if (monitorList[i].active == 1) {
- await startMonitor(socket.userID, bean.id);
- } else {
- await pauseMonitor(socket.userID, bean.id);
}
}
diff --git a/src/languages/da-DK.js b/src/languages/da-DK.js
index fa9ceac7..86e1c0c9 100644
--- a/src/languages/da-DK.js
+++ b/src/languages/da-DK.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For hver ny overvåger aktiveres denne underretning som standard. Du kan stadig deaktivere underretningen separat for hver skærm.",
"Default enabled": "Standard aktiveret",
"Also apply to existing monitors": "Anvend også på eksisterende overvågere",
- "Import/Export Backup": " Importér/Eksportér sikkerhedskopi",
Export: "Eksport",
Import: "Import",
backupDescription: "Du kan sikkerhedskopiere alle Overvågere og alle underretninger til en JSON-fil.",
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index 243c2157..008dbbc5 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -113,6 +113,8 @@ export default {
"Create your admin account": "Erstelle dein Admin Konto",
"Repeat Password": "Wiederhole das Passwort",
"Resource Record Type": "Resource Record Type",
+ "Export": "Export",
+ "Import": "Import",
"Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
@@ -128,6 +130,13 @@ export default {
backupDescription3: "Sensible Daten wie Benachrichtigungstoken sind in der Exportdatei enthalten, bitte bewahre sie sorgfältig auf.",
alertNoFile: "Bitte wähle eine Datei zum importieren aus.",
alertWrongFileType: "Bitte wähle eine JSON Datei aus.",
+ "Clear all statistics": "Lösche alle Statistiken",
+ importHandleDescription: "Wähle 'Vorhandene überspringen' aus, wenn jeder Monitor oder Benachrichtigung mit demselben Namen übersprungen werden soll. 'Überschreiben' löscht jeden vorhandenen Monitor sowie Benachrichtigungen.",
+ "Skip existing": "Vorhandene überspringen",
+ "Overwrite": "Überschreiben",
+ "Options": "Optionen",
+ confirmImportMsg: "Möchtest du das Backup wirklich importieren? Bitte stelle sicher, dass die richtige Import Option ausgewählt ist.",
+ "Keep both": "Beide behalten",
twoFAVerifyLabel: "Bitte trage deinen Token ein um zu verifizieren das 2FA funktioniert",
"Verify Token": "Token verifizieren",
"Setup 2FA": "2FA Einrichten",
diff --git a/src/languages/en.js b/src/languages/en.js
index a378ddcb..025f002f 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1,6 +1,7 @@
export default {
languageName: "English",
checkEverySecond: "Check every {0} seconds.",
+ retryCheckEverySecond: "Retry every {0} seconds.",
"Avg.": "Avg.",
retriesDescription: "Maximum retries before the service is marked as down and a notification is sent",
ignoreTLSError: "Ignore TLS/SSL error for HTTPS websites",
@@ -20,6 +21,8 @@ export default {
clearEventsMsg: "Are you sure want to delete all events for this monitor?",
clearHeartbeatsMsg: "Are you sure want to delete all heartbeats for this monitor?",
confirmClearStatisticsMsg: "Are you sure want to delete ALL statistics?",
+ importHandleDescription: "Choose 'Skip existing' if you want to skip every monitor or notification with the same name. 'Overwrite' will delete every existing monitor and notification.",
+ confirmImportMsg: "Are you sure to import the backup? Please make sure you've selected the right import option.",
twoFAVerifyLabel: "Please type in your token to verify that 2FA is working",
tokenValidSettingsMsg: "Token is valid! You can now save the 2FA settings.",
confirmEnableTwoFAMsg: "Are you sure you want to enable 2FA?",
@@ -68,6 +71,7 @@ export default {
Port: "Port",
"Heartbeat Interval": "Heartbeat Interval",
Retries: "Retries",
+ "Heartbeat Retry Interval": "Heartbeat Retry Interval",
Advanced: "Advanced",
"Upside Down Mode": "Upside Down Mode",
"Max. Redirects": "Max. Redirects",
@@ -115,7 +119,8 @@ export default {
"Last Result": "Last Result",
"Create your admin account": "Create your admin account",
"Repeat Password": "Repeat Password",
- "Import/Export Backup": "Import/Export Backup",
+ "Import Backup": "Import Backup",
+ "Export Backup": "Export Backup",
Export: "Export",
Import: "Import",
respTime: "Resp. Time (ms)",
@@ -132,6 +137,11 @@ export default {
backupDescription3: "Sensitive data such as notification tokens is included in the export file, please keep it carefully.",
alertNoFile: "Please select a file to import.",
alertWrongFileType: "Please select a JSON file.",
+ "Clear all statistics": "Clear all Statistics",
+ "Skip existing": "Skip existing",
+ "Overwrite": "Overwrite",
+ "Options": "Options",
+ "Keep both": "Keep both",
"Verify Token": "Verify Token",
"Setup 2FA": "Setup 2FA",
"Enable 2FA": "Enable 2FA",
diff --git a/src/languages/es-ES.js b/src/languages/es-ES.js
index ca3e4d75..cf6951a4 100644
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/et-EE.js b/src/languages/et-EE.js
index 551e0c67..14bedd17 100644
--- a/src/languages/et-EE.js
+++ b/src/languages/et-EE.js
@@ -113,7 +113,6 @@ export default {
clearEventsMsg: "Kas soovid seire kõik sündmused kustutada?",
clearHeartbeatsMsg: "Kas soovid seire kõik tuksed kustutada?",
confirmClearStatisticsMsg: "Kas soovid KÕIK statistika kustutada?",
- "Import/Export Backup": "Impordi/Ekspordi varukoopia",
Export: "Eksport",
Import: "Import",
"Default enabled": "Kasuta vaikimisi",
diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index 6d61beb0..ab03f68c 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 89c33fd6..6362f014 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -127,6 +127,7 @@ export default {
Events: "Eventi",
Heartbeats: "Controlli",
"Auto Get": "Auto Get",
+ "Also apply to existing monitors": "Also apply to existing monitors",
backupDescription: "È possibile fare il backup di tutti i monitoraggi e di tutte le notifiche in un file JSON.",
backupDescription2: "P.S.: lo storico e i dati relativi agli eventi non saranno inclusi.",
backupDescription3: "Dati sensibili come i token di autenticazione saranno inclusi nel backup, tenere quindi in un luogo sicuro.",
diff --git a/src/languages/ja.js b/src/languages/ja.js
index eff5279f..358df33c 100644
--- a/src/languages/ja.js
+++ b/src/languages/ja.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/ko-KR.js b/src/languages/ko-KR.js
index e730d714..349c3ae7 100644
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/nl-NL.js b/src/languages/nl-NL.js
index 540d03c8..00dc4150 100644
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@@ -140,6 +140,7 @@ export default {
"Two Factor Authentication": "Two Factor Authenticatie",
Active: "Actief",
Inactive: "Inactief",
+ "Also apply to existing monitors": "Also apply to existing monitors",
Token: "Token",
"Show URI": "Toon URI",
"Clear all statistics": "Wis alle statistieken",
diff --git a/src/languages/pl.js b/src/languages/pl.js
index a63005aa..e76c2f30 100644
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index b1e2b1ef..b25b5b12 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/sr-latn.js b/src/languages/sr-latn.js
index b0e5489f..38a6fe73 100644
--- a/src/languages/sr-latn.js
+++ b/src/languages/sr-latn.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/sr.js b/src/languages/sr.js
index e6e3ba4c..c163dcb6 100644
--- a/src/languages/sr.js
+++ b/src/languages/sr.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/sv-SE.js b/src/languages/sv-SE.js
index 38f27dac..559dbb82 100644
--- a/src/languages/sv-SE.js
+++ b/src/languages/sv-SE.js
@@ -120,7 +120,6 @@ export default {
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
"Default enabled": "Default enabled",
"Also apply to existing monitors": "Also apply to existing monitors",
- "Import/Export Backup": "Import/Export Backup",
Export: "Export",
Import: "Import",
backupDescription: "You can backup all monitors and all notifications into a JSON file.",
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index a1990168..f3e55fc8 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -119,6 +119,7 @@ export default {
"Auto Get": "自动获取",
enableDefaultNotificationDescription: "新的监控项将默认启用，你也可以在每个监控项中分别设置",
"Default enabled": "默认开启",
+ "Also apply to existing monitors": "应用到所有监控项",
"Import/Export Backup": "导入/导出备份",
Export: "导出",
Import: "导入",
diff --git a/src/languages/zh-HK.js b/src/languages/zh-HK.js
index 187e1a12..50959ca8 100644
--- a/src/languages/zh-HK.js
+++ b/src/languages/zh-HK.js
@@ -119,6 +119,7 @@ export default {
"Auto Get": "自動獲取",
enableDefaultNotificationDescription: "新增監測器時這個通知會預設啟用，當然每個監測器亦可分別控制開關。",
"Default enabled": "預設通知",
+ "Also apply to existing monitors": "同時取用至目前所有監測器",
"Import/Export Backup": "匯入/匯出 備份",
Export: "匯出",
Import: "匯入",
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index 715b4ef1..478cbf5e 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -305,8 +305,8 @@ export default {
this.importantHeartbeatList = {}
},
- uploadBackup(uploadedJSON, callback) {
- socket.emit("uploadBackup", uploadedJSON, callback)
+ uploadBackup(uploadedJSON, importHandle, callback) {
+ socket.emit("uploadBackup", uploadedJSON, importHandle, callback)
},
clearEvents(monitorID, callback) {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index cc836efe..2b80880c 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -106,6 +106,14 @@
+
+
+
+
+
{{ $t("Advanced") }}
@@ -255,6 +263,12 @@ export default {
"$route.fullPath"() {
this.init();
},
+ "monitor.interval"(value, oldValue) {
+ // Link interval and retryInerval if they are the same value.
+ if (this.monitor.retryInterval === oldValue) {
+ this.monitor.retryInterval = value;
+ }
+ }
},
mounted() {
this.init();
@@ -296,6 +310,7 @@ export default {
name: "",
url: "https://",
interval: 60,
+ retryInterval: this.interval,
maxretries: 0,
notificationIDList: {},
ignoreTls: false,
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 6216c6ca..da3e7245 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -145,27 +145,54 @@
- {{ $t("Import/Export Backup") }}
+ {{ $t("Export Backup") }}
{{ $t("backupDescription") }}
({{ $t("backupDescription2") }})
-