Merge branch 'master' into restructure-status-page

2024-11-24 02:15:59 +03:00 · 2022-03-08 14:21:04 +08:00 · 2022-03-08 14:21:04 +08:00 · 1e2a8453c6
commit 1e2a8453c6
parent b62d94184a 1fa4a16663
19 changed files with 332 additions and 46 deletions
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@ -1,22 +0,0 @@
-name: 'Automatically close stale issues and PRs'
-on:
-  schedule:
-    - cron: '0 0 * * *'
-#Run once a day at midnight 
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          stale-issue-message: 'We are clearing up our old issues and your ticket has been open for 6 months with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          stale-pr-message: 'We are clearing up our old Pull Requests and yours has been open for 6 months with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
-          close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'
-          days-before-stale: 180
-          days-before-close: 0
-          exempt-issue-labels: 'News,Medium,High,discussion,bug,doc,'
-          exempt-pr-labels: 'awaiting-approval,work-in-progress,enhancement,feature-request'
-          exempt-issue-assignees: 'louislam'
-          exempt-pr-assignees: 'louislam'
--- a/server/check-version.js
+++ b/server/check-version.js
@ -1,5 +1,6 @@
-const { setSetting } = require("./util-server");
+const { setSetting, setting } = require("./util-server");
 const axios = require("axios");
+const compareVersions = require("compare-versions");

 exports.version = require("../package.json").version;
 exports.latestVersion = null;
@ -16,6 +17,19 @@ exports.startInterval = () => {
                res.data.slow = "1000.0.0";
            }

+            if (!await setting("checkUpdate")) {
+                return;
+            }
+
+            let checkBeta = await setting("checkBeta");
+
+            if (checkBeta && res.data.beta) {
+                if (compareVersions.compare(res.data.beta, res.data.beta, ">")) {
+                    exports.latestVersion = res.data.beta;
+                    return;
+                }
+            }
+
            if (res.data.slow) {
                exports.latestVersion = res.data.slow;
            }
--- a/server/notification-providers/alerta.js
+++ b/server/notification-providers/alerta.js
@ -0,0 +1,67 @@
+const NotificationProvider = require("./notification-provider");
+const { DOWN, UP } = require("../../src/util");
+const axios = require("axios");
+
+class Alerta extends NotificationProvider {
+
+    name = "alerta";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+            let alertaUrl = `${notification.alertaApiEndpoint}`;
+            let config = {
+                headers: {
+                    "Content-Type": "application/json;charset=UTF-8",
+                    "Authorization": "Key " + notification.alertaapiKey,
+                }
+            };
+            let data = {
+                environment: notification.alertaEnvironment,
+                severity: "critical",
+                correlate: [],
+                service: [ "UptimeKuma" ],
+                value: "Timeout",
+                tags: [ "uptimekuma" ],
+                attributes: {},
+                origin: "uptimekuma",
+                type: "exceptionAlert",
+            };
+
+            if (heartbeatJSON == null) {
+                let postData = Object.assign({
+                    event: "msg",
+                    text: msg,
+                    group: "uptimekuma-msg",
+                    resource: "Message",
+                }, data);
+
+                await axios.post(alertaUrl, postData, config);
+            } else {
+                let datadup = Object.assign( {
+                    correlate: ["service_up", "service_down"],
+                    event: monitorJSON["type"],
+                    group: "uptimekuma-" + monitorJSON["type"],
+                    resource: monitorJSON["name"],
+                }, data );
+
+                if (heartbeatJSON["status"] == DOWN) {
+                    datadup.severity = notification.alertaAlertState; // critical
+                    datadup.text = "Service " + monitorJSON["type"] + " is down.";
+                    await axios.post(alertaUrl, datadup, config);
+                } else if (heartbeatJSON["status"] == UP) {
+                    datadup.severity = notification.alertaRecoverState; // cleaned
+                    datadup.text = "Service " + monitorJSON["type"] + " is up.";
+                    await axios.post(alertaUrl, datadup, config);
+                }
+            }
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+    }
+}
+
+module.exports = Alerta;
--- a/server/notification-providers/gorush.js
+++ b/server/notification-providers/gorush.js
@ -0,0 +1,42 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class Gorush extends NotificationProvider {
+
+    name = "gorush";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        let platformMapping = {
+            "ios": 1,
+            "android": 2,
+            "huawei": 3,
+        };
+
+        try {
+            let data = {
+                "notifications": [
+                    {
+                        "tokens": [notification.gorushDeviceToken],
+                        "platform": platformMapping[notification.gorushPlatform],
+                        "message": msg,
+                        // Optional
+                        "title": notification.gorushTitle,
+                        "priority": notification.gorushPriority,
+                        "retry": parseInt(notification.gorushRetry) || 0,
+                        "topic": notification.gorushTopic,
+                    }
+                ]
+            };
+            let config = {};
+
+            await axios.post(`${notification.gorushServerURL}/api/push`, data, config);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = Gorush;
--- a/server/notification-providers/techulus-push.js
+++ b/server/notification-providers/techulus-push.js
@ -0,0 +1,23 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class TechulusPush extends NotificationProvider {
+
+    name = "PushByTechulus";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+            await axios.post(`https://push.techulus.com/api/v1/notify/${notification.pushAPIKey}`, {
+                "title": "Uptime-Kuma",
+                "body": msg,
+            })
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error)
+        }
+    }
+}
+
+module.exports = TechulusPush;
--- a/server/notification.js
+++ b/server/notification.js
@ -12,6 +12,7 @@ const ClickSendSMS = require("./notification-providers/clicksendsms");
 const Pushbullet = require("./notification-providers/pushbullet");
 const Pushover = require("./notification-providers/pushover");
 const Pushy = require("./notification-providers/pushy");
