Merge branch 'master' into snmp-monitor

src/components/NotificationDialog.vue

@@ -123,6 +123,7 @@ export default {
                 "GrafanaOncall": "Grafana Oncall",
                 "HeiiOnCall": "Heii On-Call",
                 "HomeAssistant": "Home Assistant",
+                "Keep": "Keep",
                 "Kook": "Kook",
                 "line": "LINE Messenger",
                 "LineNotify": "LINE Notify",
@@ -154,6 +155,7 @@ export default {
                 "webhook": "Webhook",
                 "GoAlert": "GoAlert",
                 "ZohoCliq": "ZohoCliq",
+                "SevenIO": "SevenIO",
                 "whapi": "WhatsApp (Whapi)",
                 "gtxmessaging": "GtxMessaging",
                 "Cellsynt": "Cellsynt",

src/components/notifications/DingDing.vue

@@ -2,9 +2,10 @@
     <div class="mb-3">
         <label for="WebHookUrl" class="form-label">{{ $t("WebHookUrl") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="WebHookUrl" v-model="$parent.notification.webHookUrl" type="text" class="form-control" required>
-
+    </div>
+    <div class="mb-3">
         <label for="secretKey" class="form-label">{{ $t("SecretKey") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="secretKey" v-model="$parent.notification.secretKey" type="text" class="form-control" required>
+        <HiddenInput id="secretKey" v-model="$parent.notification.secretKey" :required="true" autocomplete="new-password"></HiddenInput>
 
         <div class="form-text">
             <p>{{ $t("For safety, must use secret key") }}</p>
@@ -13,4 +14,24 @@
             </i18n-t>
         </div>
     </div>
+    <div class="mb-3">
+        <label for="mentioning" class="form-label">{{ $t("Mentioning") }}<span style="color: red;"><sup>*</sup></span></label>
+        <select id="mentioning" v-model="$parent.notification.mentioning" class="form-select" required>
+            <option value="nobody">{{ $t("Don't mention people") }}</option>
+            <option value="everyone">{{ $t("Mention group", { group: "@everyone" }) }}</option>
+        </select>
+    </div>
 </template>
+
+<script lang="ts">
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: { HiddenInput },
+    mounted() {
+        if (typeof this.$parent.notification.mentioning === "undefined") {
+            this.$parent.notification.mentioning = "nobody";
+        }
+    }
+};
+</script>

src/components/notifications/Keep.vue

@@ -0,0 +1,42 @@
+<template>
+    <div class="mb-3">
+        <label for="webhook-url" class="form-label">{{ $t("Host URL") }}</label>
+        <input
+            id="webhook-url"
+            v-model="$parent.notification.webhookURL"
+            type="url"
+            pattern="https?://.+"
+            class="form-control"
+            required
+        />
+        <div class="form-text">
+            <i18n-t tag="p" keypath="Read more:">
+                <a href="https://docs.keephq.dev/providers/documentation/uptimekuma-provider" target="_blank">https://docs.keephq.dev/providers/documentation/uptimekuma-provider</a>
+            </i18n-t>
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="webhook-apikey" class="form-label">{{
+            $t("API Key")
+        }}</label>
+        <HiddenInput
+            id="webhook-apikey"
+            v-model="$parent.notification.webhookAPIKey"
+            :required="true"
+        ></HiddenInput>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+    mounted() {
+        this.$parent.notification.webhookURL ||= "";
+    },
+};
+</script>

src/components/notifications/SMTP.vue

@@ -5,6 +5,14 @@
             <input id="hostname" v-model="$parent.notification.smtpHost" type="text" class="form-control" required>
         </div>
 
+        <i18n-t tag="div" keypath="Either enter the hostname of the server you want to connect to or localhost if you intend to use a locally configured mail transfer agent" class="form-text">
+            <template #localhost>
+                <code>localhost</code>
+            </template>
+            <template #local_mta>
+                <a href="https://wikipedia.org/wiki/Mail_Transfer_Agent" target="_blank">{{ $t("locally configured mail transfer agent") }}</a>
+            </template>
+        </i18n-t>
         <div class="mb-3">
             <label for="port" class="form-label">{{ $t("Port") }}</label>
             <input id="port" v-model="$parent.notification.smtpPort" type="number" class="form-control" required min="0" max="65535" step="1">

src/components/notifications/SevenIO.vue

@@ -0,0 +1,31 @@
+<template>
+    <div class="mb-3">
+        <label for="sevenio-api-key" class="form-label">{{ $t("apiKeySevenIO") }}</label>
+        <HiddenInput id="sevenio-api-key" v-model="$parent.notification.sevenioApiKey" :required="true" autocomplete="new-password"></HiddenInput>
+        <div class="form-text">
+            {{ $t("wayToGetSevenIOApiKey") }}
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="sevenio-sender" class="form-label">{{ $t("senderSevenIO") }}</label>
+        <input id="sevenio-sender" v-model="$parent.notification.sevenioSender" type="text" class="form-control" autocomplete="false" placeholder="Uptime Kuma">
+    </div>
+
+    <div class="mb-3">
+        <label for="sevenio-receiver" class="form-label">{{ $t("receiverSevenIO") }}</label>
+        <input id="sevenio-receiver" v-model="$parent.notification.sevenioReceiver" type="number" class="form-control" required autocomplete="false" placeholder="0123456789">
+        <div class="form-text">
+            {{ $t("receiverInfoSevenIO") }}
+        </div>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>

src/components/notifications/index.js

@@ -17,6 +17,7 @@ import GrafanaOncall from "./GrafanaOncall.vue";
 import GtxMessaging from "./GtxMessaging.vue";
 import HomeAssistant from "./HomeAssistant.vue";
 import HeiiOnCall from "./HeiiOnCall.vue";
+import Keep from "./Keep.vue";
 import Kook from "./Kook.vue";
 import Line from "./Line.vue";
 import LineNotify from "./LineNotify.vue";
@@ -55,6 +56,7 @@ import WeCom from "./WeCom.vue";
 import GoAlert from "./GoAlert.vue";
 import ZohoCliq from "./ZohoCliq.vue";
 import Splunk from "./Splunk.vue";
+import SevenIO from "./SevenIO.vue";
 import Whapi from "./Whapi.vue";
 import Cellsynt from "./Cellsynt.vue";
 
@@ -81,6 +83,7 @@ const NotificationFormList = {
     "GrafanaOncall": GrafanaOncall,
     "HomeAssistant": HomeAssistant,
     "HeiiOnCall": HeiiOnCall,
+    "Keep": Keep,
     "Kook": Kook,
     "line": Line,
     "LineNotify": LineNotify,
@@ -119,6 +122,7 @@ const NotificationFormList = {
     "GoAlert": GoAlert,
     "ServerChan": ServerChan,
     "ZohoCliq": ZohoCliq,
+    "SevenIO": SevenIO,
     "whapi": Whapi,
     "gtxmessaging": GtxMessaging,
     "Cellsynt": Cellsynt,

src/i18n.js

@@ -59,10 +59,29 @@ for (let lang in languageList) {
 
 const rtlLangs = [ "he-IL", "fa", "ar-SY", "ur" ];
 
-export const currentLocale = () => localStorage.locale
-    || languageList[navigator.language] && navigator.language
-    || languageList[navigator.language.substring(0, 2)] && navigator.language.substring(0, 2)
-    || "en";
+/**
+ * Find the best matching locale to display
+ * If no locale can be matched, the default is "en"
+ * @returns {string} the locale that should be displayed
+ */
+export function currentLocale() {
+    for (const locale of [ localStorage.locale, navigator.language, ...navigator.languages ]) {
+        // localstorage might not have a value or there might not be a language in `navigator.language`
+        if (!locale) {
+            continue;
+        }
+        if (locale in messages) {
+            return locale;
+        }
+        // some locales are further specified such as "en-US".
+        // If we only have a generic locale for this, we can use it too
+        const genericLocale = locale.split("-")[0];
+        if (genericLocale in messages) {
+            return genericLocale;
+        }
+    }
+    return "en";
+}
 
 export const localeDirection = () => {
     return rtlLangs.includes(currentLocale()) ? "rtl" : "ltr";

src/lang/en.json

@@ -63,6 +63,9 @@
     "Friendly Name": "Friendly Name",
     "URL": "URL",
     "Hostname": "Hostname",
+    "Host URL": "Host URL",
+    "locally configured mail transfer agent": "locally configured mail transfer agent",
+    "Either enter the hostname of the server you want to connect to or localhost if you intend to use a locally configured mail transfer agent": "Either enter the hostname of the server you want to connect to or {localhost} if you intend to use a {local_mta}",
     "Port": "Port",
     "Heartbeat Interval": "Heartbeat Interval",
     "Request Timeout": "Request Timeout",
@@ -665,6 +668,9 @@
     "WebHookUrl": "WebHookUrl",
     "SecretKey": "SecretKey",
     "For safety, must use secret key": "For safety, must use secret key",
+    "Mentioning": "Mentioning",
+    "Don't mention people": "Don't mention people",
+    "Mention group": "Mention {group}",
     "Device Token": "Device Token",
     "Platform": "Platform",
     "Huawei": "Huawei",
@@ -885,6 +891,11 @@
     "deleteRemoteBrowserMessage": "Are you sure want to delete this Remote Browser for all monitors?",
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
+    "wayToGetSevenIOApiKey": "Visit the dashboard under app.seven.io > developer > api key > the green add button",
+    "senderSevenIO": "Sending number or name",
+    "receiverSevenIO": "Receiving number",
+    "receiverInfoSevenIO": "If the receiving number is not located in Germany, you have to add the country code in front of the number (e.g. for the country code 1 from the US use 117612121212 instead of 017612121212)",
+    "apiKeySevenIO": "SevenIO API Key",
     "wayToWriteWhapiRecipient": "The phone number with the international prefix, but without the plus sign at the start ({0}), the Contact ID ({1}) or the Group ID ({2}).",
     "wayToGetWhapiUrlAndToken": "You can get the API URL and the token by going into your desired channel from {0}",
     "whapiRecipient": "Phone Number / Contact ID / Group ID",