From 1935da5b16af5afb8aca7084032435696847d70e Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 12:47:52 +0530 Subject: [PATCH 01/16] Slack Enhancements --- server/notification.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/server/notification.js b/server/notification.js index 99cc1568c..5639ae9c6 100644 --- a/server/notification.js +++ b/server/notification.js @@ -128,13 +128,17 @@ class Notification { } else if (notification.type === "slack") { try { if (heartbeatJSON == null) { - let data = {'text': "Uptime Kuma Slack testing successful."} + let data = {'text': "Uptime Kuma Slack testing successful.", 'channel': notification.slackchannel, 'username': notification.slackusername, 'icon_emoji': notification.slackiconemo} let res = await axios.post(notification.slackwebhookURL, data) return true; } const time = heartbeatJSON["time"]; let data = { + "text": "Uptime Kuma Alert", + "channel":notification.slackchannel, + "username": notification.slackusername, + "icon_emoji": notification.slackiconemo, "blocks": [{ "type": "header", "text": { @@ -155,17 +159,17 @@ class Notification { ] }, { - "type": "actions", - "elements": [ - { - "type": "button", - "text": { + "type": "actions", + "elements": [ + { + "type": "button", + "text": { "type": "plain_text", "text": "Visit Uptime Kuma", }, - "value": "Uptime-Kuma", - "url": notification.slackbutton - } + "value": "Uptime-Kuma", + "url": "https://github.com/louislam/uptime-kuma" || notification.slackbutton + } ] } ] From 65b320d06b2ab84d5fc6705a8132f3c3f6106f20 Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 12:48:42 +0530 Subject: [PATCH 02/16] Slack Enhancements --- src/components/NotificationDialog.vue | 34 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue index 159915177..3b7f87a99 100644 --- a/src/components/NotificationDialog.vue +++ b/src/components/NotificationDialog.vue @@ -191,15 +191,31 @@ From 829a2a191d90286b81b2059f45ab81bf61a49ebf Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 13:42:05 +0530 Subject: [PATCH 03/16] Footer center align --- src/layouts/Layout.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index b9aca97f6..237f051bd 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -146,6 +146,7 @@ footer { font-size: 13px; margin-bottom: 30px; margin-left: 10px; + text-align: center; } From 20cad505939ba71da1614298bde7994f7906be08 Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 17:49:56 +0530 Subject: [PATCH 04/16] Pushover support --- src/components/NotificationDialog.vue | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue index 159915177..e8570e856 100644 --- a/src/components/NotificationDialog.vue +++ b/src/components/NotificationDialog.vue @@ -20,6 +20,7 @@ + @@ -202,6 +203,55 @@

+ +
From ce2d78f45ac1db458632747e3a461b56cd6be0a2 Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 17:55:02 +0530 Subject: [PATCH 05/16] Pushover support --- server/notification.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/server/notification.js b/server/notification.js index 99cc1568c..6a92effe8 100644 --- a/server/notification.js +++ b/server/notification.js @@ -177,6 +177,35 @@ class Notification { return false; } + } else if (notification.type === "pushover") { + var pushoverlink = 'https://api.pushover.net/1/messages.json' + try { + if (heartbeatJSON == null) { + let data = {'message': "Uptime Kuma Pushover testing successful.", + 'user': notification.pushoveruserkey, 'token': notification.pushoverapptoken, 'sound':notification.pushoversounds, + 'priority': notification.pushoverpriority, 'title':notification.pushovertitle, 'retry': "30", 'expire':"3600", 'html': 1} + let res = await axios.post(pushoverlink, data) + return true; + } + + let data = { + "message": "Uptime Kuma Alert\n\nMessage:" +msg + '\nTime (UTC):' +time, + "user":notification.pushoveruserkey, + "token": notification.pushoverapptoken, + "sound": notification.pushoversounds, + "priority": notification.pushoverpriority, + "title": notification.pushovertitle, + "retry": "30", + "expire": "3600", + "html": 1 + } + let res = await axios.post(pushoverlink, data) + return true; + } catch (error) { + console.log(error) + return false; + } + } else { throw new Error("Notification type is not supported") } From 7808aef58fee01e1423dbffebeae2b4dbdc6a65a Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 18:42:54 +0530 Subject: [PATCH 06/16] Pushover support --- src/components/NotificationDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue index e8570e856..901ce3449 100644 --- a/src/components/NotificationDialog.vue +++ b/src/components/NotificationDialog.vue @@ -244,7 +244,7 @@
*Required

- More info about webhooks on: https://pushover.net/api + More info on: https://pushover.net/api

Emergency priority(2) has default 30 second timeout between retries and will expire after 1 hour. From 01f2fccb2379e764c4b52a6c961532823fade815 Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 18:59:26 +0530 Subject: [PATCH 07/16] Update notification.js --- server/notification.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/notification.js b/server/notification.js index 5639ae9c6..aa32438a0 100644 --- a/server/notification.js +++ b/server/notification.js @@ -168,7 +168,7 @@ class Notification { "text": "Visit Uptime Kuma", }, "value": "Uptime-Kuma", - "url": "https://github.com/louislam/uptime-kuma" || notification.slackbutton + "url": notification.slackbutton || "https://github.com/louislam/uptime-kuma" } ] } From c203317b3b74002ffa37f9b76f5ff8fc04a8a58a Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 20:07:35 +0530 Subject: [PATCH 08/16] Docker healthcheck Copied from https://scoutapm.com/blog/how-to-use-docker-healthcheck --- extra/healthcheck.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 extra/healthcheck.js diff --git a/extra/healthcheck.js b/extra/healthcheck.js new file mode 100644 index 000000000..b547fbcba --- /dev/null +++ b/extra/healthcheck.js @@ -0,0 +1,19 @@ +var http = require("http"); +var options = { + host: "localhost", + port: "3001", + timeout: 2000, +}; +var request = http.request(options, (res) => { + console.log(`STATUS: ${res.statusCode}`); + if (res.statusCode == 200) { + process.exit(0); + } else { + process.exit(1); + } +}); +request.on("error", function (err) { + console.log("ERROR"); + process.exit(1); +}); +request.end(); From 7dae5279fbcbb492fd1fd3664b0b45edcb54fe27 Mon Sep 17 00:00:00 2001 From: Niyas Date: Sat, 17 Jul 2021 20:08:01 +0530 Subject: [PATCH 09/16] Docker healthcheck Copied from https://scoutapm.com/blog/how-to-use-docker-healthcheck --- dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfile b/dockerfile index 0388d4bcb..923d8b10a 100644 --- a/dockerfile +++ b/dockerfile @@ -31,6 +31,7 @@ RUN npm run build EXPOSE 3001 VOLUME ["/app/data"] +HEALTHCHECK --interval=5s --timeout=3s --start-period=30s CMD node extra/healthcheck.js CMD ["npm", "run", "start-server"] FROM release AS nightly From 149688e669a8b0b82f55e7db713d16ec0fc3c488 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 22:24:10 +0200 Subject: [PATCH 10/16] Add robots.txt --- public/robots.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 public/robots.txt diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..e9e57dc4d --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,3 @@ +# https://www.robotstxt.org/robotstxt.html +User-agent: * +Disallow: From 790c071f2c1b2fed63ab171de5aaef519b0c425e Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 22:45:28 +0200 Subject: [PATCH 11/16] Resize apple icon to 192px --- public/apple-touch-icon.png | Bin 22141 -> 4086 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index db02af7bada6ab97f7a5cfeb0a6390b5c286575d..3bb82e4c9aa30a7291fa98c89153785d909f97f3 100644 GIT binary patch literal 4086 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 literal 22141 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 From db34484ff26d1b6f0fe0a7012dac2ff634320aec Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 22:51:07 +0200 Subject: [PATCH 12/16] Add theme-color --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 3dd55d3f1..03a3014ab 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,7 @@ + Uptime Kuma From 637422494fd2e8afda9e175392c0184f8068de0d Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 22:53:32 +0200 Subject: [PATCH 13/16] Add description --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 03a3014ab..66d58c1e6 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + Uptime Kuma From e87b78501bf71ad665c6355b0c88e2e8076dd395 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 22:55:53 +0200 Subject: [PATCH 14/16] rel="noopener" for external link --- src/layouts/Layout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index b9aca97f6..06ef8e640 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -37,7 +37,7 @@

Uptime Kuma - Version: {{ $root.info.version }} - - Check Update On GitHub + Check Update On GitHub
From bfb4a5bcd4f00a7ceb44f4778720dd5914617fd3 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 22:56:54 +0200 Subject: [PATCH 15/16] Add alt="Logo" --- src/layouts/Layout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index 06ef8e640..b9840845d 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -9,7 +9,7 @@
- + Uptime Kuma From 2bff62cade12f1bc5b6e1a696103cefd4445363c Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sat, 17 Jul 2021 23:13:54 +0200 Subject: [PATCH 16/16] Improve printing to console --- server/notification.js | 14 +++++++------- server/server.js | 4 ++-- src/util-frontend.js | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/notification.js b/server/notification.js index 99cc1568c..113882000 100644 --- a/server/notification.js +++ b/server/notification.js @@ -15,7 +15,7 @@ class Notification { }) return true; } catch (error) { - console.log(error) + console.error(error) return false; } @@ -31,7 +31,7 @@ class Notification { }) return true; } catch (error) { - console.log(error) + console.error(error) return false; } @@ -61,7 +61,7 @@ class Notification { let res = await axios.post(notification.webhookURL, finalData, config) return true; } catch (error) { - console.log(error) + console.error(error) return false; } @@ -105,7 +105,7 @@ class Notification { let res = await axios.post(notification.discordWebhookUrl, data) return true; } catch(error) { - console.log(error) + console.error(error) return false; } @@ -121,10 +121,10 @@ class Notification { let res = await axios.post(notification.signalURL, data, config) return true; } catch (error) { - console.log(error) + console.error(error) return false; } - + } else if (notification.type === "slack") { try { if (heartbeatJSON == null) { @@ -173,7 +173,7 @@ class Notification { let res = await axios.post(notification.slackwebhookURL, data) return true; } catch (error) { - console.log(error) + console.error(error) return false; } diff --git a/server/server.js b/server/server.js index 93e43cd6e..b53f32b49 100644 --- a/server/server.js +++ b/server/server.js @@ -19,7 +19,7 @@ const version = require('../package.json').version; const hostname = args.host || "0.0.0.0" const port = args.port || 3001 -console.log("Version: " + version) +console.info("Version: " + version) console.log("Creating express and socket.io instance") const app = express(); @@ -236,7 +236,7 @@ let needSetup = false; }); } catch (e) { - console.log(e) + console.error(e) callback({ ok: false, msg: e.message diff --git a/src/util-frontend.js b/src/util-frontend.js index 7094c159b..abdf7b5ae 100644 --- a/src/util-frontend.js +++ b/src/util-frontend.js @@ -394,7 +394,7 @@ export function timezoneList() { time: getTimezoneOffset(timezone), }) } catch (e) { - console.log(e.message); + console.error(e.message); console.log("Skip this timezone") }