From f32fcb204f9737d26ee15804e29b0aaf0363026d Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Wed, 8 Mar 2023 22:21:24 +0800
Subject: [PATCH 01/11] Fix: Check for notified days smaller than target

---
 server/model/monitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 312ac732b..2c25978e0 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -1233,7 +1233,7 @@ class Monitor extends BeanModel {
 
         if (notificationList.length > 0) {
 
-            let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days = ?", [
+            let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [
                 "certificate",
                 this.id,
                 targetDays,

From 6dfca0c16354431589f99d3fd312364c47ee4c18 Mon Sep 17 00:00:00 2001
From: "niclas.koegl" <niclas.koegl@westwing.de>
Date: Tue, 21 Mar 2023 18:07:19 +0100
Subject: [PATCH 02/11] Add Opsgenie notification provider

---
 server/notification-providers/opsgenie.js | 97 +++++++++++++++++++++++
 server/notification.js                    |  2 +
 src/components/notifications/Opsgenie.vue | 24 ++++++
 src/components/notifications/index.js     |  2 +
 4 files changed, 125 insertions(+)
 create mode 100644 server/notification-providers/opsgenie.js
 create mode 100644 src/components/notifications/Opsgenie.vue

diff --git a/server/notification-providers/opsgenie.js b/server/notification-providers/opsgenie.js
new file mode 100644
index 000000000..3ccbb756c
--- /dev/null
+++ b/server/notification-providers/opsgenie.js
@@ -0,0 +1,97 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { UP, DOWN } = require("../../src/util");
+
+const opsgenieAlertsUrlEU = "https://api.eu.opsgenie.com/v2/alerts"
+const opsgenieAlertsUrlUS = "https://api.opsgenie.com/v2/alerts"
+let okMsg = "Sent Successfully.";
+
+class Opsgenie extends NotificationProvider {
+    
+    name = "Opsgenie";
+    
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let opsgenieAlertsUrl;
+        let priority = (notification.opsgeniePriority == "") ? 3 : notification.opsgeniePriority;
+        const textMsg = "Uptime Kuma Alert";
+ 
+        try {
+            switch (notification.opsgenieRegion) {
+                case "US":
+                    opsgenieAlertsUrl = opsgenieAlertsUrlUS;
+                    break;
+                case "EU":
+                    opsgenieAlertsUrl = opsgenieAlertsUrlEU;
+                    break;
+                default:
+                    opsgenieAlertsUrl = opsgenieAlertsUrlUS;
+            };
+
+            if (heartbeatJSON == null) {
+                let notificationTestAlias = "uptime-kuma-notification-test";
+                let data = {
+                    "message": msg,
+                    "alias": notificationTestAlias,
+                    "source": "Uptime Kuma",
+                    "priority": "P5"
+                };
+                
+                return this.post(notification, opsgenieAlertsUrl, data)
+            };
+
+            if (heartbeatJSON.status === DOWN) {
+                let data = {    
+                    "message": monitorJSON ? textMsg + `: ${monitorJSON.name}` : textMsg,
+                    "alias": monitorJSON.name,
+                    "description": msg,
+                    "source": "Uptime Kuma",
+                    "priority": `P${priority}`
+                };
+
+                return this.post(notification, opsgenieAlertsUrl, data)
+            };
+
+            if (heartbeatJSON.status === UP) {
+                let opsgenieAlertsCloseUrl = `${opsgenieAlertsUrl}/${encodeURIComponent(monitorJSON.name)}/close?identifierType=alias`;
+                let data = {    
+                    "source": "Uptime Kuma",
+                };
+
+                return this.post(notification, opsgenieAlertsCloseUrl, data)
+            };
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+
+    /**
+     * 
+     * @param {BeanModel} notification
+     * @param {string} url Request url
+     * @param {Object} data Request body
+     * @returns {Promise<string>}
+     */
+    async post(notification, url, data) {
+        let config = {
+            headers: {
+                "Content-Type": "application/json",
+                "Authorization": `GenieKey ${notification.opsgenieApiKey}`,
+            }
+        };
+
+        let res = await axios.post(url, data, config);
+        if (res.status == null) {
+            return "Opsgenie notification failed with invalid response!";
+        };
+        if (res.status < 200 || res.status >= 300) {
+            return `Opsgenie notification failed with status code ${res.status}`;
+        };
+
+        return okMsg
+    }
+}
+
+module.exports = Opsgenie;
diff --git a/server/notification.js b/server/notification.js
index ad1c8705a..2ec2c752f 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -20,6 +20,7 @@ const Mattermost = require("./notification-providers/mattermost");
 const Ntfy = require("./notification-providers/ntfy");
 const Octopush = require("./notification-providers/octopush");
 const OneBot = require("./notification-providers/onebot");
+const Opsgenie = require("./notification-providers/opsgenie");
 const PagerDuty = require("./notification-providers/pagerduty");
 const PromoSMS = require("./notification-providers/promosms");
 const Pushbullet = require("./notification-providers/pushbullet");
@@ -69,6 +70,7 @@ class Notification {
             new Ntfy(),
             new Octopush(),
             new OneBot(),
+			new Opsgenie(),
             new PagerDuty(),
             new PromoSMS(),
             new Pushbullet(),
diff --git a/src/components/notifications/Opsgenie.vue b/src/components/notifications/Opsgenie.vue
new file mode 100644
index 000000000..6cdfa2a95
--- /dev/null
+++ b/src/components/notifications/Opsgenie.vue
@@ -0,0 +1,24 @@
+<template>
+    <div class="mb-3">
+        <label for="opsgenie-region" class="form-label">{{ $t("Region") }}<span style="color: red;"><sup>*</sup></span></label>
+        <select id="opsgenie-region" v-model="$parent.notification.opsgenieRegion" class="form-select" required>
+            <option value="us">
+                US (Default)
+            </option>
+            <option value="eu">
+                EU
+            </option>
+        </select>
+        <label for="opsgenie-apikey" class="form-label">{{ $t("API Key") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="opsgenie-apikey" v-model="$parent.notification.opsgenieApiKey" type="text" class="form-control" required>
+        <label for="opsgenie-priority" class="form-label">{{ $t("Priority") }}</label>
+        <input id="opsgenie-priority" v-model="$parent.notification.opsgeniePriority" type="number" class="form-control" min="1" max="5" step="1">
+
+        <div class="form-text">
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://docs.opsgenie.com/docs/alert-api" target="_blank">https://docs.opsgenie.com/docs/alert-api</a>
+            </i18n-t>
+        </div>
+    </div>
+</template>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index c1b7da4aa..36dac993e 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -18,6 +18,7 @@ import Mattermost from "./Mattermost.vue";
 import Ntfy from "./Ntfy.vue";
 import Octopush from "./Octopush.vue";
 import OneBot from "./OneBot.vue";
+import Opsgenie from "./Opsgenie.vue";
 import PagerDuty from "./PagerDuty.vue";
 import PromoSMS from "./PromoSMS.vue";
 import Pushbullet from "./Pushbullet.vue";
@@ -62,6 +63,7 @@ const NotificationFormList = {
     "ntfy": Ntfy,
     "octopush": Octopush,
     "OneBot": OneBot,
+    "Opsgenie": Opsgenie,
     "PagerDuty": PagerDuty,
     "promosms": PromoSMS,
     "pushbullet": Pushbullet,

From 776a482a1d8515dc0c1ada22d558c01e76c816b4 Mon Sep 17 00:00:00 2001
From: "niclas.koegl" <niclas.koegl@westwing.de>
Date: Tue, 21 Mar 2023 19:29:37 +0100
Subject: [PATCH 03/11] Add Opsgenie notification provider

---
 src/components/NotificationDialog.vue     |  1 +
 src/components/notifications/Opsgenie.vue | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index c3851b568..ce38c90ea 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -129,6 +129,7 @@ export default {
                 "ntfy": "Ntfy",
                 "octopush": "Octopush",
                 "OneBot": "OneBot",
+                "Opsgenie": "Opsgenie",
                 "PagerDuty": "PagerDuty",
                 "pushbullet": "Pushbullet",
                 "PushByTechulus": "Push by Techulus",
diff --git a/src/components/notifications/Opsgenie.vue b/src/components/notifications/Opsgenie.vue
index 6cdfa2a95..3dc96bc87 100644
--- a/src/components/notifications/Opsgenie.vue
+++ b/src/components/notifications/Opsgenie.vue
@@ -9,16 +9,28 @@
                 EU
             </option>
         </select>
+    </div>
+    <div class="mb-3">
         <label for="opsgenie-apikey" class="form-label">{{ $t("API Key") }}<span style="color: red;"><sup>*</sup></span></label>
-        <input id="opsgenie-apikey" v-model="$parent.notification.opsgenieApiKey" type="text" class="form-control" required>
+        <HiddenInput id="opsgenie-apikey" v-model="$parent.notification.opsgenieApiKey" required="true" autocomplete="false"></HiddenInput>
+    </div>
+    <div class="mb-3">
         <label for="opsgenie-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="opsgenie-priority" v-model="$parent.notification.opsgeniePriority" type="number" class="form-control" min="1" max="5" step="1">
-
+    </div>
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
             <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
                 <a href="https://docs.opsgenie.com/docs/alert-api" target="_blank">https://docs.opsgenie.com/docs/alert-api</a>
             </i18n-t>
         </div>
-    </div>
 </template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>

From d9558833fcf12a89061602b537e9c3641dd6a95b Mon Sep 17 00:00:00 2001
From: "niclas.koegl" <niclas.koegl@westwing.de>
Date: Tue, 21 Mar 2023 19:45:44 +0100
Subject: [PATCH 04/11] Fix linting

---
 server/notification-providers/opsgenie.js | 38 +++++++++++------------
 server/notification.js                    |  2 +-
 src/components/notifications/Opsgenie.vue | 12 +++----
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/server/notification-providers/opsgenie.js b/server/notification-providers/opsgenie.js
index 3ccbb756c..16bf9fc60 100644
--- a/server/notification-providers/opsgenie.js
+++ b/server/notification-providers/opsgenie.js
@@ -2,14 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 const { UP, DOWN } = require("../../src/util");
 
-const opsgenieAlertsUrlEU = "https://api.eu.opsgenie.com/v2/alerts"
-const opsgenieAlertsUrlUS = "https://api.opsgenie.com/v2/alerts"
+const opsgenieAlertsUrlEU = "https://api.eu.opsgenie.com/v2/alerts";
+const opsgenieAlertsUrlUS = "https://api.opsgenie.com/v2/alerts";
 let okMsg = "Sent Successfully.";
 
 class Opsgenie extends NotificationProvider {
-    
+
     name = "Opsgenie";
-    
+
     /**
      * @inheritdoc
      */
@@ -17,7 +17,7 @@ class Opsgenie extends NotificationProvider {
         let opsgenieAlertsUrl;
         let priority = (notification.opsgeniePriority == "") ? 3 : notification.opsgeniePriority;
         const textMsg = "Uptime Kuma Alert";
- 
+
         try {
             switch (notification.opsgenieRegion) {
                 case "US":
@@ -28,7 +28,7 @@ class Opsgenie extends NotificationProvider {
                     break;
                 default:
                     opsgenieAlertsUrl = opsgenieAlertsUrlUS;
-            };
+            }
 
             if (heartbeatJSON == null) {
                 let notificationTestAlias = "uptime-kuma-notification-test";
@@ -38,12 +38,12 @@ class Opsgenie extends NotificationProvider {
                     "source": "Uptime Kuma",
                     "priority": "P5"
                 };
-                
-                return this.post(notification, opsgenieAlertsUrl, data)
-            };
+
+                return this.post(notification, opsgenieAlertsUrl, data);
+            }
 
             if (heartbeatJSON.status === DOWN) {
-                let data = {    
+                let data = {
                     "message": monitorJSON ? textMsg + `: ${monitorJSON.name}` : textMsg,
                     "alias": monitorJSON.name,
                     "description": msg,
@@ -51,24 +51,24 @@ class Opsgenie extends NotificationProvider {
                     "priority": `P${priority}`
                 };
 
-                return this.post(notification, opsgenieAlertsUrl, data)
-            };
+                return this.post(notification, opsgenieAlertsUrl, data);
+            }
 
             if (heartbeatJSON.status === UP) {
                 let opsgenieAlertsCloseUrl = `${opsgenieAlertsUrl}/${encodeURIComponent(monitorJSON.name)}/close?identifierType=alias`;
-                let data = {    
+                let data = {
                     "source": "Uptime Kuma",
                 };
 
-                return this.post(notification, opsgenieAlertsCloseUrl, data)
-            };
+                return this.post(notification, opsgenieAlertsCloseUrl, data);
+            }
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }
     }
 
     /**
-     * 
+     *
      * @param {BeanModel} notification
      * @param {string} url Request url
      * @param {Object} data Request body
@@ -85,12 +85,12 @@ class Opsgenie extends NotificationProvider {
         let res = await axios.post(url, data, config);
         if (res.status == null) {
             return "Opsgenie notification failed with invalid response!";
-        };
+        }
         if (res.status < 200 || res.status >= 300) {
             return `Opsgenie notification failed with status code ${res.status}`;
-        };
+        }
 
-        return okMsg
+        return okMsg;
     }
 }
 
diff --git a/server/notification.js b/server/notification.js
index 5d110f215..f69e0a384 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -84,7 +84,7 @@ class Notification {
             new Ntfy(),
             new Octopush(),
             new OneBot(),
-			new Opsgenie(),
+            new Opsgenie(),
             new PagerDuty(),
             new PagerTree(),
             new PromoSMS(),
diff --git a/src/components/notifications/Opsgenie.vue b/src/components/notifications/Opsgenie.vue
index 3dc96bc87..3f07d0528 100644
--- a/src/components/notifications/Opsgenie.vue
+++ b/src/components/notifications/Opsgenie.vue
@@ -18,12 +18,12 @@
         <label for="opsgenie-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="opsgenie-priority" v-model="$parent.notification.opsgeniePriority" type="number" class="form-control" min="1" max="5" step="1">
     </div>
-        <div class="form-text">
-            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
-            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
-                <a href="https://docs.opsgenie.com/docs/alert-api" target="_blank">https://docs.opsgenie.com/docs/alert-api</a>
-            </i18n-t>
-        </div>
+    <div class="form-text">
+        <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+        <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+            <a href="https://docs.opsgenie.com/docs/alert-api" target="_blank">https://docs.opsgenie.com/docs/alert-api</a>
+        </i18n-t>
+    </div>
 </template>
 
 <script>

From bf525371d9669bf62faf3ec2521bc69f52129902 Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Fri, 24 Mar 2023 22:42:50 +0800
Subject: [PATCH 05/11] Fix: Apply toPrecision as last step

---
 server/routers/api-router.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index a36159cae..d2b32600b 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -224,7 +224,7 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
             );
 
             // limit the displayed uptime percentage to four (two, when displayed as percent) decimal digits
-            const cleanUptime = parseFloat(uptime.toPrecision(4));
+            const cleanUptime = (uptime * 100).toPrecision(4);
 
             // use a given, custom color or calculate one based on the uptime value
             badgeValues.color = color ?? percentageToColor(uptime);
@@ -235,7 +235,7 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
                 labelPrefix,
                 label ?? `Uptime (${requestedDuration}${labelSuffix})`,
             ]);
-            badgeValues.message = filterAndJoin([ prefix, `${cleanUptime * 100}`, suffix ]);
+            badgeValues.message = filterAndJoin([ prefix, cleanUptime, suffix ]);
         }
 
         // build the SVG based on given values

From 4f05912276e106cc9e708e230a8313b51c3cd1ee Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Sat, 25 Mar 2023 02:44:15 +0800
Subject: [PATCH 06/11] Fix: Allow status badge with empty label

---
 server/routers/api-router.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index a36159cae..84c3d3f38 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -147,7 +147,11 @@ router.get("/api/badge/:id/status", cache("5 minutes"), async (request, response
             const heartbeat = await Monitor.getPreviousHeartbeat(requestedMonitorId);
             const state = overrideValue !== undefined ? overrideValue : heartbeat.status;
 
-            badgeValues.label = label ?? "Status";
+            if (label === undefined) {
+                badgeValues.label = "Status";
+            } else {
+                badgeValues.label = label;
+            }
             switch (state) {
                 case DOWN:
                     badgeValues.color = downColor;

From 86579d245f169c2b0ddc6ce254d048666b95ca2f Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 25 Mar 2023 23:06:23 +0800
Subject: [PATCH 07/11] Update ask-for-help.yaml

---
 .github/ISSUE_TEMPLATE/ask-for-help.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/ask-for-help.yaml b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
index 3442e8b73..fe9339af8 100644
--- a/.github/ISSUE_TEMPLATE/ask-for-help.yaml
+++ b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
@@ -26,6 +26,13 @@ body:
       label: "📝 Describe your problem"
       description: "Please walk us through it step by step."
       placeholder: "Describe what are you asking for..."
+  - type: textarea
+    id: error-msg
+    validations:
+      required: true
+    attributes:
+      label: "📝 Error Message(s) or Log"
+      placeholder: ""
   - type: input
     id: uptime-kuma-version
     attributes:

From 5266e713e61bfd67c2c46a8f34fc8165562d581b Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 25 Mar 2023 23:06:51 +0800
Subject: [PATCH 08/11] Update ask-for-help.yaml

---
 .github/ISSUE_TEMPLATE/ask-for-help.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/ask-for-help.yaml b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
index fe9339af8..9c30b2dc8 100644
--- a/.github/ISSUE_TEMPLATE/ask-for-help.yaml
+++ b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
@@ -29,10 +29,9 @@ body:
   - type: textarea
     id: error-msg
     validations:
-      required: true
+      required: false
     attributes:
       label: "📝 Error Message(s) or Log"
-      placeholder: ""
   - type: input
     id: uptime-kuma-version
     attributes:

From b64c835ceed723960b90c81b33141164bd1405bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Faruk=20Gen=C3=A7?= <omer@farukgenc.com>
Date: Sat, 25 Mar 2023 19:56:01 +0300
Subject: [PATCH 09/11] Add Twilio Sms Notification Provider

---
 server/notification-providers/twilio.js | 41 +++++++++++++++++++++++++
 server/notification.js                  |  2 ++
 src/components/NotificationDialog.vue   |  1 +
 src/components/notifications/Twilio.vue | 27 ++++++++++++++++
 src/components/notifications/index.js   |  2 ++
 src/lang/en.json                        |  6 +++-
 6 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 server/notification-providers/twilio.js
 create mode 100644 src/components/notifications/Twilio.vue

diff --git a/server/notification-providers/twilio.js b/server/notification-providers/twilio.js
new file mode 100644
index 000000000..8f4db0404
--- /dev/null
+++ b/server/notification-providers/twilio.js
@@ -0,0 +1,41 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class Twilio extends NotificationProvider {
+
+    name = "twilio";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+
+        let okMsg = "Sent Successfully.";
+
+        let accountSID = notification.twilioAccountSID;
+        let authToken = notification.twilioAuthToken;
+
+        try {
+
+            let config = {
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded;charset=utf-8",
+                    "Authorization": "Basic " + Buffer.from(accountSID + ":" + authToken).toString("base64"),
+                }
+            };
+
+            let data = new URLSearchParams();
+            data.append("To", notification.twilioToNumber);
+            data.append("From", notification.twilioFromNumber);
+            data.append("Body", msg);
+
+            let url = "https://api.twilio.com/2010-04-01/Accounts/" + accountSID + "/Messages.json";
+
+            await axios.post(url, data, config);
+
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+
+}
+
+module.exports = Twilio;
diff --git a/server/notification.js b/server/notification.js
index 1897f5cc0..68f675e94 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -41,6 +41,7 @@ const Stackfield = require("./notification-providers/stackfield");
 const Teams = require("./notification-providers/teams");
 const TechulusPush = require("./notification-providers/techulus-push");
 const Telegram = require("./notification-providers/telegram");
+const Twilio = require("./notification-providers/twilio");
 const Splunk = require("./notification-providers/splunk");
 const Webhook = require("./notification-providers/webhook");
 const WeCom = require("./notification-providers/wecom");
@@ -103,6 +104,7 @@ class Notification {
             new Teams(),
             new TechulusPush(),
             new Telegram(),
+            new Twilio(),
             new Splunk(),
             new Webhook(),
             new WeCom(),
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index c3851b568..557e75fc4 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -143,6 +143,7 @@ export default {
                 "stackfield": "Stackfield",
                 "teams": "Microsoft Teams",
                 "telegram": "Telegram",
+                "twilio": "Twilio",
                 "Splunk": "Splunk",
                 "webhook": "Webhook",
                 "GoAlert": "GoAlert",
diff --git a/src/components/notifications/Twilio.vue b/src/components/notifications/Twilio.vue
new file mode 100644
index 000000000..3edf1e3df
--- /dev/null
+++ b/src/components/notifications/Twilio.vue
@@ -0,0 +1,27 @@
+<template>
+    <div class="mb-3">
+        <label for="twilio-account-sid" class="form-label">{{ $t("Account SID") }}</label>
+        <input id="twilio-account-sid" v-model="$parent.notification.twilioAccountSID" type="text" class="form-control" required>
+    </div>
+
+    <div class="mb-3">
+        <label for="twilio-auth-token" class="form-label">{{ $t("Auth Token") }}</label>
+        <input id="twilio-auth-token" v-model="$parent.notification.twilioAuthToken" type="text" class="form-control" required>
+    </div>
+
+    <div class="mb-3">
+        <label for="twilio-from-number" class="form-label">{{ $t("From Number") }}</label>
+        <input id="twilio-from-number" v-model="$parent.notification.twilioFromNumber" type="text" class="form-control" required>
+    </div>
+
+    <div class="mb-3">
+        <label for="twilio-to-number" class="form-label">{{ $t("To Number") }}</label>
+        <input id="twilio-to-number" v-model="$parent.notification.twilioToNumber" type="text" class="form-control" required>
+    </div>
+
+    <div class="mb-3">
+        <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+            <a href="https://www.twilio.com/docs/sms" target="_blank">https://www.twilio.com/docs/sms</a>
+        </i18n-t>
+    </div>
+</template>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index ed9dde0f1..8017b622e 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -41,6 +41,7 @@ import STMP from "./SMTP.vue";
 import Teams from "./Teams.vue";
 import TechulusPush from "./TechulusPush.vue";
 import Telegram from "./Telegram.vue";
+import Twilio from "./Twilio.vue";
 import Webhook from "./Webhook.vue";
 import WeCom from "./WeCom.vue";
 import GoAlert from "./GoAlert.vue";
@@ -95,6 +96,7 @@ const NotificationFormList = {
     "stackfield": Stackfield,
     "teams": Teams,
     "telegram": Telegram,
+    "twilio": Twilio,
     "Splunk": Splunk,
     "webhook": Webhook,
     "WeCom": WeCom,
diff --git a/src/lang/en.json b/src/lang/en.json
index 0c9fc3840..e7656c474 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -707,5 +707,9 @@
     "wayToGetPagerTreeIntegrationURL": "After creating the Uptime Kuma integration in PagerTree, copy the Endpoint. See full details {0}",
     "lunaseaTarget": "Target",
     "lunaseaDeviceID": "Device ID",
-    "lunaseaUserID": "User ID"
+    "lunaseaUserID": "User ID",
+    "twilioAccountSID": "Account SID",
+    "twilioAuthToken": "Auth Token",
+    "twilioFromNumber": "From Number",
+    "twilioToNumber": "To Number"
 }

From e687698851ab76f393724670f3fb688a5ddce263 Mon Sep 17 00:00:00 2001
From: grantbirki <grantbirki@github.com>
Date: Sun, 26 Mar 2023 22:34:25 +0100
Subject: [PATCH 10/11] add json / yaml validate job

---
 .github/workflows/json-yaml-validate.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/json-yaml-validate.yml

diff --git a/.github/workflows/json-yaml-validate.yml b/.github/workflows/json-yaml-validate.yml
new file mode 100644
index 000000000..fc1bf6eed
--- /dev/null
+++ b/.github/workflows/json-yaml-validate.yml
@@ -0,0 +1,23 @@
+name: json-yaml-validate 
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write # enable write permissions for pull request comments
+
+jobs:
+  json-yaml-validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: json-yaml-validate
+        id: json-yaml-validate
+        uses: GrantBirki/json-yaml-validate@v1.2.0
+        with:
+          comment: "true" # enable comment mode

From 27b089572204a0b0bdd86c9f112540375d0a288f Mon Sep 17 00:00:00 2001
From: grantbirki <grantbirki@github.com>
Date: Sun, 26 Mar 2023 22:35:00 +0100
Subject: [PATCH 11/11] fix branch names

---
 .github/workflows/json-yaml-validate.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/json-yaml-validate.yml b/.github/workflows/json-yaml-validate.yml
index fc1bf6eed..4e8f29650 100644
--- a/.github/workflows/json-yaml-validate.yml
+++ b/.github/workflows/json-yaml-validate.yml
@@ -2,8 +2,10 @@ name: json-yaml-validate
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
+    branches:
+      - master
   workflow_dispatch:
 
 permissions: