Merge branch 'master' into free-disk-space

2024-12-18 12:14:41 -05:00 · 2021-10-26 21:18:22 +08:00 · 2021-10-26 21:18:22 +08:00 · 39ad8b4bb7
commit 39ad8b4bb7
parent 24c645e437 9123e9461f
25 changed files with 836 additions and 411 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -4,12 +4,15 @@ Fixes #(issue)

 ## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] User Interface
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Translation update
- [ ] This change requires a documentation update
+Please delete options that are not relevant.
+
+- Bug fix (non-breaking change which fixes an issue)
+- User Interface
+- New feature (non-breaking change which adds functionality)
+- Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- Translation update
+- Other
+- This change requires a documentation update

 ## Checklist

@ -18,6 +21,6 @@ Fixes #(issue)
 - [ ] I have performed a self-review of my own code and test it
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] My changes generate no new warnings
- [ ] My code needed automated testing. I have added them
+- [ ] My code needed automated testing. I have added them (this is optional task)

 ## Screenshots (if any)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -29,16 +29,34 @@ The frontend code build into "dist" directory. The server (express.js) exposes t

 Generally, if the pull request is working fine and it do not affect any existing logic, workflow and perfomance, I will merge into the master branch once it is tested.

-If you are not sure, feel free to create an empty pull request draft first.
+If you are not sure whether I will accept your pull request, feel free to create an empty pull request draft first.
+
+
+### Recommended Pull Request Guideline
+
+1. Fork the project
+1. Clone your fork repo to local
+1. Create a new branch
+1. Create an empty commit
+   `git commit -m "[empty commit] pull request for <YOUR TASK NAME>" --allow-empty`
+1. Push to your fork repo
+1. Create a pull request: https://github.com/louislam/uptime-kuma/compare
+1. Write a proper description   
+1. Click "Change to draft"

 ### Pull Request Examples

+Here are some example situations in the past.
+
 #### ✅ High - Medium Priority

+Easy to review, no breaking change and not touching the existing code
+
 - Add a new notification
 - Add a chart
 - Fix a bug
 - Translations
+- Add a independent new feature

 #### *️⃣ Requires one more reviewer

@ -46,6 +64,17 @@ I do not have such knowledge to test it.

 - Add k8s supports

+#### ⚠ Low Priority - Harsh Mode
+
+Some pull requests are required to modifiy the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also you may need to write a lot of unit tests to ensure that there is no breaking change.
+
+- Touch large parts of code of any very important features
+- Touch monitoring logic
+- Drop a table or drop a column for any reason
+- Touch the entry point of Docker or Node.js
+- Modifiy auth
+
+
 #### *️⃣ Low Priority

 It changed my current workflow and require further studies.
@ -54,6 +83,7 @@ It changed my current workflow and require further studies.

 #### ❌ Won't Merge

+- Any breaking changes
 - Duplicated pull request
 - Buggy
 - Existing logic is completely modified or deleted
--- a/extra/download-dist.js
+++ b/extra/download-dist.js
@ -34,9 +34,11 @@ function download(url) {
            });

            tarStream.on("close", () => {
+                if (fs.existsSync("./dist-backup")) {
                    fs.rmdirSync("./dist-backup", {
                        recursive: true
                    });
+                }
                console.log("Done");
            });

@ -44,7 +46,7 @@ function download(url) {
                if (fs.existsSync("./dist-backup")) {
                    fs.renameSync("./dist-backup", "./dist");
                }
-                console.log("Done");
+                console.error("Error from tarStream");
            });

            response.pipe(tarStream);
--- a/server/notification-providers/bark.js
+++ b/server/notification-providers/bark.js
@ -0,0 +1,89 @@
+//
+//  bark.js
+//  UptimeKuma
+//
+//  Created by Lakr Aream on 2021/10/24.
+//  Copyright © 2021 Lakr Aream. All rights reserved.
+//
+
+const NotificationProvider = require("./notification-provider");
+const { DOWN, UP } = require("../../src/util");
+const { default: axios } = require("axios");
+
+// bark is an APN bridge that sends notifications to Apple devices.
+
+const barkNotificationGroup = "UptimeKuma";
+const barkNotificationAvatar = "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png";
+const barkNotificationSound = "telegraph";
+const successMessage = "Successes!";
+
+class Bark extends NotificationProvider {
+    name = "Bark";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        try {
+            var barkEndpoint = notification.barkEndpoint;
+
+            // check if the endpoint has a "/" suffix, if so, delete it first
+            if (barkEndpoint.endsWith("/")) {
+                barkEndpoint = barkEndpoint.substring(0, barkEndpoint.length - 1);
+            }
+
+            if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == UP) {
+                let title = "UptimeKuma Monitor Up";
+                return await this.postNotification(title, msg, barkEndpoint);
+            }
+
+            if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == DOWN) {
+                let title = "UptimeKuma Monitor Down";
+                return await this.postNotification(title, msg, barkEndpoint);
+            }
+
+            if (msg != null) {
+                let title = "UptimeKuma Message";
+                return await this.postNotification(title, msg, barkEndpoint);
+            }
+
+        } catch (error) {
+            throw error;
+        }
+    }
+
+    // add additional parameter for better on device styles (iOS 15 optimized)
+    appendAdditionalParameters(postUrl) {
+        // grouping all our notifications
+        postUrl += "?group=" + barkNotificationGroup;
+        // set icon to uptime kuma icon, 11kb should be fine
+        postUrl += "&icon=" + barkNotificationAvatar;
+        // picked a sound, this should follow system's mute status when arrival
+        postUrl += "&sound=" + barkNotificationSound;
+        return postUrl;
+    }
+
+    // thrown if failed to check result, result code should be in range 2xx
+    checkResult(result) {
+        if (result.status == null) {
+            throw new Error("Bark notification failed with invalid response!");
+        }
+        if (result.status < 200 || result.status >= 300) {
+            throw new Error("Bark notification failed with status code " + result.status);
+        }
+    }
+
+    async postNotification(title, subtitle, endpoint) {
+        // url encode title and subtitle
+        title = encodeURIComponent(title);
+        subtitle = encodeURIComponent(subtitle);
+        let postUrl = endpoint + "/" + title + "/" + subtitle;
+        postUrl = this.appendAdditionalParameters(postUrl);
+        let result = await axios.get(postUrl);
+        this.checkResult(result);
+        if (result.statusText != null) {
+            return "Bark notification succeed: " + result.statusText;
+        }
+        // because returned in range 200 ..< 300
+        return successMessage;
+    }
+}
+
+module.exports = Bark;
--- a/server/notification-providers/clicksendsms.js
+++ b/server/notification-providers/clicksendsms.js
@ -0,0 +1,42 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class ClickSendSMS extends NotificationProvider {
+
+    name = "clicksendsms";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            console.log({ notification });
+            let config = {
+                headers: {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic " + Buffer.from(notification.clicksendsmsLogin + ":" + notification.clicksendsmsPassword).toString('base64'),
+                    "Accept": "text/json",
+                }
+            };
+            let data = {
+                messages: [
+                    {
+                        "body": msg.replace(/[^\x00-\x7F]/g, ""),
+                        "to": notification.clicksendsmsToNumber,
+                        "source": "uptime-kuma",
+                        "from": notification.clicksendsmsSenderName,
+                    }
+                ]
+            };
+            let resp = await axios.post("https://rest.clicksend.com/v3/sms/send", data, config);
+            if (resp.data.data.messages[0].status !== "SUCCESS") {
+                let error = "Something gone wrong. Api returned " + resp.data.data.messages[0].status + ".";
+                this.throwGeneralAxiosError(error);
+            }
+
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = ClickSendSMS;
--- a/server/notification.js
+++ b/server/notification.js
@ -8,6 +8,7 @@ const Mattermost = require("./notification-providers/mattermost");
 const Matrix = require("./notification-providers/matrix");
 const Octopush = require("./notification-providers/octopush");
 const PromoSMS = require("./notification-providers/promosms");
+const ClickSendSMS = require("./notification-providers/clicksendsms");
 const Pushbullet = require("./notification-providers/pushbullet");
 const Pushover = require("./notification-providers/pushover");
 const Pushy = require("./notification-providers/pushy");
@ -21,6 +22,7 @@ const Webhook = require("./notification-providers/webhook");
 const Feishu = require("./notification-providers/feishu");
 const AliyunSms = require("./notification-providers/aliyun-sms");
 const DingDing = require("./notification-providers/dingding");
+const Bark = require("./notification-providers/bark");

 class Notification {

@ -45,6 +47,7 @@ class Notification {
            new Matrix(),
            new Octopush(),
            new PromoSMS(),
+            new ClickSendSMS(),
            new Pushbullet(),
            new Pushover(),
            new Pushy(),
@ -54,6 +57,7 @@ class Notification {
            new SMTP(),
            new Telegram(),
            new Webhook(),
+            new Bark(),
        ];

        for (let item of list) {
--- a/server/server.js
+++ b/server/server.js
@ -644,6 +644,38 @@ exports.entryPage = "dashboard";
            }
        });

+        socket.on("getMonitorBeats", async (monitorID, period, callback) => {
+            try {
+                checkLogin(socket);
+
+                console.log(`Get Monitor Beats: ${monitorID} User ID: ${socket.userID}`);
+
+                if (period == null) {
+                    throw new Error("Invalid period.");
+                }
+
+                let list = await R.getAll(`
+                    SELECT * FROM heartbeat
+                    WHERE monitor_id = ? AND
+                    time > DATETIME('now', '-' || ? || ' hours')
+                    ORDER BY time ASC
+                `, [
+                    monitorID,
+                    period,
+                ]);
+
+                callback({
+                    ok: true,
+                    data: list,
+                });
+            } catch (e) {
+                callback({
+                    ok: false,
+                    msg: e.message,
+                });
+            }
+        });
+
        // Start or Resume the monitor
        socket.on("resumeMonitor", async (monitorID, callback) => {
            try {
--- a/src/components/PingChart.vue
+++ b/src/components/PingChart.vue
@ -1,16 +1,34 @@
 <template>
+    <div>
+        <div class="period-options">
+            <button type="button" class="btn btn-light dropdown-toggle btn-period-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                {{ chartPeriodOptions[chartPeriodHrs] }}&nbsp;
+            </button>
+            <ul class="dropdown-menu dropdown-menu-end">
+                <li v-for="(item, key) in chartPeriodOptions" :key="key">
+                    <a class="dropdown-item" :class="{ active: chartPeriodHrs == key }" href="#" @click="chartPeriodHrs = key">{{ item }}</a>
+                </li>
+            </ul>
+        </div>
+        <div class="chart-wrapper" :class="{ loading : loading}">
            <LineChart :chart-data="chartData" :options="chartOptions" />
+        </div>
+    </div>
 </template>

-<script>
+<script lang="ts">
 import { BarController, BarElement, Chart, Filler, LinearScale, LineController, LineElement, PointElement, TimeScale, Tooltip } from "chart.js";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
 import "chartjs-adapter-dayjs";
 import { LineChart } from "vue-chart-3";
+import { useToast } from "vue-toastification";
+import { UP, DOWN, PENDING } from "../util.ts";
+
 dayjs.extend(utc);
 dayjs.extend(timezone);
+const toast = useToast();

 Chart.register(LineController, BarController, LineElement, PointElement, TimeScale, BarElement, LinearScale, Tooltip, Filler);

@ -24,8 +42,23 @@ export default {
    },
    data() {
        return {
+
+            loading: false,
+
            // Configurable filtering on top of the returned data
-            chartPeriodHrs: 6,
+            chartPeriodHrs: 0,
+
+            chartPeriodOptions: {
+                0: this.$t("recent"),
+                3: "3h",
+                6: "6h",
+                24: "24h",
+                168: "1w",
+            },
+
+            // A heartbeatList for 3h, 6h, 24h, 1w
+            // Uses the $root.heartbeatList when value is null
+            heartbeatList: null
        };
    },
    computed: {
@ -117,7 +150,7 @@ export default {
                        },
                        callbacks: {
                            label: (context) => {
-                                return ` ${new Intl.NumberFormat().format(context.parsed.y)} ms`
+                                return ` ${new Intl.NumberFormat().format(context.parsed.y)} ms`;
                            },
                        }
                    },
@ -125,15 +158,24 @@ export default {
                        display: false,
                    },
                },
-            }
+            };
        },
        chartData() {
            let pingData = [];  // Ping Data for Line Chart, y-axis contains ping time
            let downData = [];  // Down Data for Bar Chart, y-axis is 1 if target is down, 0 if target is up
-            if (this.monitorId in this.$root.heartbeatList) {
-                this.$root.heartbeatList[this.monitorId]
+
+            let heartbeatList = this.heartbeatList ||
+             (this.monitorId in this.$root.heartbeatList && this.$root.heartbeatList[this.monitorId]) ||
+             [];
+
+            heartbeatList
                .filter(
-                        (beat) => dayjs.utc(beat.time).tz(this.$root.timezone).isAfter(dayjs().subtract(this.chartPeriodHrs, "hours")))
+                    // Filtering as data gets appended
+                    // not the most efficient, but works for now
+                    (beat) => dayjs.utc(beat.time).tz(this.$root.timezone).isAfter(
+                        dayjs().subtract(Math.max(this.chartPeriodHrs, 6), "hours")
+                    )
+                )
                .map((beat) => {
                    const x = this.$root.datetime(beat.time);
                    pingData.push({
@ -142,10 +184,10 @@ export default {
                    });
                    downData.push({
                        x,
-                            y: beat.status === 0 ? 1 : 0,
-                        })
+                        y: beat.status === DOWN ? 1 : 0,
                    });
-            }
+                });
+
            return {
                datasets: [
                    {
@ -172,5 +214,110 @@ export default {
            };
        },
    },
+    watch: {
+        // Update chart data when the selected chart period changes
+        chartPeriodHrs: function (newPeriod) {
+            if (newPeriod == "0") {
+                newPeriod = null;
+                this.heartbeatList = null;
+            } else {
+                this.loading = true;
+
+                this.$root.getMonitorBeats(this.monitorId, newPeriod, (res) => {
+                    if (!res.ok) {
+                        toast.error(res.msg);
+                    } else {
+                        this.heartbeatList = res.data;
+                    }
+                    this.loading = false;
+                });
+            }
+        }
+    },
+    created() {
+        // Setup Watcher on the root heartbeatList,
+        // And mirror latest change to this.heartbeatList
+        this.$watch(() => this.$root.heartbeatList[this.monitorId],
+            (heartbeatList) => {
+                if (this.chartPeriodHrs != 0) {
+                    const newBeat = heartbeatList.at(-1);
+                    if (newBeat && dayjs.utc(newBeat.time) > dayjs.utc(this.heartbeatList.at(-1)?.time)) {
+                        this.heartbeatList.push(heartbeatList.at(-1));
+                    }
+                }
+            },
+            { deep: true }
+        );
+    }
 };
 </script>
