Merge pull request #782 from bluewave-labs/feat/indeterminate-state

Add indeterminate state to monitors, resolves #765

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/monitorData.jsx

@@ -48,15 +48,6 @@ export const buildData = (monitors, isAdmin, navigate) => {
         monitor.uptimePercentage === 0
           ? "0"
           : (monitor.uptimePercentage * 100).toFixed(2);
-
-      percentageColor =
-        monitor.uptimePercentage < 0.25
-          ? theme.palette.percentage.uptimePoor
-          : monitor.uptimePercentage < 0.5
-          ? theme.palette.percentage.uptimeFair
-          : monitor.uptimePercentage < 0.75
-          ? theme.palette.percentage.uptimeGood
-          : theme.palette.percentage.uptimeExcellent;
     }
 
     const params = {

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,44 +15,60 @@ class NetworkService {
     this.NETWORK_ERROR = 5000;
   }
 
-  async handleNotification(job, isAlive) {
+  async handleNotification(monitor, 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",
-          service: this.SERVICE_NAME,
-          jobId: job.id,
-        });
-        return;
-      }
+      let template =
+        isAlive === true ? "serverIsUpTemplate" : "serverIsDownTemplate";
+      let status = isAlive === true ? "up" : "down";
 
-      // If monitor status changes, update monitor status and send notification
-      if (monitor.status !== isAlive) {
-        monitor.status = !monitor.status;
-        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}`
-            );
-          }
+      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}`
+          );
         }
       }
     } catch (error) {
       logger.error(error.message, {
         method: "handleNotification",
         service: this.SERVICE_NAME,
+        monitorId: monitor._id,
+      });
+    }
+  }
+
+  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: "handleStatusUpdate",
+          service: this.SERVICE_NAME,
+          jobId: job.id,
+        });
+        return;
+      }
+      if (monitor.status === undefined || monitor.status !== isAlive) {
+        const oldStatus = monitor.status;
+        monitor.status = isAlive;
+        await monitor.save();
+
+        if (oldStatus !== undefined && oldStatus !== isAlive) {
+          this.handleNotification(monitor, isAlive);
+        }
+      }
+    } catch (error) {
+      logger.error(error.message, {
+        method: "handleStatusUpdate",
+        service: this.SERVICE_NAME,
         jobId: job.id,
       });
     }
@@ -113,7 +129,7 @@ class NetworkService {
       };
       return await this.logAndStoreCheck(checkData, this.db.createCheck);
     } finally {
-      this.handleNotification(job, isAlive);
+      this.handleStatusUpdate(job, isAlive);
     }
   }
 
@@ -161,7 +177,7 @@ class NetworkService {
 
       return await this.logAndStoreCheck(checkData, this.db.createCheck);
     } finally {
-      this.handleNotification(job, isAlive);
+      this.handleStatusUpdate(job, isAlive);
     }
   }
 
@@ -241,7 +257,7 @@ class NetworkService {
       };
       this.logAndStoreCheck(checkData, this.db.createPageSpeedCheck);
     } finally {
-      this.handleNotification(job, isAlive);
+      this.handleStatusUpdate(job, isAlive);
     }
   }