Flashduty IntegrationKey support Endpoint URL

server/notification-providers/flashduty.js

@@ -73,13 +73,13 @@ class FlashDuty extends NotificationProvider {
         }
         const options = {
             method: "POST",
-            url: "https://api.flashcat.cloud/event/push/alert/standard?integration_key=" + notification.flashdutyIntegrationKey,
+            url: notification.flashdutyIntegrationKey.startsWith("http") ? notification.flashdutyIntegrationKey : "https://api.flashcat.cloud/event/push/alert/standard?integration_key=" + notification.flashdutyIntegrationKey,
             headers: { "Content-Type": "application/json" },
             data: {
                 description: `[${title}] [${monitorInfo.name}] ${body}`,
                 title,
                 event_status: eventStatus || "Info",
-                alert_key: String(monitorInfo.id) || Math.random().toString(36).substring(7),
+                alert_key: monitorInfo.id ? String(monitorInfo.id) : Math.random().toString(36).substring(7),
                 labels,
             }
         };

src/components/notifications/FlashDuty.vue

@@ -1,7 +1,10 @@
 <template>
     <div class="mb-3">
-        <label for="flashduty-integration-url" class="form-label">Integration Key</label>
-        <HiddenInput id="flashduty-integration-url" v-model="$parent.notification.flashdutyIntegrationKey" autocomplete="false"></HiddenInput>
+        <label for="flashduty-integration-url" class="form-label">{{ $t("FlashDuty Push URL") }} <span style="color: red;"><sup>*</sup></span></label>
+        <input id="flashduty-integration-url" v-model="$parent.notification.flashdutyIntegrationKey" type="text" class="form-control" required></input>
+        <div class="form-text">
+            <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
+        </div>
         <i18n-t tag="div" keypath="wayToGetFlashDutyKey" class="form-text">
             <a href="https://flashcat.cloud/product/flashduty?from=kuma" target="_blank">{{ $t("here") }}</a>
         </i18n-t>
@@ -17,12 +20,8 @@
 </template>
 
 <script>
-import HiddenInput from "../HiddenInput.vue";
 
 export default {
-    components: {
-        HiddenInput,
-    },
     mounted() {
     }
 };

src/lang/be.json

@@ -865,6 +865,7 @@
     "Request Body": "Цела запыту",
     "wayToGetFlashDutyKey": "Вы можаце перайсці на старонку \"Канал\" -> (Выберыце канал) -> \"Інтэграцыі\" -> \"Дадаць новую старонку інтэграцыі\", дадаць \"Карыстацкую падзею\", каб атрымаць push-адрас, скапіяваць ключ інтэграцыі ў адрас. Для атрымання дадатковай інфармацыі, калі ласка, наведайце",
     "FlashDuty Severity": "Сур'ёзнасць",
+    "FlashDuty Push URL": "URL-адреса пуш-повідомлень",
     "nostrRecipients": "Адкрытыя ключы атрымальнікаў (npub)",
     "nostrRelaysHelp": "Адзін URL-адрас рэтрансляцыі ў кожным радку",
     "nostrSender": "Закрыты ключ адпраўшчыка (nsec)",

src/lang/bg-BG.json

@@ -824,6 +824,7 @@
     "tailscalePingWarning": "За да използвате Tailscale Ping монитор, трябва да инсталирате Uptime Kuma без Docker и също така да инсталирате Tailscale клиент на вашия сървър.",
     "Server URL should not contain the nfty topic": "URL адресът на сървъра не трябва да съдържа nfty темата",
     "FlashDuty Severity": "Степен на тежест",
+    "FlashDuty Push URL": "URL адрес за изпращане на",
     "showCertificateExpiry": "Показвай изтичащ сертификат",
     "noOrBadCertificate": "Няма/лош сертификат",
     "Select": "Избери",

src/lang/cs-CZ.json

@@ -830,6 +830,7 @@
     "noOrBadCertificate": "Žádný/Vadný certifikát",
     "nostrRelays": "Relé Nostr",
     "FlashDuty Severity": "Závažnost",
+    "FlashDuty Push URL": "Push URL",
     "PushDeer Server": "Server PushDeer",
     "wayToGetFlashDutyKey": "Můžete přejít na stránku \"Kanál -> (Vyberte kanál) -> Integrace -> Přidat novou integraci\", přidat \"Uptime Kuma\" a získat push adresu, zkopírovat integrační klíč v adrese. Další informace naleznete na adrese",
     "Request Timeout": "Časový limit požadavku",

src/lang/de-CH.json

@@ -817,6 +817,7 @@
     "Server URL should not contain the nfty topic": "Die Server-URL sollte das nfty-Thema nicht enthalten",
     "pushDeerServerDescription": "Leer lassen um den offiziellen Server zu verwenden",
     "FlashDuty Severity": "Schweregrad",
