Add indeterminate state to monitors

Client/src/Components/Label/index.jsx

@@ -126,6 +126,7 @@ ColoredLabel.propTypes = {
  */
 
 const StatusLabel = ({ status, text, customStyles }) => {
+  console.log(status);
   const theme = useTheme();
   const colors = {
     up: {
@@ -138,6 +139,11 @@ const StatusLabel = ({ status, text, customStyles }) => {
       bgColor: theme.palette.error.bg,
       borderColor: theme.palette.error.light,
     },
+    unknown: {
+      dotColor: theme.palette.unresolved.main,
+      bgColor: theme.palette.unresolved.bg,
+      borderColor: theme.palette.unresolved.light,
+    },
     "cannot resolve": {
       dotColor: theme.palette.unresolved.main,
       bgColor: theme.palette.unresolved.bg,
@@ -170,7 +176,7 @@ const StatusLabel = ({ status, text, customStyles }) => {
 };
 
 StatusLabel.propTypes = {
-  status: PropTypes.oneOf(["up", "down", "cannot resolve"]),
+  status: PropTypes.oneOf(["up", "down", "unknown", "cannot resolve"]),
   text: PropTypes.string,
   customStyles: PropTypes.object,
 };

Client/src/Pages/Monitors/Home/host.jsx

@@ -53,7 +53,8 @@ Host.propTypes = {
   params: PropTypes.shape({
     title: PropTypes.string,
     percentageColor: PropTypes.string,
-    percentage: PropTypes.number,
+    percentage: PropTypes.string,
+    url: PropTypes.string,
   }).isRequired,
 };
 

Client/src/Pages/Monitors/Home/monitorData.jsx

@@ -35,8 +35,8 @@ export const buildData = (monitors, isAdmin, navigate) => {
     if (monitor.uptimePercentage !== undefined) {
       uptimePercentage =
         monitor.uptimePercentage === 0
-          ? "0" 
-          : (monitor.uptimePercentage * 100).toFixed(2); 
+          ? "0"
+          : (monitor.uptimePercentage * 100).toFixed(2);
     }
 
     const params = {
@@ -47,7 +47,12 @@ export const buildData = (monitors, isAdmin, navigate) => {
         monitor.status === true
           ? theme.palette.success.main
           : theme.palette.error.text,
-      status: monitor.status === true ? "up" : "down",
+      status:
+        monitor.status === undefined
+          ? "unknown"
+          : monitor.status === true
+          ? "up"
+          : "down",
     };
 
     // Reverse checks so latest check is on the right
@@ -86,6 +91,3 @@ export const buildData = (monitors, isAdmin, navigate) => {
   });
   return data;
 };
-
-
-

Server/controllers/monitorController.js

@@ -359,6 +359,7 @@ const pauseMonitor = async (req, res, next) => {
       await req.jobQueue.addJob(monitor._id, monitor);
     }
     monitor.isActive = !monitor.isActive;
+    monitor.status = undefined;
     monitor.save();
     return res.status(200).json({
       success: true,

Server/models/Monitor.js

@@ -24,7 +24,7 @@ const MonitorSchema = mongoose.Schema(
     },
     status: {
       type: Boolean,
-      default: true,
+      default: undefined,
     },
     type: {
       type: String,
@@ -46,7 +46,7 @@ const MonitorSchema = mongoose.Schema(
     },
     uptimePercentage: {
       type: Number,
-      default: undefined, 
+      default: undefined,
     },
     notifications: [
       {

Server/service/jobQueue.js

@@ -238,7 +238,6 @@ class JobQueue {
       console.log("Adding job", payload.url);
       // Execute job immediately
       await this.queue.add(jobName, payload);
-
       await this.queue.add(jobName, payload, {
         repeat: {
           every: payload.interval,

Server/service/networkService.js

@@ -15,10 +15,31 @@ class NetworkService {
     this.NETWORK_ERROR = 5000;
   }
 
-  async handleNotification(job, isAlive) {
+  async handleNotification(monitor, isAlive) {
+    let template =
+      isAlive === true ? "serverIsUpTemplate" : "serverIsDownTemplate";
+    let status = isAlive === true ? "up" : "down";
+
+    const notifications = await this.db.getNotificationsByMonitorId(
+      monitor._id
+    );
+    for (const notification of notifications) {
+      if (notification.type === "email") {
+        await this.emailService.buildAndSendEmail(
+          template,
+          { monitorName: monitor.name, monitorUrl: monitor.url },
+          notification.address,
+          `Monitor ${monitor.name} is ${status}`
+        );
+      }
+    }
+  }
+
+  async handleStatusUpdate(job, isAlive) {
     try {
       const { _id } = job.data;
       const monitor = await this.db.getMonitorById(_id);
+
       if (monitor === null || monitor === undefined) {
         logger.error(`Null Monitor: ${_id}`, {
           method: "handleNotification",
@@ -28,25 +49,22 @@ class NetworkService {
         return;
       }
 
-      // If monitor status changes, update monitor status and send notification
-      if (monitor.status !== isAlive) {
-        monitor.status = !monitor.status;
+      // Two general cases:
+      // 1. Monitor status is undefined
+      // 2. Monitor status is defined
+
+      // If the monitor status is undefined, set it's status to isAlive.  if isAlive is false, send notification
+      if (monitor.status === undefined) {
+        monitor.status = isAlive;
         await monitor.save();
-
-        let template =
-          isAlive === true ? "serverIsUpTemplate" : "serverIsDownTemplate";
-        let status = isAlive === true ? "up" : "down";
-
-        const notifications = await this.db.getNotificationsByMonitorId(_id);
-        for (const notification of notifications) {
-          if (notification.type === "email") {
-            await this.emailService.buildAndSendEmail(
-              template,
-              { monitorName: monitor.name, monitorUrl: monitor.url },
-              notification.address,
-              `Monitor ${monitor.name} is ${status}`
-            );
-          }
+        if (isAlive === false) {
+          this.handleNotification(monitor, isAlive);
+        }
+      } else {
+        if (monitor.status !== isAlive) {
+          monitor.status = !monitor.status;
+          await monitor.save();
+          this.handleNotification(monitor, isAlive);
         }
       }
     } catch (error) {
@@ -113,7 +131,7 @@ class NetworkService {
       };
       return await this.logAndStoreCheck(checkData, this.db.createCheck);
     } finally {
-      this.handleNotification(job, isAlive);
+      this.handleStatusUpdate(job, isAlive);
     }
   }
 
@@ -161,7 +179,7 @@ class NetworkService {
 
       return await this.logAndStoreCheck(checkData, this.db.createCheck);
     } finally {
-      this.handleNotification(job, isAlive);
+      this.handleStatusUpdate(job, isAlive);
     }
   }
 
@@ -241,7 +259,7 @@ class NetworkService {
       };
       this.logAndStoreCheck(checkData, this.db.createPageSpeedCheck);
     } finally {
-      this.handleNotification(job, isAlive);
+      this.handleStatusUpdate(job, isAlive);
     }
   }