Merge 9977dd2246 into d2f71d11d6

server/notification-providers/serverchan.js

@@ -12,8 +12,9 @@ class ServerChan extends NotificationProvider {
         const okMsg = "Sent Successfully.";
 
         // serverchan3 requires sending via ft07.com
-        const url = String(notification.serverChanSendKey).startsWith("sctp")
-            ? `https://${notification.serverChanSendKey}.push.ft07.com/send`
+        const matchResult = String(notification.serverChanSendKey).match(/^sctp(\d+)t/i);
+        const url = matchResult && matchResult[1]
+            ? `https://${matchResult[1]}.push.ft07.com/send/${notification.serverChanSendKey}.send`
             : `https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`;
 
         try {

src/lang/en.json

@@ -962,6 +962,8 @@
     "cellsyntSplitLongMessages": "Split long messages into up to 6 parts. 153 x 6 = 918 characters.",
     "max 15 digits": "max 15 digits",
     "max 11 alphanumeric characters": "max 11 alphanumeric characters",
+    "offlineMonitor": "Offline Monitor",
+    "offlineMonitors": "Offline Monitors",
     "Community String": "Community String",
     "snmpCommunityStringHelptext": "This string functions as a password to authenticate and control access to SNMP-enabled devices. Match it with your SNMP device's configuration.",
     "OID (Object Identifier)": "OID (Object Identifier)",

src/pages/StatusPage.vue

@@ -322,6 +322,30 @@
                 </div>
             </div>
 
+            <div v-if="$root.downMonitors?.length > 0" class="mb-4">
+                <div class="mb-5">
+                    <h2 class="group-title">
+                        {{ $t($root.downMonitors.length === 1 ? "offlineMonitor" : "offlineMonitors") }}
+                    </h2>
+
+                    <div class="shadow-box monitor-list mt-4 position-relative">
+                        <div v-for="monitor in $root.downMonitors" :key="monitor.id" class="item">
+                            <div class="row">
+                                <div class="col-9 col-md-8 small-padding">
+                                    <div class="info">
+                                        <Uptime :monitor="monitor" type="24" :pill="true" />
+                                        {{ monitor.name }}
+                                    </div>
+                                </div>
+                                <div :key="$root.userHeartbeatBar" class="col-3 col-md-4">
+                                    <HeartbeatBar size="mid" :monitor-id="monitor.id" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="mb-4">
                 <div v-if="$root.publicGroupList.length === 0 && loadedData" class="text-center">
                     <!-- 👀 Nothing here, please add a group or a monitor. -->
@@ -383,6 +407,8 @@ import { getResBaseURL } from "../util-frontend";
 import { STATUS_PAGE_ALL_DOWN, STATUS_PAGE_ALL_UP, STATUS_PAGE_MAINTENANCE, STATUS_PAGE_PARTIAL_DOWN, UP, MAINTENANCE } from "../util.ts";
 import Tag from "../components/Tag.vue";
 import VueMultiselect from "vue-multiselect";
+import Uptime from "../components/Uptime.vue";
+import HeartbeatBar from "../components/HeartbeatBar.vue";
 
 const toast = useToast();
 dayjs.extend(duration);
@@ -399,6 +425,8 @@ const favicon = new Favico({
 export default {
 
     components: {
+        HeartbeatBar,
+        Uptime,
         PublicGroupList,
         ImageCropUpload,
         Confirm,
@@ -777,6 +805,8 @@ export default {
                     this.$root.heartbeatList = heartbeatList;
                     this.$root.uptimeList = uptimeList;
 
+                    this.$root.downMonitors = this.downMonitors();
+
                     const heartbeatIds = Object.keys(heartbeatList);
                     const downMonitors = heartbeatIds.reduce((downMonitorsAmount, currentId) => {
                         const monitorHeartbeats = heartbeatList[currentId];
@@ -798,6 +828,22 @@ export default {
             }
         },
 
+        downMonitors() {
+            let result = [];
+
+            for (const id in this.$root.publicMonitorList) {
+                const monitor = this.$root.publicMonitorList[id];
+                const heartbeats = this.$root.heartbeatList[monitor.id];
+                const lastHeartbeat = heartbeats.at(-1);
+                if (!lastHeartbeat || lastHeartbeat.status !== 0) {
+                    continue;
+                }
+                result.push(monitor);
+            }
+
+            return result;
+        },
+
         /**
          * Setup timer to display countdown to refresh
          * @returns {void}