+    "FlashDuty Push URL": "Push URL",
     "nostrSender": "Privater Schlüssel des Absenders (nsec)",
     "nostrRecipientsHelp": "npub-Format, eine pro Zeile",
     "noOrBadCertificate": "Kein/schlechtes Zertifikat",

src/lang/de-DE.json

@@ -820,6 +820,7 @@
     "Server URL should not contain the nfty topic": "Die Server-URL sollte das nfty-Thema nicht enthalten",
     "pushDeerServerDescription": "Leer lassen um den offiziellen Server zu verwenden",
     "FlashDuty Severity": "Schweregrad",
+    "FlashDuty Push URL": "Push URL",
     "nostrRelays": "Nostr Relays",
     "gamedigGuessPort": "Gamedig: Vermuteter Port",
     "Request Timeout": "Zeitüberschreitung der Anfrage",

src/lang/en.json

@@ -897,6 +897,7 @@
     "Request Body": "Request Body",
     "wayToGetFlashDutyKey": "You can go to Channel -> (Select a Channel) -> Integrations -> Add a new integration' page, add a 'Uptime Kuma' to get a push address, copy the Integration Key in the address. For more information, please visit",
     "FlashDuty Severity": "Severity",
+    "FlashDuty Push URL": "Push URL",
     "nostrRelays": "Nostr relays",
     "nostrRelaysHelp": "One relay URL per line",
     "nostrSender": "Sender Private Key (nsec)",

src/lang/es-ES.json

@@ -810,6 +810,7 @@
     "Close": "Cerrar",
     "Request Body": "Cuerpo de solicitud",
     "FlashDuty Severity": "Gravedad",
+    "FlashDuty Push URL": "URL de Push de",
     "nostrRelays": "Relays de Nostr",
     "nostrRelaysHelp": "Una URL de retransmisión por línea",
     "nostrSender": "Clave Privada del remitente (nsec)",

src/lang/fa.json

@@ -768,6 +768,7 @@
     "Notify Channel": "آگاه کردن کانال",
     "timeoutAfter": "تایم اوت بعد از {0} ثانیه",
     "FlashDuty Severity": "شدت",
+    "FlashDuty Push URL": "آدرس پوش",
     "nostrRelays": "ریلی Nostr",
     "nostrRelaysHelp": "یک آدرس ریلی به ازای هر خط",
     "nostrSender": "کلید محرمانه فرسته (nsec)",

src/lang/fi.json

@@ -849,6 +849,7 @@
     "Close": "Sulje",
     "Request Body": "Pyynnön sisältörunko",
     "FlashDuty Severity": "Vakavuus",
+    "FlashDuty Push URL": "push URL",
     "nostrRelays": "Nostr-releet",
     "nostrSender": "Lähettäjän yksityisavain (nsec)",
     "nostrRecipients": "Vastaanottajan julkiset avaimet (npub)",

src/lang/fr-FR.json

@@ -831,6 +831,7 @@
     "noOrBadCertificate": "Pas/Mauvais certificat",
     "pushDeerServerDescription": "Laissez le champ vide pour utiliser le serveur officiel",
     "FlashDuty Severity": "Gravité",
+    "FlashDuty Push URL": "URL de Push",
     "wayToGetFlashDutyKey": "Vous pouvez aller dans Canal -> (Sélectionner un canal) -> Intégrations -> Ajouter une nouvelle page d'intégration, ajouter un « Uptime Kuma » pour obtenir une adresse push, copier la clé d'intégration dans l'adresse. Pour plus d'informations, veuillez visiter",
     "Request Timeout": "Délai d'expiration de la demande",
     "timeoutAfter": "Délai dépassé après {0} secondes",

src/lang/ga.json

@@ -821,6 +821,7 @@
     "Close": "Dún",
     "Request Body": "Comhlacht Iarratas",
     "FlashDuty Severity": "Déine",
+    "FlashDuty Push URL": "URL Push",
     "nostrRelays": "Athsheachadáin Nostr",
     "nostrRelaysHelp": "URL sealaíochta amháin in aghaidh an líne",
     "nostrSender": "Eochair Phríobháideach an Seoltóra (nsec)",

src/lang/hr-HR.json

@@ -833,6 +833,7 @@
     "Request Body": "Tijelo zahtjeva",
     "wayToGetFlashDutyKey": "Možete otići na 'Channel' -> (Odaberite kanal) -> 'Integrations' -> 'Add a new integration' i odaberite 'Uptime Kuma' da biste dobili push adresu. Zatim kopirajte integracijski ključ u adresu. Za više informacija posjetite",
     "FlashDuty Severity": "Stupanj ozbiljnosti",
+    "FlashDuty Push URL": "push URL",
     "nostrRelays": "Nostr releji",
     "nostrRelaysHelp": "Jedan URL releja po liniji",
     "nostrSender": "Privatni ključ pošiljatelja (nsec)",