+const TechulusPush = require("./notification-providers/techulus-push");
 const RocketChat = require("./notification-providers/rocket-chat");
 const Signal = require("./notification-providers/signal");
 const Slack = require("./notification-providers/slack");
@ -27,6 +28,8 @@ const SerwerSMS = require("./notification-providers/serwersms");
 const Stackfield = require("./notification-providers/stackfield");
 const WeCom = require("./notification-providers/wecom");
 const GoogleChat = require("./notification-providers/google-chat");
+const Gorush = require("./notification-providers/gorush");
+const Alerta = require("./notification-providers/alerta");

 class Notification {

@ -55,6 +58,7 @@ class Notification {
            new Pushbullet(),
            new Pushover(),
            new Pushy(),
+            new TechulusPush(),
            new RocketChat(),
            new Signal(),
            new Slack(),
@ -65,7 +69,9 @@ class Notification {
            new SerwerSMS(),
            new Stackfield(),
            new WeCom(),
-            new GoogleChat()
+            new GoogleChat(),
+            new Gorush(),
+            new Alerta(),
        ];

        for (let item of list) {
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@ -156,8 +156,13 @@ textarea.form-control {

    .form-check-input {
        background-color: $dark-bg2;
+        border-color: $dark-border-color;
    }

+    .form-check-input:checked {
+        border-color: $primary; // Re-apply bootstrap border
+    }
+    
    .form-switch .form-check-input {
        background-color: #232f3b;
    }
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@ -85,7 +85,9 @@ export default {
            model: null,
            processing: false,
            id: null,
-            notificationTypes: Object.keys(NotificationFormList),
+            notificationTypes: Object.keys(NotificationFormList).sort((a, b) => {
+                return a.toLowerCase().localeCompare(b.toLowerCase());
+            }),
            notification: {
                name: "",
                /** @type { null | keyof NotificationFormList } */
@ -143,12 +145,9 @@ export default {
                this.id = null;
                this.notification = {
                    name: "",
-                    type: null,
+                    type: "telegram",
                    isDefault: false,
                };
-
-                // Set Default value here
-                this.notification.type = this.notificationTypes[0];
            }

            this.modal.show();
--- a/src/components/notifications/Alerta.vue
+++ b/src/components/notifications/Alerta.vue
@ -0,0 +1,14 @@
+<template>
+    <div class="mb-3">
+        <label for="alerta-api-endpoint" class="form-label">{{ $t("alertaApiEndpoint") }}</label>
+        <input id="alerta-api-endpoint" v-model="$parent.notification.alertaApiEndpoint" type="text" class="form-control" required>
+        <label for="alerta-environment" class="form-label">{{ $t("alertaEnvironment") }}</label>
+        <input id="alerta-environment" v-model="$parent.notification.alertaEnvironment" type="text" class="form-control" required>
+        <label for="alerta-api-key" class="form-label">{{ $t("alertaApiKey") }}</label>
+        <input id="alerta-api-key" v-model="$parent.notification.alertaApiKey" type="text" class="form-control" required>
+        <label for="alerta-alert-state" class="form-label">{{ $t("alertaAlertState") }}</label>
+        <input id="alerta-alert-state" v-model="$parent.notification.alertaAlertState" type="text" class="form-control" placeholder="critical" required>
+        <label for="alerta-recover-state" class="form-label">{{ $t("alertaRecoverState") }}</label>
+        <input id="alerta-recover-state" v-model="$parent.notification.alertaRecoverState" type="text" class="form-control" placeholder="cleared" required>
+    </div>
+</template>
--- a/src/components/notifications/Gorush.vue
+++ b/src/components/notifications/Gorush.vue
@ -0,0 +1,51 @@
+<template>
+    <div class="mb-3">
+        <label for="gorush-device-token" class="form-label">{{ $t("Device Token") }}</label><span style="color: red;"><sup>*</sup></span>
+        <div class="input-group mb-3">
+            <input id="gorush-device-token" v-model="$parent.notification.gorushDeviceToken" type="text" class="form-control" required>
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="gorush-server-url" class="form-label">{{ $t("Server URL") }}</label><span style="color: red;"><sup>*</sup></span>
+        <div class="input-group mb-3">
+            <input id="gorush-server-url" v-model="$parent.notification.gorushServerURL" type="text" class="form-control" required>
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="gorush-platform" class="form-label">{{ $t("Platform") }}</label><span style="color: red;"><sup>*</sup></span>
+        <select id="gorush-platform" v-model="$parent.notification.gorushPlatform" class="form-select">
+            <option value="ios">{{ $t("iOS") }}</option>
+            <option value="android">{{ $t("Android") }}</option>
+            <option value="huawei">{{ $t("Huawei") }}</option>
+        </select>
+    </div>
+
+    <div class="mb-3">
+        <label for="gorush-title" class="form-label">{{ $t("Title") }}</label>
+        <input id="gorush-title" v-model="$parent.notification.gorushTitle" type="text" class="form-control">
+    </div>
+
+    <div class="mb-3">
+        <label for="gorush-priority" class="form-label">{{ $t("Priority") }}</label>
+        <select id="gorush-priority" v-model="$parent.notification.gorushPriority" class="form-select">
+            <option value="normal">{{ $t("Normal") }}</option>
+            <option value="high">{{ $t("High") }}</option>
+        </select>
+    </div>
+
+    <div class="mb-3">
+        <label for="gorush-retry" class="form-label">{{ $t("Retry") }}</label>
+        <input id="gorush-retry" v-model="$parent.notification.gorushRetry" type="number" class="form-control">
+    </div>
+
+    <div class="mb-3">
+        <label for="gorush-topic" class="form-label">{{ $t("Topic") }}</label>
+        <input id="gorush-topic" v-model="$parent.notification.gorushTopic" type="text" class="form-control">
+    </div>
+
+    <div class="form-text">
+        <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+    </div>
+</template>
--- a/src/components/notifications/TechulusPush.vue
+++ b/src/components/notifications/TechulusPush.vue
@ -0,0 +1,20 @@
+<template>
+    <div class="mb-3">
+        <label for="push-api-key" class="form-label">API_KEY</label>
+        <HiddenInput id="push-api-key" v-model="$parent.notification.pushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>
+    </div>
+
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="https://docs.push.techulus.com" target="_blank">https://docs.push.techulus.com</a>
+    </i18n-t>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@ -9,6 +9,7 @@ import RocketChat from "./RocketChat.vue";
 import Teams from "./Teams.vue";
 import Pushover from "./Pushover.vue";
 import Pushy from "./Pushy.vue";
+import TechulusPush from "./TechulusPush.vue";
 import Octopush from "./Octopush.vue";
 import PromoSMS from "./PromoSMS.vue";
 import ClickSendSMS from "./ClickSendSMS.vue";
@ -26,6 +27,8 @@ import SerwerSMS from "./SerwerSMS.vue";
 import Stackfield from './Stackfield.vue';
 import WeCom from "./WeCom.vue";
 import GoogleChat from "./GoogleChat.vue";
+import Gorush from "./Gorush.vue";
+import Alerta from "./Alerta.vue";

 /**
 * Manage all notification form.
@ -44,6 +47,7 @@ const NotificationFormList = {
    "rocket.chat": RocketChat,
    "pushover": Pushover,
    "pushy": Pushy,
+    "PushByTechulus": TechulusPush,
    "octopush": Octopush,
    "promosms": PromoSMS,
    "clicksendsms": ClickSendSMS,
@ -60,7 +64,9 @@ const NotificationFormList = {
    "serwersms": SerwerSMS,
    "stackfield": Stackfield,
    "WeCom": WeCom,
-    "GoogleChat": GoogleChat
+    "GoogleChat": GoogleChat,
+    "gorush": Gorush,
+    "alerta": Alerta,
 };

 export default NotificationFormList;
--- a/src/components/settings/About.vue
+++ b/src/components/settings/About.vue
@ -4,14 +4,39 @@
            <object class="my-4" width="200" height="200" data="/icon.svg" />
            <div class="fs-4 fw-bold">Uptime Kuma</div>
            <div>{{ $t("Version") }}: {{ $root.info.version }}</div>
-            <div class="my-1 update-link"><a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a></div>
+
+            <div class="my-3 update-link"><a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a></div>
+
+            <div class="mt-1">
+                <div class="form-check">
+                    <label><input v-model="settings.checkUpdate" type="checkbox" @change="saveSettings()" /> Show update if available</label>
+                </div>
+
+                <div class="form-check">
+                    <label><input v-model="settings.checkBeta" type="checkbox" :disabled="!settings.checkUpdate" @change="saveSettings()" /> Also check beta release</label>
+                </div>
+            </div>
        </div>
    </div>
 </template>

 <script>
 export default {
+    computed: {
+        settings() {
+            return this.$parent.$parent.$parent.settings;
+        },
+        saveSettings() {
+            return this.$parent.$parent.$parent.saveSettings;
+        },
+        settingsLoaded() {
+            return this.$parent.$parent.$parent.settingsLoaded;
+        },
+    },

+    watch: {
+
+    }
 };
 </script>

--- a/src/languages/en.js
+++ b/src/languages/en.js
@ -238,6 +238,7 @@ export default {
    "rocket.chat": "Rocket.Chat",
    pushover: "Pushover",
    pushy: "Pushy",
+    PushByTechulus: "Push by Techulus",
    octopush: "Octopush",
    promosms: "PromoSMS",
    clicksendsms: "ClickSend SMS",
@ -361,4 +362,11 @@ export default {
    smtpDkimHashAlgo: "Hash Algorithm (Optional)",
    smtpDkimheaderFieldNames: "Header Keys to sign (Optional)",
    smtpDkimskipFields: "Header Keys not to sign (Optional)",
+    gorush: "Gorush",
+    alerta: 'Alerta',
+    alertaApiEndpoint: 'API Endpoint',
+    alertaEnvironment: 'Environment',
+    alertaApiKey: 'API Key',
+    alertaAlertState: 'Alert State',
+    alertaRecoverState: 'Recover State',
 };
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@ -304,4 +304,9 @@ export default {
    steamApiKeyDescription: "Pour surveiller un serveur Steam, vous avez besoin  d'une clé Steam Web-API. Vous pouvez enregistrer votre clé ici : ",
    "Current User": "Utilisateur actuel",
    recent: "Récent",
+    alertaApiEndpoint: 'API Endpoint',
+    alertaEnvironment: 'Environement',
+    alertaApiKey: "Clé de l'API",
+    alertaAlertState: "État de l'Alerte",
+    alertaRecoverState: 'État de récupération',
 };
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@ -13,7 +13,7 @@ export default {
    pauseDashboardHome: "暂停",
    deleteMonitorMsg: "确定要删除此监控项吗？",
    deleteNotificationMsg: "确定要为所有监控项删除此通知吗？",
-    resoverserverDescription: "默认服务器是 Cloudflare。您随时可以修改解析服务器。",
+    resolverserverDescription: "默认服务器是 Cloudflare。您随时可以修改解析服务器。",
    rrtypeDescription: "选择要监控的资源记录类型",
    pauseMonitorMsg: "确定要暂停吗？",
    enableDefaultNotificationDescription: "新的监控项将默认启用此通知，您仍然为每个监控项单独禁用。",
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@ -157,7 +157,7 @@ export default {
        overflow: hidden;
        text-decoration: none;

-        &.router-link-exact-active {
+        &.router-link-exact-active, &.active {
            color: $primary;
            font-weight: bold;
        }
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@ -6,7 +6,7 @@

        <div class="shadow-box">
            <div class="row">
-                <div class="settings-menu">
+                <div v-if="showSubMenu" class="settings-menu col-lg-3 col-md-5">
                    <router-link
                        v-for="(item, key) in subMenus"
                        :key="key"
@ -17,8 +17,8 @@
                        </div>
                    </router-link>
                </div>
-                <div class="settings-content">
-                    <div class="settings-content-header">
+                <div class="settings-content col-lg-9 col-md-7">
+                    <div v-if="currentPage" class="settings-content-header">
                        {{ subMenus[currentPage].title }}
                    </div>
                    <div class="mx-3">
@ -41,7 +41,6 @@ export default {
    data() {
        return {
            show: true,
-
            settings: {},
            settingsLoaded: false,
        };
@ -52,11 +51,19 @@ export default {
            let pathSplit = useRoute().path.split("/");
            let pathEnd = pathSplit[pathSplit.length - 1];
            if (!pathEnd || pathEnd === "settings") {
-                return "general";
+                return null;
            }
            return pathEnd;
        },

+        showSubMenu() {
+            if (this.$root.isMobile) {
+                return !this.currentPage;
+            } else {
+                return true;
+            }
+        },
+
        subMenus() {
            return {
                general: {
@ -84,11 +91,26 @@ export default {
        },
    },

+    watch: {
+        "$root.isMobile"() {
+            this.loadGeneralPage();
+        }
+    },
+
    mounted() {
        this.loadSettings();
+        this.loadGeneralPage();
    },

    methods: {
+
+        // For desktop only, mobile do nothing
+        loadGeneralPage() {
+            if (!this.currentPage && !this.$root.isMobile) {
+                this.$router.push("/settings/general");
+            }
+        },
+
        loadSettings() {
            this.$root.getSocket().emit("getSettings", (res) => {
                this.settings = res.data;
@ -115,7 +137,7 @@ export default {
                this.loadSettings();
            });
        },
-    },
+    }
 };
 </script>

@ -136,9 +158,6 @@ footer {
 }

 .settings-menu {
-    flex: 0 0 auto;
-    width: 300px;
-
    a {
        text-decoration: none !important;
    }
@ -171,9 +190,6 @@ footer {
 }

 .settings-content {
-    flex: 0 0 auto;
-    width: calc(100% - 300px);
-
    .settings-content-header {
        width: calc(100% + 20px);
        border-bottom: 1px solid #dee2e6;
@ -187,6 +203,14 @@ footer {
            background: $dark-header-bg;
            border-bottom: 0;
        }
+
+        .mobile & {
+            padding: 15px 0 0 0;
+
+            .dark & {
+                background-color: transparent;
+            }
+        }
    }
 }
 </style>
--- a/src/router.js
+++ b/src/router.js
@ -70,7 +70,6 @@ const routes = [
                        children: [
                            {
                                path: "general",
-                                alias: "",
                                component: General,
                            },
                            {