diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1712b66c9..2eedd548b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,76 +1,193 @@
# Project Info
-First of all, I want to thank everyone who have made pull requests for Uptime Kuma. I never thought the GitHub community would be so nice! Because of this, I also never thought that other people would actually read and edit my code. It is not very well structured or commented, sorry about that.
+First of all, I want to thank everyone who have wrote issues or shared pull requests for Uptime Kuma.
+I never thought the GitHub community would be so nice!
+Because of this, I also never thought that other people would actually read and edit my code.
+Parts of the code are not very well-structured or commented, sorry about that.
-The project was created with vite.js (vue3). Then I created a subdirectory called "server" for the server part. Both frontend and backend share the same `package.json`.
+The project was created with `vite.js` and is written in `vue3`.
+Our backend lives in the `server`-directory and mostly communicates via websockets.
+Both frontend and backend share the same `package.json`.
-The frontend code builds into "dist" directory. The server (express.js) exposes the "dist" directory as the root of the endpoint. This is how production is working.
-
-## Key Technical Skills
-
-- Node.js (You should know about promises, async/await, arrow functions, etc.)
-- Socket.io
-- SCSS
-- Vue.js
-- Bootstrap
-- SQLite
+For production, the frontend is build into `dist`-directory and the server (`express.js`) exposes the `dist` directory as the root of the endpoint.
+For development, we run vite in development mode on another port.
## Directories
-- config (dev config files)
-- data (App data)
-- db (Base database and migration scripts)
-- dist (Frontend build)
-- docker (Dockerfiles)
-- extra (Extra useful scripts)
-- public (Frontend resources for dev only)
-- server (Server source code)
-- src (Frontend source code)
-- test (unit test)
+- `config` (dev config files)
+- `data` (App data)
+- `db` (Base database and migration scripts)
+- `dist` (Frontend build)
+- `docker` (Dockerfiles)
+- `extra` (Extra useful scripts)
+- `public` (Frontend resources for dev only)
+- `server` (Server source code)
+- `src` (Frontend source code)
+- `test` (unit test)
## Can I create a pull request for Uptime Kuma?
-Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**. Especially for a large pull request or you don't know if it will be merged or not.
+Yes or no, it depends on what you will try to do.
+Both your and our maintainers time is precious, and we don't want to waste both time.
-Here are some references:
+If you have any questions about any process/.. is not clear, you are likely not alone => please ask them ^^
-### ✅ Usually accepted
+Different guidelines exist for different types of pull requests (PRs):
+- security fixes
+
+ Submitting security fixes is something that may put the community at risk.
+ Please read through our [security policy](SECURITY.md) and submit vulnerabilities via an [advisory](https://github.com/louislam/uptime-kuma/security/advisories/new) + [issue](https://github.com/louislam/uptime-kuma/issues/new?assignees=&labels=help&template=security.md) instead.
+ We encourage you to submit how to fix a vulnerability if you know how to, this is not required.
+ Following the security policy allows us to properly test, fix bugs.
+ This review allows us to notice, if there are any changes necessary to unrelated parts like the documentation.
+ [**PLEASE SEE OUR SECURITY POLICY.**](SECURITY.md)
+
+
+ small, non-breaking bug fixes
+
+ If you come across a bug and think you can solve, we appreciate your work.
+ Please make sure that you follow by these rules:
+ - keep the PR as small as possible, fix only one thing at a time => keeping it reviewable
+ - test that your code does what you came it does.
+
+ Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.
+
+ translations / internationalisation (i18n)
+
+ We use weblate to localise this project into many languages.
+ If you are unhappy with a translation this is the best start.
+ On how to translate using weblate, please see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
+
+ There are two cases in which a change cannot be done in weblate and requires a PR:
+ - A text may not be currently localisable. In this case, **adding a new language key** via `$t("languageKey")` might be nessesary
+ - language keys need to be **added to `en.json`** to be visible in weblate. If this has not happened, a PR is appreciated.
+ - **Adding a new language** requires a new file see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md)
+
+ Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.
+
+ new notification providers
+
+ To set up a new notification provider these files need to be modified/created:
+ - `server/notification-providers/PROVIDER_NAME.js` is where the heart of the notification provider lives.
+ - Both `monitorJSON` and `heartbeatJSON` can be `null` for some events.
+ If both are `null`, this is a general testing message, but if just `heartbeatJSON` is `null` this is a certificate expiry.
+ - Please wrap the axios call into a
+ ```js
+ try {
+ let result = await axios.post(...);
+ if (result.status === ...) ...
+ } catch (error) {
+ this.throwGeneralAxiosError(error);
+ }
+ ```
+ - `server/notification.js` is where the backend of the notification provider needs to be registered.
+ *If you have an idea how we can skip this step, we would love to hear about it ^^*
+ - `src/components/NotificationDialog.vue` you need to decide if the provider is a regional or a global one and add it with a name to the respective list
+ - `src/components/notifications/PROVIDER_NAME.vue` is where the frontend of each provider lives.
+ Please make sure that you have:
+ - used `HiddenInput` for secret credentials
+ - included all the necessary helptexts/placeholder/.. to make sure the notification provider is simple to setup for new users.
+ - include all translations (`{{ $t("Translation key") }}`, [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html)) in `src/lang/en.json` to enable our translators to translate this
+ - `src/components/notifications/index.js` is where the frontend of the provider needs to be registered.
+ *If you have an idea how we can skip this step, we would love to hear about it ^^*
-- Bug fix
-- Security fix
-- Adding notification providers
-- Adding new language files (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
-- Adding new language keys: `$t("...")`
+ Offering notifications is close to the core of what we are as an uptime monitor.
+ Therefore, making sure that they work is also really important.
+ Because testing notification providers is quite time intensive, we mostly offload this onto the person contributing a notification provider.
+
+ To make shure you have tested the notification provider, please include screenshots of the following events in the pull-request description:
+ - `UP`/`DOWN`
+ - Certificate Expiry via https://expired.badssl.com/
+ - Testing (the test button on the notification provider setup page)
+
+ Using the following way to format this is encouraged:
+ ```md
+ | Event | Before | After |
+ ------------------
+ | `UP` | paste-image-here | paste-image-here |
+ | `DOWN` | paste-image-here | paste-image-here |
+ | Certificate-expiry | paste-image-here | paste-image-here |
+ | Testing | paste-image-here | paste-image-here |
+ ```
-### ⚠️ Discussion required
+ Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.
+
+ new monitoring types
-- Large pull requests
-- New features
+ To set up a new notification provider these files need to be modified/created:
+ - `server/monitor-types/MONITORING_TYPE.js` is the core of each monitor.
+ the `async check(...)`-function should:
+ - throw an error for each fault that is detected with an actionable error message
+ - in the happy-path, you should set `heartbeat.msg` to a successfull message and set `heartbeat.status = UP`
+ - `server/uptime-kuma-server.js` is where the monitoring backend needs to be registered.
+ *If you have an idea how we can skip this step, we would love to hear about it ^^*
+ - `src/pages/EditMonitor.vue` is the shared frontend users interact with.
+ Please make sure that you have:
+ - used `HiddenInput` for secret credentials
+ - included all the necessary helptexts/placeholder/.. to make sure the notification provider is simple to setup for new users.
+ - include all translations (`{{ $t("Translation key") }}`, [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html)) in `src/lang/en.json` to enable our translators to translate this
+ -
-### ❌ Won't be merged
-- A dedicated PR for translating existing languages (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
-- Do not pass the auto-test
-- Any breaking changes
-- Duplicated pull requests
-- Buggy
-- UI/UX is not close to Uptime Kuma
-- Modifications or deletions of existing logic without a valid reason.
-- Adding functions that is completely out of scope
-- Converting existing code into other programming languages
-- Unnecessarily large code changes that are hard to review and cause conflicts with other PRs.
+ Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.
+
+ new features/ major changes / breaking bugfixes
+
+ be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**.
+ This is especially important for a large pull request or you don't know if it will be merged or not.
+
+ Because of the large impact of this work, only senior maintainers may merge PRs in this area.
+
+ Release
+
-### Release Wiki
+ 1. Draft a release note
+ 2. Make sure the repo is cleared
+ 3. If the healthcheck is updated, remember to re-compile it: `npm run build-docker-builder-go`
+ 4. `npm run release-final` with env vars: `VERSION` and `GITHUB_TOKEN`
+ 5. Wait until the `Press any key to continue`
+ 6. `git push`
+ 7. Publish the release note as `1.X.X`
+ 8. Press any key to continue
+ 9. Deploy to the demo server: `npm run deploy-demo-server`
-#### Setup Repo
+ These Items need to be checked:
-```bash
-git clone https://github.com/louislam/uptime-kuma-wiki.git
-cd uptime-kuma-wiki
-git remote add production https://github.com/louislam/uptime-kuma.wiki.git
-```
+ - [ ] Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags
+ - [ ] Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7)
+ - [ ] Try clean installation with Node.js
+
+
+ Release Beta
+
-#### Push to Production Wiki
+ 1. Draft a release note, check `This is a pre-release`
+ 2. Make sure the repo is cleared
+ 3. `npm run release-beta` with env vars: `VERSION` and `GITHUB_TOKEN`
+ 4. Wait until the `Press any key to continue`
+ 5. Publish the release note as `1.X.X-beta.X`
+ 6. Press any key to continue
+
+
+ Release Wiki
+
-```bash
-git pull
-git push production master
-```
-
-## Useful Commands
-
-Change the base of a pull request such as `master` to `1.23.X`
-
-```bash
-git rebase --onto
-```
+ **Setup Repo**
+
+ ```bash
+ git clone https://github.com/louislam/uptime-kuma-wiki.git
+ cd uptime-kuma-wiki
+ git remote add production https://github.com/louislam/uptime-kuma.wiki.git
+ ```
+
+ **Push to Production Wiki**
+
+ ```bash
+ git pull
+ git push production master
+ ```
+
+
+ Change the base of a pull request such as master to 1.23.X
+
+
+ ```bash
+ git rebase --onto
+ ```
+
+
+ }
*/
- start(io) {
+ async start(io) {
let previousBeat = null;
let retries = 0;
@@ -1098,9 +1102,9 @@ class Monitor extends BeanModel {
/**
* Stop monitor
- * @returns {void}
+ * @returns {Promise}
*/
- stop() {
+ async stop() {
clearTimeout(this.heartbeatInterval);
this.isStop = true;
@@ -1527,11 +1531,11 @@ class Monitor extends BeanModel {
}
/**
- * Gets Full Path-Name (Groups and Name)
- * @returns {Promise} Full path name of this monitor
+ * Gets the full path
+ * @returns {Promise} Full path (includes groups and the name) of the monitor
*/
- async getPathName() {
- let path = this.name;
+ async getPath() {
+ const path = [ this.name ];
if (this.parent === null) {
return path;
@@ -1539,7 +1543,7 @@ class Monitor extends BeanModel {
let parent = await Monitor.getParent(this.id);
while (parent !== null) {
- path = `${parent.name} / ${path}`;
+ path.unshift(parent.name);
parent = await Monitor.getParent(parent.id);
}
diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index cff5c93d7..9b2db43d0 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -81,7 +81,8 @@ class MqttMonitorType extends MonitorType {
let client = mqtt.connect(mqttUrl, {
username,
- password
+ password,
+ clientId: "uptime-kuma_" + Math.random().toString(16).substr(2, 8)
});
client.on("connect", () => {
diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
new file mode 100644
index 000000000..20b53e6af
--- /dev/null
+++ b/server/notification-providers/heii-oncall.js
@@ -0,0 +1,52 @@
+const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
+const { setting } = require("../util-server");
+
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+class HeiiOnCall extends NotificationProvider {
+ name = "HeiiOnCall";
+
+ /**
+ * @inheritdoc
+ */
+ async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+ const okMsg = "Sent Successfully.";
+ const payload = heartbeatJSON || {};
+
+ const baseURL = await setting("primaryBaseURL");
+ if (baseURL && monitorJSON) {
+ payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
+ }
+
+ const config = {
+ headers: {
+ Accept: "application/json",
+ "Content-Type": "application/json",
+ Authorization: "Bearer " + notification.heiiOnCallApiKey,
+ },
+ };
+ const heiiUrl = `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/`;
+ // docs https://heiioncall.com/docs#manual-triggers
+ try {
+ if (!heartbeatJSON) {
+ // Testing or general notification like certificate expiry
+ payload["msg"] = msg;
+ await axios.post(heiiUrl + "alert", payload, config);
+ return okMsg;
+ }
+
+ if (heartbeatJSON.status === DOWN) {
+ await axios.post(heiiUrl + "alert", payload, config);
+ return okMsg;
+ }
+ if (heartbeatJSON.status === UP) {
+ await axios.post(heiiUrl + "resolve", payload, config);
+ return okMsg;
+ }
+ } catch (error) {
+ this.throwGeneralAxiosError(error);
+ }
+ }
+}
+
+module.exports = HeiiOnCall;
diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 86fc0e081..12c9258b8 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -54,14 +54,17 @@ class Ntfy extends NotificationProvider {
"priority": priority,
"title": monitorJSON.name + " " + status + " [Uptime-Kuma]",
"tags": tags,
- "actions": [
+ };
+
+ if (monitorJSON.url && monitorJSON.url !== "https://") {
+ data.actions = [
{
"action": "view",
"label": "Open " + monitorJSON.name,
"url": monitorJSON.url,
- }
- ]
- };
+ },
+ ];
+ }
if (notification.ntfyIcon) {
data.icon = notification.ntfyIcon;
diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index 30976cf5b..bf2cd7647 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -1,6 +1,7 @@
const NotificationProvider = require("./notification-provider");
const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
+const { setting } = require("../util-server");
+const { DOWN, UP, getMonitorRelativeURL } = require("../../src/util");
class Teams extends NotificationProvider {
name = "teams";
@@ -9,89 +10,172 @@ class Teams extends NotificationProvider {
* Generate the message to send
* @param {const} status The status constant
* @param {string} monitorName Name of monitor
+ * @param {boolean} withStatusSymbol If the status should be prepended as symbol
* @returns {string} Status message
*/
- _statusMessageFactory = (status, monitorName) => {
+ _statusMessageFactory = (status, monitorName, withStatusSymbol) => {
if (status === DOWN) {
- return `🔴 Application [${monitorName}] went down`;
+ return (withStatusSymbol ? "🔴 " : "") + `[${monitorName}] went down`;
} else if (status === UP) {
- return `✅ Application [${monitorName}] is back online`;
+ return (withStatusSymbol ? "✅ " : "") + `[${monitorName}] is back online`;
}
return "Notification";
};
/**
- * Select theme color to use based on status
+ * Select the style to use based on status
* @param {const} status The status constant
- * @returns {string} Selected color in hex RGB format
+ * @returns {string} Selected style for adaptive cards
*/
- _getThemeColor = (status) => {
+ _getStyle = (status) => {
if (status === DOWN) {
- return "ff0000";
+ return "attention";
}
if (status === UP) {
- return "00e804";
+ return "good";
}
- return "008cff";
+ return "emphasis";
};
/**
* Generate payload for notification
* @param {object} args Method arguments
- * @param {const} args.status The status of the monitor
- * @param {string} args.monitorMessage Message to send
- * @param {string} args.monitorName Name of monitor affected
- * @param {string} args.monitorUrl URL of monitor affected
+ * @param {object} args.heartbeatJSON Heartbeat details
+ * @param {string} args.monitorName Name of the monitor affected
+ * @param {string} args.monitorUrl URL of the monitor affected
+ * @param {string} args.dashboardUrl URL of the dashboard affected
* @returns {object} Notification payload
*/
_notificationPayloadFactory = ({
- status,
- monitorMessage,
+ heartbeatJSON,
monitorName,
monitorUrl,
+ dashboardUrl,
}) => {
- const notificationMessage = this._statusMessageFactory(
- status,
- monitorName
- );
-
+ const status = heartbeatJSON?.status;
const facts = [];
+ const actions = [];
+
+ if (dashboardUrl) {
+ actions.push({
+ "type": "Action.OpenUrl",
+ "title": "Visit Uptime Kuma",
+ "url": dashboardUrl
+ });
+ }
+
+ if (heartbeatJSON?.msg) {
+ facts.push({
+ title: "Description",
+ value: heartbeatJSON.msg,
+ });
+ }
if (monitorName) {
facts.push({
- name: "Monitor",
+ title: "Monitor",
value: monitorName,
});
}
if (monitorUrl && monitorUrl !== "https://") {
facts.push({
- name: "URL",
- value: monitorUrl,
+ title: "URL",
+ // format URL as markdown syntax, to be clickable
+ value: `[${monitorUrl}](${monitorUrl})`,
+ });
+ actions.push({
+ "type": "Action.OpenUrl",
+ "title": "Visit Monitor URL",
+ "url": monitorUrl
});
}
- return {
- "@context": "https://schema.org/extensions",
- "@type": "MessageCard",
- themeColor: this._getThemeColor(status),
- summary: notificationMessage,
- sections: [
+ if (heartbeatJSON?.localDateTime) {
+ facts.push({
+ title: "Time",
+ value: heartbeatJSON.localDateTime + (heartbeatJSON.timezone ? ` (${heartbeatJSON.timezone})` : ""),
+ });
+ }
+
+ const payload = {
+ "type": "message",
+ // message with status prefix as notification text
+ "summary": this._statusMessageFactory(status, monitorName, true),
+ "attachments": [
{
- activityImage:
- "https://raw.githubusercontent.com/louislam/uptime-kuma/master/public/icon.png",
- activityTitle: "**Uptime Kuma**",
- },
- {
- activityTitle: notificationMessage,
- },
- {
- activityTitle: "**Description**",
- text: monitorMessage,
- facts,
- },
- ],
+ "contentType": "application/vnd.microsoft.card.adaptive",
+ "contentUrl": "",
+ "content": {
+ "type": "AdaptiveCard",
+ "body": [
+ {
+ "type": "Container",
+ "verticalContentAlignment": "Center",
+ "items": [
+ {
+ "type": "ColumnSet",
+ "style": this._getStyle(status),
+ "columns": [
+ {
+ "type": "Column",
+ "width": "auto",
+ "verticalContentAlignment": "Center",
+ "items": [
+ {
+ "type": "Image",
+ "width": "32px",
+ "style": "Person",
+ "url": "https://raw.githubusercontent.com/louislam/uptime-kuma/master/public/icon.png",
+ "altText": "Uptime Kuma Logo"
+ }
+ ]
+ },
+ {
+ "type": "Column",
+ "width": "stretch",
+ "items": [
+ {
+ "type": "TextBlock",
+ "size": "Medium",
+ "weight": "Bolder",
+ "text": `**${this._statusMessageFactory(status, monitorName, false)}**`,
+ },
+ {
+ "type": "TextBlock",
+ "size": "Small",
+ "weight": "Default",
+ "text": "Uptime Kuma Alert",
+ "isSubtle": true,
+ "spacing": "None"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "FactSet",
+ "separator": false,
+ "facts": facts
+ }
+ ],
+ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+ "version": "1.5"
+ }
+ }
+ ]
};
+
+ if (actions) {
+ payload.attachments[0].content.body.push({
+ "type": "ActionSet",
+ "actions": actions,
+ });
+ }
+
+ return payload;
};
/**
@@ -112,7 +196,9 @@ class Teams extends NotificationProvider {
*/
_handleGeneralNotification = (webhookUrl, msg) => {
const payload = this._notificationPayloadFactory({
- monitorMessage: msg
+ heartbeatJSON: {
+ msg: msg
+ }
});
return this._sendNotification(webhookUrl, payload);
@@ -130,26 +216,32 @@ class Teams extends NotificationProvider {
return okMsg;
}
- let url;
+ let monitorUrl;
switch (monitorJSON["type"]) {
case "http":
case "keywork":
- url = monitorJSON["url"];
+ monitorUrl = monitorJSON["url"];
break;
case "docker":
- url = monitorJSON["docker_host"];
+ monitorUrl = monitorJSON["docker_host"];
break;
default:
- url = monitorJSON["hostname"];
+ monitorUrl = monitorJSON["hostname"];
break;
}
+ const baseURL = await setting("primaryBaseURL");
+ let dashboardUrl;
+ if (baseURL) {
+ dashboardUrl = baseURL + getMonitorRelativeURL(monitorJSON.id);
+ }
+
const payload = this._notificationPayloadFactory({
- monitorMessage: heartbeatJSON.msg,
+ heartbeatJSON: heartbeatJSON,
monitorName: monitorJSON.name,
- monitorUrl: url,
- status: heartbeatJSON.status,
+ monitorUrl: monitorUrl,
+ dashboardUrl: dashboardUrl,
});
await this._sendNotification(notification.webhookUrl, payload);
diff --git a/server/notification.js b/server/notification.js
index 5e76d6eb1..5a412c6e6 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -16,6 +16,7 @@ const Gorush = require("./notification-providers/gorush");
const Gotify = require("./notification-providers/gotify");
const GrafanaOncall = require("./notification-providers/grafana-oncall");
const HomeAssistant = require("./notification-providers/home-assistant");
+const HeiiOnCall = require("./notification-providers/heii-oncall");
const Kook = require("./notification-providers/kook");
const Line = require("./notification-providers/line");
const LineNotify = require("./notification-providers/linenotify");
@@ -87,6 +88,7 @@ class Notification {
new Gotify(),
new GrafanaOncall(),
new HomeAssistant(),
+ new HeiiOnCall(),
new Kook(),
new Line(),
new LineNotify(),
diff --git a/server/routers/status-page-router.js b/server/routers/status-page-router.js
index 29acaf8ea..42cccc942 100644
--- a/server/routers/status-page-router.js
+++ b/server/routers/status-page-router.js
@@ -40,16 +40,12 @@ router.get("/api/status-page/:slug", cache("5 minutes"), async (request, respons
]);
if (!statusPage) {
+ sendHttpError(response, "Status Page Not Found");
return null;
}
let statusPageData = await StatusPage.getStatusPageData(statusPage);
- if (!statusPageData) {
- sendHttpError(response, "Not Found");
- return;
- }
-
// Response
response.json(statusPageData);
diff --git a/server/server.js b/server/server.js
index eeffb0635..b950dc0d3 100644
--- a/server/server.js
+++ b/server/server.js
@@ -986,7 +986,7 @@ let needSetup = false;
log.info("manage", `Delete Monitor: ${monitorID} User ID: ${socket.userID}`);
if (monitorID in server.monitorList) {
- server.monitorList[monitorID].stop();
+ await server.monitorList[monitorID].stop();
delete server.monitorList[monitorID];
}
@@ -1703,11 +1703,11 @@ async function startMonitor(userID, monitorID) {
]);
if (monitor.id in server.monitorList) {
- server.monitorList[monitor.id].stop();
+ await server.monitorList[monitor.id].stop();
}
server.monitorList[monitor.id] = monitor;
- monitor.start(io);
+ await monitor.start(io);
}
/**
@@ -1737,7 +1737,7 @@ async function pauseMonitor(userID, monitorID) {
]);
if (monitorID in server.monitorList) {
- server.monitorList[monitorID].stop();
+ await server.monitorList[monitorID].stop();
server.monitorList[monitorID].active = 0;
}
}
@@ -1754,7 +1754,7 @@ async function startMonitors() {
}
for (let monitor of list) {
- monitor.start(io);
+ await monitor.start(io);
// Give some delays, so all monitors won't make request at the same moment when just start the server.
await sleep(getRandomInt(300, 1000));
}
@@ -1775,7 +1775,7 @@ async function shutdownFunction(signal) {
log.info("server", "Stopping all monitors");
for (let id in server.monitorList) {
let monitor = server.monitorList[id];
- monitor.stop();
+ await monitor.stop();
}
await sleep(2000);
await Database.close();
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 57a2fdf2d..56580fbf0 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -120,6 +120,7 @@ export default {
"gorush": "Gorush",
"gotify": "Gotify",
"GrafanaOncall": "Grafana Oncall",
+ "HeiiOnCall": "Heii On-Call",
"HomeAssistant": "Home Assistant",
"Kook": "Kook",
"line": "LINE Messenger",
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
new file mode 100644
index 000000000..a61c1c323
--- /dev/null
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -0,0 +1,34 @@
+
+
+ {{ $t("API Key") }}*
+
+
+ Trigger ID*
+
+
+
+ {{ $t("documentationOf", ["Heii On-Call"]) }}
+
+
+
+
+
diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index dcd6142bb..8ab6a0488 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -1,17 +1,17 @@
- {{ $t("Channel access token") }}
+ {{ $t("Channel access token (Long-lived)") }}
- {{ $t("Basic Settings") }}
+ {{ $t("Messaging API") }}
- {{ $t("User ID") }}
+ {{ $t("Your User ID") }}
- {{ $t("Messaging API") }}
+ {{ $t("Basic Settings") }}
{{ $t("Line Developers Console") }}
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 0606d41af..6cb0c9fd9 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -14,6 +14,7 @@ import Gorush from "./Gorush.vue";
import Gotify from "./Gotify.vue";
import GrafanaOncall from "./GrafanaOncall.vue";
import HomeAssistant from "./HomeAssistant.vue";
+import HeiiOnCall from "./HeiiOnCall.vue";
import Kook from "./Kook.vue";
import Line from "./Line.vue";
import LineNotify from "./LineNotify.vue";
@@ -74,6 +75,7 @@ const NotificationFormList = {
"gotify": Gotify,
"GrafanaOncall": GrafanaOncall,
"HomeAssistant": HomeAssistant,
+ "HeiiOnCall": HeiiOnCall,
"Kook": Kook,
"line": Line,
"LineNotify": LineNotify,
diff --git a/src/lang/en.json b/src/lang/en.json
index d7bd0fc08..e10fef763 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -533,10 +533,12 @@
"Recipients": "Recipients",
"Access Token": "Access Token",
"Channel access token": "Channel access token",
+ "Channel access token (Long-lived)": "Channel access token (Long-lived)",
"Line Developers Console": "Line Developers Console",
"lineDevConsoleTo": "Line Developers Console - {0}",
"Basic Settings": "Basic Settings",
"User ID": "User ID",
+ "Your User ID": "Your user ID",
"Messaging API": "Messaging API",
"wayToGetLineChannelToken": "First access the {0}, create a provider and channel (Messaging API), then you can get the channel access token and user ID from the above mentioned menu items.",
"Icon URL": "Icon URL",
@@ -884,5 +886,7 @@
"deleteRemoteBrowserMessage": "Are you sure want to delete this Remote Browser for all monitors?",
"GrafanaOncallUrl": "Grafana Oncall URL",
"Browser Screenshot": "Browser Screenshot",
- "What is a Remote Browser?": "What is a Remote Browser?"
+ "What is a Remote Browser?": "What is a Remote Browser?",
+ "wayToGetHeiiOnCallDetails": "How to get the Trigger ID and API Keys is explained in the {documentation}",
+ "documentationOf": "{0} Documentation"
}
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index 1eb9a7f62..8582b82c2 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -390,10 +390,7 @@ export default {
},
group() {
- if (!this.monitor.pathName.includes("/")) {
- return "";
- }
- return this.monitor.pathName.substr(0, this.monitor.pathName.lastIndexOf("/"));
+ return this.monitor.path.slice(0, -1).join(" / ");
},
pushURL() {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 666162991..72cb181e7 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -1395,6 +1395,7 @@ message HealthCheckResponse {
// group monitor fields
this.monitor.childrenIDs = undefined;
this.monitor.forceInactive = undefined;
+ this.monitor.path = undefined;
this.monitor.pathName = undefined;
this.monitor.screenshot = undefined;
diff --git a/src/util-frontend.js b/src/util-frontend.js
index 1e30160ea..d9bf378e5 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -1,5 +1,5 @@
import dayjs from "dayjs";
-import timezones from "timezones-list";
+import { getTimeZones } from "@vvo/tzdb";
import { localeDirection, currentLocale } from "./i18n";
import { POSITION } from "vue-toastification";
@@ -29,18 +29,19 @@ function getTimezoneOffset(timeZone) {
*/
export function timezoneList() {
let result = [];
+ const timeZones = getTimeZones();
- for (let timezone of timezones) {
+ for (let timezone of timeZones) {
try {
- let display = dayjs().tz(timezone.tzCode).format("Z");
+ let display = dayjs().tz(timezone.name).format("Z");
result.push({
- name: `(UTC${display}) ${timezone.tzCode}`,
- value: timezone.tzCode,
- time: getTimezoneOffset(timezone.tzCode),
+ name: `(UTC${display}) ${timezone.name}`,
+ value: timezone.name,
+ time: getTimezoneOffset(timezone.name),
});
} catch (e) {
- // Skipping not supported timezone.tzCode by dayjs
+ // Skipping not supported timezone.name by dayjs
}
}