src/lang/hu.json

@@ -554,6 +554,7 @@
     "setupDatabaseSQLite": "Egy egyszerű adatbázisfájl, amely kis méretű telepítésekhez ajánlott. A v2.0.0 előtt az Uptime Kuma az SQLite-ot használta alapértelmezett adatbázisként.",
     "dbName": "Adazbázis neve",
     "FlashDuty Severity": "Súlyosság",
+    "FlashDuty Push URL": "push URL",
     "lunaseaDeviceID": "Eszköz azonosító",
     "lunaseaUserID": "Felhasználó azonosító",
     "successPaused": "Sikeres szüneteltetés.",

src/lang/id-ID.json

@@ -854,6 +854,7 @@
     "Enable Kafka Producer Auto Topic Creation": "Aktifkan Pembuatan Topik Otomatis Produser Kafka",
     "Mechanism": "Mekanisme",
     "FlashDuty Severity": "Severity",
+    "FlashDuty Push URL": "URL Push",
     "nostrRelaysHelp": "Satu URL relai per baris",
     "nostrSender": "Kunci Pribadi Pengirim (ndetik)",
     "nostrRecipients": "Kunci Publik Penerima (npub)",

src/lang/ja.json

@@ -951,6 +951,7 @@
     "Close": "閉じる",
     "Request Body": "リクエストボディ",
     "FlashDuty Severity": "重要度",
+    "FlashDuty Push URL": "プッシュ URL",
     "nostrRelays": "Nostrリレー",
     "nostrRelaysHelp": "1行につき1つのリレーURL",
     "nostrSender": "送信者プライベートキー(nsec)",

src/lang/lt.json

@@ -740,6 +740,7 @@
     "Session Token": "Sesijos prieigos raktas",
     "Request Body": "Užklausos turinys",
     "FlashDuty Severity": "Svarba",
+    "FlashDuty Push URL": "siuntimo URL",
     "nostrRelays": "Nostr tarpininkai",
     "Saved.": "Išsaugota.",
     "authInvalidToken": "Neteisingas prieigos raktas.",

src/lang/nb-NO.json

@@ -551,6 +551,7 @@
     "successDisabled": "Deaktivert.",
     "successEnabled": "Aktivert.",
     "FlashDuty Severity": "Alvorlighet",
+    "FlashDuty Push URL": "Push-URL",
     "apiKey-expired": "Utløpt",
     "confirmUninstallPlugin": "Er du sikker på at du vil avinstallere valgte plugin?",
     "notificationRegional": "Regional",

src/lang/nl-NL.json

@@ -879,6 +879,7 @@
     "Secret AccessKey": "Geheim AccessKey",
     "Session Token": "Sessietoken",
     "FlashDuty Severity": "Hevigheid",
+    "FlashDuty Push URL": "Push URL",
     "nostrRelays": "Nostr relays",
     "nostrRelaysHelp": "Een relay-URL per regel",
     "nostrSender": "Private key van de afzender (nsec)",

src/lang/pl.json

@@ -830,6 +830,7 @@
     "Session Token": "Token sesji",
     "Request Body": "Treść żądania",
     "FlashDuty Severity": "Poziom istotności",
+    "FlashDuty Push URL": "Adres URL push",
     "nostrRelays": "Przekaźniki Nostr",
     "nostrSender": "Prywatny klucz nadawcy (nsec)",
     "Badge Up Color": "Kolor odznaki Online",

src/lang/pt-BR.json

@@ -822,6 +822,7 @@
     "emailTemplateLimitedToUpDownNotification": "disponível apenas para pulsações UP/DOWN, caso contrário, nulo",
     "wayToGetFlashDutyKey": "Você pode ir em Canal -> (Selecionar um Canal) -> Integrações -> Adicionar uma nova integração, adicione um 'Uptime Kuma' para obter um endereço de push, copie a Chave de Integração no endereço. Para mais informações, visite",
     "FlashDuty Severity": "Gravidade",
+    "FlashDuty Push URL": "URL de Push do",
     "templateMsg": "mensagem da notificação",
     "templateHeartbeatJSON": "objeto que descreve o batimento cardíaco",
     "templateMonitorJSON": "objeto que descreve o monitor",

src/lang/ro.json

@@ -881,6 +881,7 @@
     "Secret AccessKey": "AccessKey Secret",
     "Session Token": "Token Sesiune",
     "FlashDuty Severity": "Severitate",
+    "FlashDuty Push URL": "URL Push",
     "nostrRelays": "Relee Nostr",
     "nostrRelaysHelp": "Un URL releu pe linie",
     "nostrSender": "Cheia privată a expeditorului (nsec)",

src/lang/ru-RU.json