+
+<style lang="scss" scoped>
+@import "../assets/vars.scss";
+
+.form-select {
+    width: unset;
+    display: inline-flex;
+}
+
+.period-options {
+    padding: 0.1em 1em;
+    margin-bottom: -1.2em;
+    float: right;
+    position: relative;
+    z-index: 10;
+
+    .dropdown-menu {
+        padding: 0;
+        min-width: 50px;
+        font-size: 0.9em;
+
+        .dark & {
+            background: $dark-bg;
+        }
+
+        .dropdown-item {
+            border-radius: 0.3rem;
+            padding: 2px 16px 4px 16px;
+
+            .dark & {
+                background: $dark-bg;
+            }
+
+            .dark &:hover {
+                background: $dark-font-color;
+            }
+        }
+
+        .dark & .dropdown-item.active {
+            background: $primary;
+            color: $dark-font-color2;
+        }
+    }
+
+    .btn-period-toggle {
+        padding: 2px 15px;
+        background: transparent;
+        border: 0;
+        color: $link-color;
+        opacity: 0.7;
+        font-size: 0.9em;
+
+        &::after {
+            vertical-align: 0.155em;
+        }
+
+        .dark & {
+            color: $dark-font-color;
+        }
+    }
+}
+
+.chart-wrapper {
+    margin-bottom: 0.5em;
+
+    &.loading {
+        filter: blur(10px);
+    }
+}
+</style>
--- a/src/components/notifications/Bark.vue
+++ b/src/components/notifications/Bark.vue
@ -0,0 +1,15 @@
+<template>
+    <div class="mb-3">
+        <label for="Bark Endpoint" class="form-label">{{ $t("Bark Endpoint") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="Bark Endpoint" v-model="$parent.notification.barkEndpoint" type="text" class="form-control" required>
+        <div class="form-text">
+            <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
+        </div>
+        <i18n-t tag="div" keypath="wayToGetTeamsURL" class="form-text">
+            <a
+                href="https://github.com/Finb/Bark"
+                target="_blank"
+            >{{ $t("here") }}</a>
+        </i18n-t>
+    </div>
+</template>
--- a/src/components/notifications/ClickSendSMS.vue
+++ b/src/components/notifications/ClickSendSMS.vue
@ -0,0 +1,38 @@
+<template>
+    <div class="mb-3">
+        <label for="clicksendsms-login" class="form-label">API Username</label>
+        <div class="form-text">
+            {{ $t("apiCredentials") }}
+            <a href="http://dashboard.clicksend.com/account/subaccounts" target="_blank">here</a>
+        </div>
+        <input id="clicksendsms-login" v-model="$parent.notification.clicksendsmsLogin" type="text" class="form-control" required>
+        <label for="clicksendsms-key" class="form-label">API Key</label>
+        <HiddenInput id="clicksendsms-key" v-model="$parent.notification.clicksendsmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>
+    </div>
+    <div class="mb-3">
+        <div class="form-text">
+            {{ $t("checkPrice", [$t("clicksendsms")]) }}
+            <a href="https://www.clicksend.com/us/pricing" target="_blank">https://clicksend.com/us/pricing</a>
+        </div>
+    </div>
+    <div class="mb-3">
+        <label for="clicksendsms-to-number" class="form-label">Recipient Number</label>
+        <input id="clicksendsms-to-number" v-model="$parent.notification.clicksendsmsToNumber" type="text" minlength="8" maxlength="14" class="form-control" required>
+    </div>
+    <div class="mb-3">
+        <label for="clicksendsms-sender-name" class="form-label">From Name/Number -
+            <a href="https://help.clicksend.com/article/4kgj7krx00-what-is-a-sender-id-or-sender-number" target="_blank">More Info</a>
+        </label>
+        <input id="clicksendsms-sender-name" v-model="$parent.notification.clicksendsmsSenderName" type="text" minlength="3" maxlength="11" class="form-control">
+        <div class="form-text">Leave blank to use a shared sender number.</div>
+    </div>
+</template>
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@ -11,6 +11,7 @@ import Pushover from "./Pushover.vue";
 import Pushy from "./Pushy.vue";
 import Octopush from "./Octopush.vue";
 import PromoSMS from "./PromoSMS.vue";
+import ClickSendSMS from "./ClickSendSMS.vue";
 import LunaSea from "./LunaSea.vue";
 import Feishu from "./Feishu.vue";
 import Apprise from "./Apprise.vue";
@ -20,6 +21,7 @@ import Mattermost from "./Mattermost.vue";
 import Matrix from "./Matrix.vue";
 import AliyunSMS from "./AliyunSms.vue";
 import DingDing from "./DingDing.vue";
+import Bark from "./Bark.vue";

 /**
 * Manage all notification form.
@ -40,6 +42,7 @@ const NotificationFormList = {
    "pushy": Pushy,
    "octopush": Octopush,
    "promosms": PromoSMS,
+    "clicksendsms": ClickSendSMS,
    "lunasea": LunaSea,
    "Feishu": Feishu,
    "AliyunSMS": AliyunSMS,
@ -48,7 +51,8 @@ const NotificationFormList = {
    "line": Line,
    "mattermost": Mattermost,
    "matrix": Matrix,
-    "DingDing": DingDing
+    "DingDing": DingDing,
+    "Bark": Bark
 }

 export default NotificationFormList
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@ -199,7 +199,7 @@ export default {
    "Status Page": "Статус страница",
    "Primary Base URL": "Основен базов URL адрес",
    "Push URL": "Генериран Push URL адрес",
-    needPushEvery: "Необходимо е да извършвате заявка към този URL адрес на всеки {0} секунди.",
+    needPushEvery: "Необходимо е да извършвате заявка към този URL адрес на всеки {0} секунди",
    pushOptionalParams: "Допълнителни, но незадължителни параметри: {0}",
    defaultNotificationName: "Моето {notification} известяване ({number})",
    here: "тук",
@ -297,7 +297,7 @@ export default {
    PushUrl: "Push URL адрес",
    HeadersInvalidFormat: "Заявените хедъри не са валидни JSON: ",
    BodyInvalidFormat: "Заявеното съобщение не е валиден JSON: ",
-    "Monitor History": "История на мониторите:",
+    "Monitor History": "История на мониторите",
    clearDataOlderThan: "Ще се съхранява за {0} дни.",
    records: "записа",
    "One record": "Един запис",
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@ -199,7 +199,7 @@ export default {
    mattermost: "Mattermost",
    "Primary Base URL": "Primär URL",
    "Push URL": "Push URL",
-    needPushEvery: "Du solltest diese URL alle {0} Sekunden aufrufen.",
+    needPushEvery: "Du solltest diese URL alle {0} Sekunden aufrufen",
    pushOptionalParams: "Optionale Parameter: {0}",
    defaultNotificationName: "Meine {notification} Alarm ({number})",
    here: "hier",
@ -297,7 +297,7 @@ export default {
    PushUrl: "Push URL",
    HeadersInvalidFormat: "Die Header ist kein gültiges JSON: ",
    BodyInvalidFormat: "Der Body ist kein gültiges JSON: ",
-    "Monitor History": "Monitor Verlauf:",
+    "Monitor History": "Monitor Verlauf",
    clearDataOlderThan: "Bewahre die Monitor-Verlaufsdaten für {0} Tage auf.",
    PasswordsDoNotMatch: "Passwörter stimmen nicht überein.",
    records: "Einträge",
--- a/src/languages/en.js
+++ b/src/languages/en.js
@ -183,11 +183,10 @@ export default {
    "Edit Status Page": "Edit Status Page",
    "Go to Dashboard": "Go to Dashboard",
    "Status Page": "Status Page",
-    // Start notification form
    defaultNotificationName: "My {notification} Alert ({number})",
    here: "here",
-    "Required": "Required",
-    "telegram": "Telegram",
+    Required: "Required",
+    telegram: "Telegram",
    "Bot Token": "Bot Token",
    wayToGetTelegramToken: "You can get a token from {0}.",
    "Chat ID": "Chat ID",
@ -195,12 +194,12 @@ export default {
    wayToGetTelegramChatID: "You can get your chat ID by sending a message to the bot and going to this URL to view the chat_id:",
    "YOUR BOT TOKEN HERE": "YOUR BOT TOKEN HERE",
    chatIDNotFound: "Chat ID is not found; please send a message to this bot first",
-    "webhook": "Webhook",
+    webhook: "Webhook",
    "Post URL": "Post URL",
    "Content Type": "Content Type",
    webhookJsonDesc: "{0} is good for any modern HTTP servers such as Express.js",
    webhookFormDataDesc: "{multipart} is good for PHP. The JSON will need to be parsed with {decodeFunction}",
-    "smtp": "Email (SMTP)",
+    smtp: "Email (SMTP)",
    secureOptionNone: "None / STARTTLS (25, 587)",
    secureOptionTLS: "TLS (465)",
    "Ignore TLS Error": "Ignore TLS Error",
@ -209,26 +208,26 @@ export default {
    "To Email": "To Email",
    smtpCC: "CC",
    smtpBCC: "BCC",
-    "discord": "Discord",
+    discord: "Discord",
    "Discord Webhook URL": "Discord Webhook URL",
    wayToGetDiscordURL: "You can get this by going to Server Settings -> Integrations -> Create Webhook",
    "Bot Display Name": "Bot Display Name",
    "Prefix Custom Message": "Prefix Custom Message",
    "Hello @everyone is...": "Hello {'@'}everyone is...",
-    "teams": "Microsoft Teams",
+    teams: "Microsoft Teams",
    "Webhook URL": "Webhook URL",
    wayToGetTeamsURL: "You can learn how to create a webhook URL {0}.",
-    "signal": "Signal",
-    "Number": "Number",
-    "Recipients": "Recipients",
+    signal: "Signal",
+    Number: "Number",
+    Recipients: "Recipients",
    needSignalAPI: "You need to have a signal client with REST API.",
    wayToCheckSignalURL: "You can check this URL to view how to set one up:",
    signalImportant: "IMPORTANT: You cannot mix groups and numbers in recipients!",
-    "gotify": "Gotify",
+    gotify: "Gotify",
    "Application Token": "Application Token",
    "Server URL": "Server URL",
-    "Priority": "Priority",
-    "slack": "Slack",
+    Priority: "Priority",
+    slack: "Slack",
    "Icon Emoji": "Icon Emoji",
    "Channel Name": "Channel Name",
    "Uptime Kuma URL": "Uptime Kuma URL",
@ -241,13 +240,14 @@ export default {
    pushy: "Pushy",
    octopush: "Octopush",
    promosms: "PromoSMS",
+    clicksendsms: "ClickSend SMS",
    lunasea: "LunaSea",
    apprise: "Apprise (Support 50+ Notification services)",
    pushbullet: "Pushbullet",
    line: "Line Messenger",
    mattermost: "Mattermost",
    "User Key": "User Key",
-    "Device": "Device",
+    Device: "Device",
    "Message Title": "Message Title",
    "Notification Sound": "Notification Sound",
    "More info on:": "More info on: {0}",
@ -257,6 +257,7 @@ export default {
    octopushTypePremium: "Premium (Fast - recommended for alerting)",
    octopushTypeLowCost: "Low Cost (Slow - sometimes blocked by operator)",
    checkPrice: "Check {0} prices:",
+    apiCredentials: "API credentials",
    octopushLegacyHint: "Do you use the legacy version of Octopush (2011-2020) or the new version?",
    "Check octopush prices": "Check octopush prices {0}.",
    octopushPhoneNumber: "Phone number (intl format, eg : +33612345678) ",
@ -280,7 +281,7 @@ export default {
    "Icon URL": "Icon URL",
    aboutIconURL: "You can provide a link to a picture in \"Icon URL\" to override the default profile picture. Will not be used if Icon Emoji is set.",
    aboutMattermostChannelName: "You can override the default channel that the Webhook posts to by entering the channel name into \"Channel Name\" field. This needs to be enabled in the Mattermost Webhook settings. Ex: #other-channel",
-    "matrix": "Matrix",
+    matrix: "Matrix",
    promosmsTypeEco: "SMS ECO - cheap but slow and often overloaded. Limited only to Polish recipients.",
    promosmsTypeFlash: "SMS FLASH - Message will automatically show on recipient device. Limited only to Polish recipients.",
    promosmsTypeFull: "SMS FULL - Premium tier of SMS, You can use your Sender Name (You need to register name first). Reliable for alerts.",
@ -292,14 +293,13 @@ export default {
    "Internal Room Id": "Internal Room ID",
    matrixDesc1: "You can find the internal room ID by looking in the advanced section of the room settings in your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.",
    matrixDesc2: "It is highly recommended you create a new user and do not use your own Matrix user's access token as it will allow full access to your account and all the rooms you joined. Instead, create a new user and only invite it to the room that you want to receive the notification in. You can get the access token by running {0}",
-    // End notification form
    Method: "Method",
    Body: "Body",
    Headers: "Headers",
    PushUrl: "Push URL",
    HeadersInvalidFormat: "The request headers are not valid JSON: ",
    BodyInvalidFormat: "The request body is not valid JSON: ",
-    "Monitor History": "Monitor History:",
+    "Monitor History": "Monitor History",
    clearDataOlderThan: "Keep monitor history data for {0} days.",
    PasswordsDoNotMatch: "Passwords do not match.",
    records: "records",
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@ -198,7 +198,7 @@ export default {
    pushbullet: "Pushbullet",
    line: "Line Messenger",
    mattermost: "Mattermost",
-    "Monitor History": "Historial de monitor:",
+    "Monitor History": "Historial de monitor",
    clearDataOlderThan: "Mantener los datos del historial del monitor durante {0} días.",
    records: "registros",
    "One record": "Un registro",
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@ -179,11 +179,10 @@ export default {
    "Edit Status Page": "Modifier la page de statut",
    "Go to Dashboard": "Accéder au tableau de bord",
    "Status Page": "Status Page",
-    // Start notification form
    defaultNotificationName: "Ma notification {notification} numéro ({number})",
    here: "ici",
-    "Required": "Requis",
-    "telegram": "Telegram",
+    Required: "Requis",
+    telegram: "Telegram",
    "Bot Token": "Bot Token",
    wayToGetTelegramToken: "Vous pouvez obtenir un token depuis {0}.",
    "Chat ID": "Chat ID",
@ -191,12 +190,12 @@ export default {
    wayToGetTelegramChatID: "Vous pouvez obtenir l'ID du chat en envoyant un message avec le bot puis en récupérant l'URL pour voir l'ID du salon :",
    "YOUR BOT TOKEN HERE": "VOTRE TOKEN BOT ICI",
    chatIDNotFound: "ID du salon introuvable, envoyez un message via le bot avant",
-    "webhook": "Webhook",
+    webhook: "Webhook",
    "Post URL": "Post URL",
    "Content Type": "Content Type",
    webhookJsonDesc: "{0} est bien/bon pour tous les serveurs HTTP modernes comme express.js",
    webhookFormDataDesc: "{multipart} est bien/bon pour du PHP, vous avez juste besoin de mettre le json via/depuis {decodeFunction}",
-    "smtp": "Email (SMTP)",
+    smtp: "Email (SMTP)",
    secureOptionNone: "Aucun / STARTTLS (25, 587)",
    secureOptionTLS: "TLS (465)",
    "Ignore TLS Error": "Ignorer les erreurs TLS",
@ -204,26 +203,26 @@ export default {
    "To Email": "Vers l'Email",
    smtpCC: "CC",
    smtpBCC: "BCC",
-    "discord": "Discord",
+    discord: "Discord",
    "Discord Webhook URL": "Discord Webhook URL",
    wayToGetDiscordURL: "Vous pouvez l'obtenir en allant dans 'Paramètres du Serveur' -> 'Intégrations' -> 'Créer un Webhook'",
    "Bot Display Name": "Nom du bot (affiché)",
    "Prefix Custom Message": "Prefix Custom Message",
    "Hello @everyone is...": "Bonjour {'@'}everyone il...",
-    "teams": "Microsoft Teams",
+    teams: "Microsoft Teams",
    "Webhook URL": "Webhook URL",
    wayToGetTeamsURL: "Vous pouvez apprendre comment créer un Webhook {0}.",
-    "signal": "Signal",
-    "Number": "Numéro",
-    "Recipients": "Destinataires",
+    signal: "Signal",
+    Number: "Numéro",
+    Recipients: "Destinataires",
    needSignalAPI: "Vous avez besoin d'un client Signal avec l'API REST.",
    wayToCheckSignalURL: "Vous pouvez regarder l'URL sur comment le mettre en place :",
    signalImportant: "IMPORTANT: Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
-    "gotify": "Gotify",
+    gotify: "Gotify",
    "Application Token": "Application Token",
    "Server URL": "Server URL",
-    "Priority": "Priorité",
-    "slack": "Slack",
+    Priority: "Priorité",
+    slack: "Slack",
    "Icon Emoji": "Icon Emoji",
    "Channel Name": "Nom du salon",
    "Uptime Kuma URL": "Uptime Kuma URL",
@ -242,7 +241,7 @@ export default {
    line: "Line Messenger",
    mattermost: "Mattermost",
    "User Key": "Clé d'utilisateur",
-    "Device": "Appareil",
+    Device: "Appareil",
    "Message Title": "Titre du message",
    "Notification Sound": "Son de notification",
    "More info on:": "Plus d'informations sur: {0}",
@ -273,12 +272,11 @@ export default {
    "Icon URL": "Icon URL",
    aboutIconURL: "Vous pouvez mettre un lien vers l'image dans \"Icon URL\" pour remplacer l'image de profil par défaut. Ne sera pas utilisé si Icon Emoji est défini.",
    aboutMattermostChannelName: "Vous pouvez remplacer le salon par défaut que le Webhook utilise en mettant le nom du salon dans le champ \"Channel Name\". Vous aurez besoin de l'activer depuis les paramètres de Mattermost. Ex : #autre-salon",
-    "matrix": "Matrix",
+    matrix: "Matrix",
    promosmsTypeEco: "SMS ECO - Pas cher mais lent et souvent surchargé. Limité uniquement aux déstinataires Polonais.",
    promosmsTypeFlash: "SMS FLASH - Le message sera automatiquement affiché sur l'appareil du destinataire. Limité uniquement aux déstinataires Polonais.",
    promosmsTypeFull: "SMS FULL - Version Premium des SMS, Vous pouvez mettre le nom de l'expéditeur (Vous devez vous enregistrer avant). Fiable pour les alertes.",
    promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
    promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
    promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
-    // End notification form
 };
--- a/src/languages/id-ID.js
+++ b/src/languages/id-ID.js
@ -179,11 +179,10 @@ export default {
    "Edit Status Page": "Edit Halaman Status",
    "Go to Dashboard": "Pergi ke Dasbor",
    "Status Page": "Halaman Status",
-    // Start notification form
    defaultNotificationName: "{notification} saya Peringatan ({number})",
    here: "di sini",
-    "Required": "Dibutuhkan",
-    "telegram": "Telegram",
+    Required: "Dibutuhkan",
+    telegram: "Telegram",
    "Bot Token": "Bot Token",
    "You can get a token from": "Anda bisa mendapatkan token dari",
    "Chat ID": "Chat ID",
@ -191,12 +190,12 @@ export default {
    wayToGetTelegramChatID: "Anda bisa mendapatkan chat id Anda dengan mengirim pesan ke bot dan pergi ke url ini untuk melihat chat_id:",
    "YOUR BOT TOKEN HERE": "BOT TOKEN ANDA DI SINI",
    chatIDNotFound: "Chat ID tidak ditemukan, tolong kirim pesan ke bot ini dulu",
-    "webhook": "Webhook",
+    webhook: "Webhook",
    "Post URL": "Post URL",
    "Content Type": "Tipe konten",
    webhookJsonDesc: "{0} bagus untuk peladen http modern seperti express.js",
    webhookFormDataDesc: "{multipart} bagus untuk PHP, Anda hanya perlu mengurai json dengan {decodeFunction}",
-    "smtp": "Surel (SMTP)",
+    smtp: "Surel (SMTP)",
    secureOptionNone: "None / STARTTLS (25, 587)",
    secureOptionTLS: "TLS (465)",
    "Ignore TLS Error": "Abaikan Kesalahan TLS",
@ -204,26 +203,26 @@ export default {
    "To Email": "Ke Surel",
    smtpCC: "CC",
    smtpBCC: "BCC",
-    "discord": "Discord",
+    discord: "Discord",
    "Discord Webhook URL": "Discord Webhook URL",
    wayToGetDiscordURL: "Anda bisa mendapatkan ini dengan pergi ke Server Settings -> Integrations -> Create Webhook",
    "Bot Display Name": "Nama Bot",
    "Prefix Custom Message": "Awalan Pesan",
    "Hello @everyone is...": "Halo {'@'}everyone is...",
-    "teams": "Microsoft Teams",
+    teams: "Microsoft Teams",
    "Webhook URL": "Webhook URL",
    wayToGetTeamsURL: "Anda dapat mempelajari cara membuat url webhook {0}.",
-    "signal": "Sinyal",
-    "Number": "Nomer",
-    "Recipients": "Penerima",
+    signal: "Sinyal",
+    Number: "Nomer",
+    Recipients: "Penerima",
    needSignalAPI: "Anda harus memiliki klien sinyal dengan REST API.",
    wayToCheckSignalURL: "Anda dapat memeriksa url ini untuk melihat cara menyiapkannya:",
    signalImportant: "PENTING: Anda tidak dapat mencampur grup dan nomor di penerima!",
-    "gotify": "Gotify",
+    gotify: "Gotify",
    "Application Token": "Token Aplikasi",
    "Server URL": "URL Peladen",
-    "Priority": "Prioritas",
-    "slack": "Slack",
+    Priority: "Prioritas",
+    slack: "Slack",
    "Icon Emoji": "Ikon Emoji",
    "Channel Name": "Nama Saluran",
    "Uptime Kuma URL": "Uptime Kuma URL",
@ -242,7 +241,7 @@ export default {
    line: "Line Messenger",
    mattermost: "Mattermost",
    "User Key": "Kunci pengguna",
-    "Device": "Perangkat",
+    Device: "Perangkat",
    "Message Title": "Judul Pesan",
    "Notification Sound": "Suara Nofifikasi",
    "More info on:": "Info lebih lanjut tentang: {0}",
@ -273,7 +272,7 @@ export default {
    "Icon URL": "Icon URL",
    aboutIconURL: "Anda dapat memberikan tautan ke gambar di \"Icon URL\" untuk mengganti gambar profil bawaan. Tidak akan digunakan jika Ikon Emoji diset.",
    aboutMattermostChannelName: "Anda dapat mengganti saluran bawaan tujuan posting webhook dengan memasukkan nama saluran ke dalam Kolom \"Channel Name\". Ini perlu diaktifkan di pengaturan webhook Mattermost. contoh: #other-channel",
-    "matrix": "Matrix",
+    matrix: "Matrix",
    promosmsTypeEco: "SMS ECO - murah tapi lambat dan sering kelebihan beban. Terbatas hanya untuk penerima Polandia.",
    promosmsTypeFlash: "SMS FLASH - Pesan akan otomatis muncul di perangkat penerima. Terbatas hanya untuk penerima Polandia.",
    promosmsTypeFull: "SMS FULL - SMS tingkat premium, Anda dapat menggunakan Nama Pengirim Anda (Anda harus mendaftarkan nama terlebih dahulu). Dapat diAndalkan untuk peringatan.",
@ -281,5 +280,4 @@ export default {
    promosmsPhoneNumber: "Nomor telepon (untuk penerima Polandia Anda dapat melewati kode area)",
    promosmsSMSSender: "Nama Pengirim SMS : Nama pra-registrasi atau salah satu bawaan: InfoSMS, Info SMS, MaxSMS, INFO, SMS",
    "Feishu WebHookUrl": "Feishu WebHookUrl",
-    // End notification form
 };
--- a/src/languages/nb-NO.js
+++ b/src/languages/nb-NO.js
@ -179,11 +179,10 @@ export default {
    "Edit Status Page": "Rediger statusside",
    "Go to Dashboard": "Gå til Dashboard",
    "Status Page": "Statusside",
-    // Start notification form
    defaultNotificationName: "Min {notification} varsling ({number})",
    here: "here",
-    "Required": "Obligatorisk",
-    "telegram": "Telegram",
+    Required: "Obligatorisk",
+    telegram: "Telegram",
    "Bot Token": "Bot Token",
    wayToGetTelegramToken: "Du kan få et token fra {0}.",
    "Chat ID": "Chat ID",
@ -191,12 +190,12 @@ export default {
    wayToGetTelegramChatID: "Du kan få chat-ID-en din ved å sende meldingen til boten og gå til denne nettadressen for å se chat_id:",
    "YOUR BOT TOKEN HERE": "DITT BOT TOKEN HER",
    chatIDNotFound: "Chat-ID ble ikke funnet. Send en melding til denne boten først",
-    "webhook": "Webhook",
+    webhook: "Webhook",
    "Post URL": "Post URL",
    "Content Type": "Content Type",
    webhookJsonDesc: "{0} er bra for alle moderne HTTP-servere som express.js",
    webhookFormDataDesc: "{multipart} er bra for PHP, du trenger bare å analysere JSON etter {decodeFunction}",
-    "smtp": "E-post (SMTP)",
+    smtp: "E-post (SMTP)",
    secureOptionNone: "None / STARTTLS (25, 587)",
    secureOptionTLS: "TLS (465)",
    "Ignore TLS Error": "Ignorer TLS feilmelding",
@ -204,26 +203,26 @@ export default {
    "To Email": "Til E-post",
    smtpCC: "CC",
    smtpBCC: "BCC",
-    "discord": "Discord",
+    discord: "Discord",
    "Discord Webhook URL": "Discord Webhook URL",
    wayToGetDiscordURL: "Du kan få dette ved å gå til Serverinnstillinger -> Integrasjoner -> Webhooks -> Ny webhook",
    "Bot Display Name": "Bot Visningsnavn",
    "Prefix Custom Message": "Prefiks tilpasset melding",
    "Hello @everyone is...": "Hei {'@'}everyone det er...",
-    "teams": "Microsoft Teams",
+    teams: "Microsoft Teams",
    "Webhook URL": "Webhook URL",
    wayToGetTeamsURL: "Du kan lære hvordan du oppretter en webhook-URL {0}.",
-    "signal": "Signal",
-    "Number": "Nummer",
-    "Recipients": "Mottakere",
+    signal: "Signal",
+    Number: "Nummer",
+    Recipients: "Mottakere",
    needSignalAPI: "Du må ha en Signal-klient med REST API.",
    wayToCheckSignalURL: "Du kan sjekke denne nettadressen for å se hvordan du konfigurerer en:",
    signalImportant: "VIKTIG: Du kan ikke blande grupper og nummere i mottakere!",
-    "gotify": "Gotify",
+    gotify: "Gotify",
    "Application Token": "Application Token",
    "Server URL": "Server URL",
-    "Priority": "Prioritet",
-    "slack": "Slack",
+    Priority: "Prioritet",
+    slack: "Slack",
    "Icon Emoji": "Icon Emoji",
    "Channel Name": "Kanal navn",
    "Uptime Kuma URL": "Uptime Kuma URL",
@ -242,7 +241,7 @@ export default {
    line: "Line Messenger",
    mattermost: "Mattermost",
    "User Key": "User Key",
-    "Device": "Device",
+    Device: "Device",
    "Message Title": "Message Title",
    "Notification Sound": "Notification Sound",
    "More info on:": "More info on: {0}",
@ -273,12 +272,11 @@ export default {
    "Icon URL": "Icon URL",
    aboutIconURL: "You can provide a link to a picture in \"Icon URL\" to override the default profile picture. Will not be used if Icon Emoji is set.",
    aboutMattermostChannelName: "You can override the default channel that webhook posts to by entering the channel name into \"Channel Name\" field. This needs to be enabled in Mattermost webhook settings. Ex: #other-channel",
-    "matrix": "Matrix",
+    matrix: "Matrix",
    promosmsTypeEco: "SMS ECO - cheap but slow and often overloaded. Limited only to Polish recipients.",
    promosmsTypeFlash: "SMS FLASH - Message will automatically show on recipient device. Limited only to Polish recipients.",
    promosmsTypeFull: "SMS FULL - Premium tier of SMS, You can use Your Sender Name (You need to register name first). Reliable for alerts.",
    promosmsTypeSpeed: "SMS SPEED - Highest priority in system. Very quick and reliable but costly (about twice of SMS FULL price).",
    promosmsPhoneNumber: "Phone number (for Polish recipient You can skip area codes)",
    promosmsSMSSender: "SMS Sender Name : Pre-registred name or one of defaults: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
-    // End notification form
 };
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@ -203,5 +203,5 @@ export default {
    Headers: "Headers",
    PushUrl: "Push URL",
    HeadersInvalidFormat: "The request headers is geen geldige JSON: ",
-    BodyInvalidFormat: "De request body is geen geldige JSON: "
+    BodyInvalidFormat: "De request body is geen geldige JSON: ",
 };
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@ -118,8 +118,8 @@ export default {
    "Last Result": "Ostatni wynik",
    "Create your admin account": "Utwórz swoje konto administratora",
    "Repeat Password": "Powtórz hasło",
-    "Import Backup": "Importuj Kopię",
-    "Export Backup": "Eksportuj Kopię",
+    "Import Backup": "Importuj kopię zapasową",
+    "Export Backup": "Eksportuj kopię zapasową",
    Export: "Eksportuj",
    Import: "Importuj",
    respTime: "Czas Odp. (ms)",
@ -127,7 +127,7 @@ export default {
    "Default enabled": "Włącz domyślnie",
    "Apply on all existing monitors": "Zastosuj do istniejących monitorów",
    Create: "Stwórz",
-    "Clear Data": "Usuń Dane",
+    "Clear Data": "Usuń dane",
    Events: "Wydarzenia",
    Heartbeats: "Bicia serca",
    "Auto Get": "Wykryj",
@ -179,11 +179,10 @@ export default {
    "Edit Status Page": "Edytuj stronę statusu",
    "Go to Dashboard": "Idź do panelu",
    "Status Page": "Strona statusu",
-    // Start notification form
    defaultNotificationName: "Moje powiadomienie {notification} ({number})",
    here: "tutaj",
-    "Required": "Wymagane",
-    "telegram": "Telegram",
+    Required: "Wymagane",
+    telegram: "Telegram",
    "Bot Token": "Token Bota",
    wayToGetTelegramToken: "Token można uzyskać z {0}.",
    "Chat ID": "Identyfikator Czatu",
@ -191,12 +190,12 @@ export default {
    wayToGetTelegramChatID: "Możesz uzyskać swój identyfikator czatu, wysyłając wiadomość do bota i przechodząc pod ten adres URL, aby wyświetlić identyfikator czatu:",
    "YOUR BOT TOKEN HERE": "TWOJ TOKEN BOTA",
    chatIDNotFound: "Identyfikator czatu nie znaleziony, najpierw napisz do bota",
-    "webhook": "Webhook",
+    webhook: "Webhook",
    "Post URL": "Adres URL",
    "Content Type": "Rodzaj danych",
    webhookJsonDesc: "{0} jest dobry w przypadku serwerów HTTP, takich jak express.js",
    webhookFormDataDesc: "{multipart} jest dobry dla PHP, musisz jedynie przetowrzyć dane przez {decodeFunction}",
-    "smtp": "Email (SMTP)",
+    smtp: "Email (SMTP)",
    secureOptionNone: "Brak / STARTTLS (25, 587)",
    secureOptionTLS: "TLS (465)",
    "Ignore TLS Error": "Zignrouj Błędy TLS",
@ -204,26 +203,26 @@ export default {
    "To Email": "Odbiorca (DO)",
    smtpCC: "DW",
    smtpBCC: "UDW",
-    "discord": "Discord",
+    discord: "Discord",
    "Discord Webhook URL": "URL Webhook Discorda",
    wayToGetDiscordURL: "Możesz go uzyskać przechodząc do Ustawienia Serwera -> Integracje -> Tworzenie Webhooka",
    "Bot Display Name": "Wyświetlana Nazwa Bota",
    "Prefix Custom Message": "Własny Początek Wiadomości",
    "Hello @everyone is...": "Hej {'@'}everyone ...",
-    "teams": "Microsoft Teams",
+    teams: "Microsoft Teams",
    "Webhook URL": "URL Webhooka",
    wayToGetTeamsURL: "You can learn how to create a webhook url {0}.",
-    "signal": "Signal",
-    "Number": "Numer",
-    "Recipients": "Odbiorcy",
+    signal: "Signal",
+    Number: "Numer",
+    Recipients: "Odbiorcy",
    needSignalAPI: "Musisz posiadać klienta Signal z REST API.",
    wayToCheckSignalURL: "W celu dowiedzenia się, jak go skonfigurować, odwiedź poniższy link:",
    signalImportant: "UWAGA: Nie można mieszać nazw grup i numerów odbiorców!",
-    "gotify": "Gotify",
+    gotify: "Gotify",
    "Application Token": "Token Aplikacji",
    "Server URL": "Server URL",
-    "Priority": "Priorytet",
-    "slack": "Slack",
+    Priority: "Priorytet",
+    slack: "Slack",
    "Icon Emoji": "Ikona Emoji",
    "Channel Name": "Nazwa Kanału",
    "Uptime Kuma URL": "Adres Uptime Kuma",
@ -242,7 +241,7 @@ export default {
    line: "Line Messenger",
    mattermost: "Mattermost",
    "User Key": "Klucz Użytkownika",
-    "Device": "Urządzenie",
+    Device: "Urządzenie",
    "Message Title": "Tytuł Wiadomości",
    "Notification Sound": "Dźwięk Powiadomienia",
    "More info on:": "Więcej informacji na: {0}",
@ -273,12 +272,36 @@ export default {
    "Icon URL": "Adres Ikony",
    aboutIconURL: "Możesz podać link do zdjęcia w \"Adres URL ikony\", aby zastąpić domyślne zdjęcie profilowe. Nie będzie używany, jeśli ustawiona jest ikona Emoji.",
    aboutMattermostChannelName: "Możesz zastąpić domyślny kanał, na którym publikowane są posty webhooka, wpisując nazwę kanału w polu \"Nazwa Kanału\". Należy to włączyć w ustawieniach webhooka Mattermost. Np.: #inny-kanał",
-    "matrix": "Matrix",
+    matrix: "Matrix",
    promosmsTypeEco: "SMS ECO - Tanie, lecz wolne. Dostępne tylko w Polsce",
    promosmsTypeFlash: "SMS FLASH - Wiadomość automatycznie wyświetli się na urządzeniu. Dostępne tylko w Polsce.",
    promosmsTypeFull: "SMS FULL - Szybkie i dostępne międzynarodowo. Wersja premium usługi, która pozwala min. ustawić własną nazwę nadawcy.",
    promosmsTypeSpeed: "SMS SPEED - Wysyłka priorytetowa, posiada wszystkie zalety SMS FULL",
    promosmsPhoneNumber: "Numer Odbiorcy",
    promosmsSMSSender: "Nadawca SMS (Wcześniej zatwierdzone nazwy z panelu PromoSMS)",
-    // End notification form
+    "Primary Base URL": "Główny URL",
+    "Push URL": "Push URL",
+    needPushEvery: "Powinieneś wywoływać ten URL co {0} sekund",
+    pushOptionalParams: "Parametry opcjonalne: {0}",
+    emailCustomSubject: "Niestandardowy temat",
+    checkPrice: "Sprawdź ceny {0}:",
+    octopushLegacyHint: "Czy używasz starszej wersji Octopush (2011-2020) czy nowej wersji?",
+    "Feishu WebHookUrl": "Feishu WebHookURL",
+    matrixHomeserverURL: "Adres URL serwera domowego (z http(s):// i opcjonalnie port)",
+    "Internal Room Id": "Wewnętrzne ID pokoju",
+    matrixDesc1: "Możesz znaleźć wewnętrzne ID pokoju patrząc w zaawansowanej sekcji ustawień pokoju w twoim kliencie Matrix. Powinien on wyglądać jak !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Jest wysoce zalecane, abyś stworzył nowego użytkownika i nie używał tokena dostępu swojego użytkownika Matrix, ponieważ pozwoli on na pełny dostęp do twojego konta i wszystkich pokoi, do których dołączyłeś. Zamiast tego, utwórz nowego użytkownika i zaproś go tylko do pokoju, w którym chcesz otrzymywać powiadomienia. Możesz uzyskać token dostępu przez uruchomienie {0}",
+    Method: "Metoda",
+    Body: "Treść",
+    Headers: "Nagłówki",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "Nagłówki żądania nie są w poprawnym formacie JSON: ",
+    BodyInvalidFormat: "Treść żądania nie jest w poprawnym formacie JSON: ",
+    "Monitor History": "Historia monitorów",
+    clearDataOlderThan: "Przechowuj dane dotyczące historii monitorowania {0} dni.",
+    PasswordsDoNotMatch: "Hasła nie pasują.",
+    records: "rekordy",
+    "One record": "Jeden rekord",
+    "Showing {from} to {to} of {count} records": "Wyświetlanie {from} do {to} z {count} rekordów",
+    steamApiKeyDescription: "Do monitorowania serwera gier Steam potrzebny jest klucz Steam Web-API. Możesz zarejestrować swój klucz API tutaj: ",
 };
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@ -204,7 +204,7 @@ export default {
    mattermost: "Mattermost",
    "Primary Base URL": "Основной URL",
    "Push URL": "URL пуша",
-    needPushEvery: "К этому URL необходимо обращаться каждые {0} секунд.",
+    needPushEvery: "К этому URL необходимо обращаться каждые {0} секунд",
    pushOptionalParams: "Опциональные параметры: {0}",
    defaultNotificationName: "Моё уведомление {notification} ({number})",
    here: "здесь",
--- a/src/languages/vi.js
+++ b/src/languages/vi.js
@ -179,11 +179,10 @@ export default {
    "Edit Status Page": "Sửa trang trạng thái",
    "Go to Dashboard": "Đi tới Dashboard",
    "Status Page": "Trang trạng thái",
-    // Start notification form
    defaultNotificationName: "My {notification} Alerts ({number})",
    here: "tại đây",
-    "Required": "Bắt buộc",
-    "telegram": "Telegram",
+    Required: "Bắt buộc",
+    telegram: "Telegram",
    "Bot Token": "Bot Token",
    "You can get a token from": "Bạn có thể lấy mã token từ",
    "Chat ID": "Chat ID",
@ -191,12 +190,12 @@ export default {
    wayToGetTelegramChatID: "Bạn có thể lấy chat id của mình bằng cách gửi tin nhắn tới bot và truy cập url này để xem chat_id:",
    "YOUR BOT TOKEN HERE": "MÃ BOT TOKEN CỦA BẠN",
    chatIDNotFound: "Không tìm thấy Chat ID, vui lòng gửi tin nhắn cho bot này trước",
-    "webhook": "Webhook",
+    webhook: "Webhook",
    "Post URL": "URL đăng",
    "Content Type": "Loại nội dung",
    webhookJsonDesc: "{0} phù hợp với bất kỳ máy chủ http hiện đại nào như express.js",
    webhookFormDataDesc: "{multipart} phù hợp với PHP, bạn chỉ cần phân tích cú pháp json bằng {decodeFunction}",
-    "smtp": "Email (SMTP)",
+    smtp: "Email (SMTP)",
    secureOptionNone: "None / STARTTLS (25, 587)",
    secureOptionTLS: "TLS (465)",
    "Ignore TLS Error": "Bỏ qua lỗi TLS",
@ -204,26 +203,26 @@ export default {
    "To Email": "Tới Email",
    smtpCC: "CC",
    smtpBCC: "BCC",
-    "discord": "Discord",
+    discord: "Discord",
    "Discord Webhook URL": "Discord Webhook URL",
    wayToGetDiscordURL: "Để lấy Discord, hãy vào: Server Settings -> Integrations -> Create Webhook",
    "Bot Display Name": "Tên hiển thị của Bot",
    "Prefix Custom Message": "Tiền tố tin nhắn tuỳ chọn",
    "Hello @everyone is...": "Xin chào {'@'} mọi người đang...",
-    "teams": "Microsoft Teams",
+    teams: "Microsoft Teams",
    "Webhook URL": "Webhook URL",
    wayToGetTeamsURL: "Bạn có thể học cách tạo webhook url {0}.",
-    "signal": "Signal",
-    "Number": "Số",
-    "Recipients": "Người nhận",
+    signal: "Signal",
+    Number: "Số",
+    Recipients: "Người nhận",
    needSignalAPI: "Bạn cần một tín hiệu client với REST API.",
    wayToCheckSignalURL: "Bạn có thể kiểm tra url này để xem cách thiết lập:",
    signalImportant: "QUAN TRỌNG: Bạn không thể kết hợp các nhóm và số trong người nhận!",
-    "gotify": "Gotify",
+    gotify: "Gotify",
    "Application Token": "Mã Token ứng dụng",
    "Server URL": "URL máy chủ",
-    "Priority": "Mức ưu tiên",
-    "slack": "Slack",
+    Priority: "Mức ưu tiên",
+    slack: "Slack",
    "Icon Emoji": "Icon Emoji",
    "Channel Name": "Tên Channel",
    "Uptime Kuma URL": "Uptime Kuma URL",
@ -242,7 +241,7 @@ export default {
    line: "Line Messenger",
    mattermost: "Mattermost",
    "User Key": "User Key",
-    "Device": "Thiết bị",
+    Device: "Thiết bị",
    "Message Title": "Tiêu đề tin nhắn",
    "Notification Sound": "Âm thanh thông báo",
    "More info on:": "Thông tin chi tiết tại: {0}",
@ -273,7 +272,7 @@ export default {
    "Icon URL": "Icon URL",
    aboutIconURL: "Bạn có thể cung cấp liên kết đến ảnh trong \"Icon URL\" để ghi đè ảnh hồ sơ mặc định. Sẽ không được sử dụng nếu Biểu tượng cảm xúc được thiết lập.",
    aboutMattermostChannelName: "Bạn có thể ghi đè kênh mặc định mà webhook đăng lên bằng cách nhập tên kênh vào trường \"Channel Name\". Điều này cần được bật trong cài đặt Mattermost webhook. Ví dụ: #other-channel",
-    "matrix": "Matrix",
+    matrix: "Matrix",
    promosmsTypeEco: "SMS ECO - rẻ nhưng chậm và thường xuyên quá tải. Chỉ dành cho người Ba Lan.",
    promosmsTypeFlash: "SMS FLASH - Tin nhắn sẽ tự động hiển thị trên thiết bị của người nhận. Chỉ dành cho người Ba Lan.",
    promosmsTypeFull: "SMS FULL - SMS cao cấp, Bạn có thể sử dụng Tên Người gửi (Bạn cần đăng ký tên trước). Đáng tin cậy cho các cảnh báo.",
@ -281,5 +280,4 @@ export default {
    promosmsPhoneNumber: "Số điện thoại (Bỏ qua mã vùng với người Ba Lan)",
    promosmsSMSSender: "SMS Tên người gửi: Tên đã đăng ký trước hoặc tên mặc định: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
    "Feishu WebHookUrl": "Feishu WebHookUrl",
-    // End notification form
 };
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@ -65,7 +65,7 @@ export default {
    "Max. Redirects": "重定向次数",
    "Accepted Status Codes": "有效状态码",
    "Push URL": "推送链接",
-    needPushEvery: "你需要每 {0} 秒调用一次。",
+    needPushEvery: "你需要每 {0} 秒调用一次",
    pushOptionalParams: "可选参数：{0}",
    Save: "保存",
    Notifications: "消息通知",
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@ -328,6 +328,10 @@ export default {
        clearStatistics(callback) {
            socket.emit("clearStatistics", callback);
        },
+
+        getMonitorBeats(monitorID, period, callback) {
+            socket.emit("getMonitorBeats", monitorID, period, callback);
+        }
    },

    computed: {
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@ -112,7 +112,7 @@

                                <div class="input-group mb-3">
                                    <input id="primaryBaseURL" v-model="settings.primaryBaseURL" class="form-control" name="primaryBaseURL" placeholder="https://" pattern="https?://.+">
-                                    <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryBaseURL">Auto Get</button>
+                                    <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryBaseURL">{{ $t("Auto Get") }}</button>
                                </div>

                                <div class="form-text">