@@ -846,6 +846,7 @@
     "nostrRecipients": "Открытые ключи получателей (npub)",
     "nostrRecipientsHelp": "формат npub, по одному в строке",
     "FlashDuty Severity": "Серьёзность",
+    "FlashDuty Push URL": "URL-адреса пуш-повідомлень",
     "nostrRelays": "Реле Nostr",
     "nostrRelaysHelp": "Один URL-адрес ретрансляции в каждой строке",
     "enableNSCD": "Включить NSCD (Name Service Cache Daemon) для кэширования всех DNS-запросов",

src/lang/sv-SE.json

@@ -705,6 +705,7 @@
     "useRemoteBrowser": "Använd en fjärrwebbläsare",
     "Saved.": "Sparad.",
     "FlashDuty Severity": "Allvarlighetsgrad",
+    "FlashDuty Push URL": "Push URL",
     "2faAlreadyEnabled": "2FA är redan aktiverat.",
     "2faEnabled": "2FA aktiverat.",
     "2faDisabled": "2FA inaktiverat.",

src/lang/tr-TR.json

@@ -819,6 +819,7 @@
     "tailscalePingWarning": "Tailscale Ping monitörünü kullanabilmek için Docker olmadan Uptime Kuma kurmanız ve ayrıca sunucunuza Tailscale client kurmanız gerekmektedir.",
     "Server URL should not contain the nfty topic": "Sunucu URL'si nfty konusunu içermemelidir",
     "FlashDuty Severity": "Önem derecesi",
+    "FlashDuty Push URL": "Push URL'si",
     "nostrRelays": "Nostr röleleri",
     "nostrRelaysHelp": "Satır başına bir geçiş URL'si",
     "nostrSender": "Gönderen Özel Anahtarı (nsec)",

src/lang/uk-UA.json

@@ -825,6 +825,7 @@
     "tailscalePingWarning": "Для того, щоб використовувати монітор Tailscale Ping, вам потрібно встановити Uptime Kuma без Docker, а також встановити клієнт Tailscale на вашому сервері.",
     "Server URL should not contain the nfty topic": "URL-адреса сервера не повинна містити тему nfty",
     "FlashDuty Severity": "Серйозність",
+    "FlashDuty Push URL": "URL-адреса пуш-повідомлень",
     "nostrRelays": "Реле Nostr",
     "nostrRelaysHelp": "Одна URL-адреса реле в рядку",
     "nostrSender": "Приватний ключ відправника (nsec)",

src/lang/yue.json

@@ -102,6 +102,7 @@
     "markdownSupported": "可以用 Markdown",
     "wayToGetFlashDutyKey": "您可以进入 协作空间 -> (选择一个 协作空间) -> 集成数据 -> 新增一个集成 页面，添加“自定义事件”获得一个推送地址，复制地址中的 Integration Key，更多信息前往{0}",
     "FlashDuty Severity": "严重程度",
+    "FlashDuty Push URL":"推送地址",
     "setupDatabaseChooseDatabase": "你想用咩資料庫？",
     "dbName": "資料庫名稱",
     "Home": "首頁",

src/lang/zh-CN.json

@@ -831,6 +831,7 @@
     "noOrBadCertificate": "无证书或证书错误",
     "showCertificateExpiry": "显示证书有效期",
     "FlashDuty Severity": "严重程度",
+    "FlashDuty Push URL":"推送地址",
     "Check/Uncheck": "选中/取消选中",
     "pushDeerServerDescription": "留空则使用官方服务器",
     "PushDeer Server": "PushDeer 服务器",

src/lang/zh-HK.json

@@ -889,6 +889,7 @@
     "Request Body": "請求體",
     "wayToGetFlashDutyKey": "您可以進入 協作空間 -> (選擇一個 協作空間) -> 集成數據 -> 新增一個集成 頁面，添加“Uptime Kuma”集成獲得一個推送地址，複製地址中的 Integration Key，更多資訊前往{0}",
     "FlashDuty Severity": "嚴重程度",
+    "FlashDuty Push URL": "推送網址",
     "nostrRelays": "Nostr relay 服務",
     "nostrRelaysHelp": "Relay 服務地址，每行一個",
     "nostrSender": "發送者私鑰（nsec 格式）",

src/lang/zh-TW.json

@@ -881,6 +881,7 @@
     "Badge Label": "徽章標籤",
     "wayToGetFlashDutyKey": "您可以前往「頻道 -> (選擇一個頻道) -> 整合 -> 新增一個新的整合」頁面，新增一個「自訂事件」以取得推送地址，並複製地址中的整合金鑰。欲知更多資訊，請訪問",
     "FlashDuty Severity": "嚴重性",
+    "FlashDuty Push URL": "推送網址",
     "nostrRelays": "Nostr 中繼",
     "nostrRelaysHelp": "每行一個中繼網址",
     "nostrSender": "傳送者私鑰 (nsec)",