From 654b9d2038a8588f90503c22a72d1b9680fac1d8 Mon Sep 17 00:00:00 2001 From: M M Date: Sat, 31 Aug 2024 17:58:23 -0700 Subject: [PATCH 1/6] Add real percentages for the uptime of monitors to the main dashboard. --- Server/db/mongo/modules/checkModule.js | 20 ++++++++++++++++++++ Server/models/Monitor.js | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js index 7736ca3c1..9f5a68c1e 100644 --- a/Server/db/mongo/modules/checkModule.js +++ b/Server/db/mongo/modules/checkModule.js @@ -22,7 +22,27 @@ const dateRangeLookup = { const createCheck = async (checkData) => { try { + const { monitorId, status } = checkData; + const check = await new Check({ ...checkData }).save(); + + const n = await Check.countDocuments({ monitorId }) + 1; + + const monitor = await Monitor.findById(monitorId); + + if (!monitor) { + throw new Error("Monitor not found"); + } + + if (monitor.uptimePercentage === undefined) { + monitor.uptimePercentage = status ? 100 : 0; + } else { + monitor.uptimePercentage = + (monitor.uptimePercentage * (n - 1) + (status ? 100 : 0)) / n; + } + + await monitor.save(); + return check; } catch (error) { throw error; diff --git a/Server/models/Monitor.js b/Server/models/Monitor.js index ee4eb890d..fdc147d1b 100644 --- a/Server/models/Monitor.js +++ b/Server/models/Monitor.js @@ -44,6 +44,10 @@ const MonitorSchema = mongoose.Schema( type: Number, default: 60000, }, + uptimePercentage: { + type: Number, + default: undefined, + }, notifications: [ { type: mongoose.Schema.Types.ObjectId, From 01fdf7983f0081c71be55c43b8708fb047480b32 Mon Sep 17 00:00:00 2001 From: M M Date: Sat, 31 Aug 2024 17:59:25 -0700 Subject: [PATCH 2/6] Add frontend file to display the data. --- Client/src/Pages/Monitors/Home/monitorData.jsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Client/src/Pages/Monitors/Home/monitorData.jsx b/Client/src/Pages/Monitors/Home/monitorData.jsx index c82a1fa95..e4428e5e6 100644 --- a/Client/src/Pages/Monitors/Home/monitorData.jsx +++ b/Client/src/Pages/Monitors/Home/monitorData.jsx @@ -31,10 +31,18 @@ export const buildData = (monitors, isAdmin, navigate) => { const theme = useTheme(); data.rows = monitors.map((monitor, idx) => { + let uptimePercentage = ""; + if (monitor.uptimePercentage !== undefined) { + uptimePercentage = + monitor.uptimePercentage === 0 + ? "0" + : monitor.uptimePercentage.toFixed(2); + } + const params = { url: monitor.url, title: monitor.name, - percentage: 100, + percentage: uptimePercentage, percentageColor: monitor.status === true ? theme.palette.success.main @@ -78,3 +86,6 @@ export const buildData = (monitors, isAdmin, navigate) => { }); return data; }; + + + From 7866936d3ac2c99e9d042a6446f8bbe75ff57804 Mon Sep 17 00:00:00 2001 From: M M Date: Sat, 31 Aug 2024 19:59:27 -0700 Subject: [PATCH 3/6] Store the percentage as a 0 and 1 instead of 0 - 100 for future calculations. --- Server/db/mongo/modules/checkModule.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js index 9f5a68c1e..4f5aa5398 100644 --- a/Server/db/mongo/modules/checkModule.js +++ b/Server/db/mongo/modules/checkModule.js @@ -35,10 +35,10 @@ const createCheck = async (checkData) => { } if (monitor.uptimePercentage === undefined) { - monitor.uptimePercentage = status ? 100 : 0; + monitor.uptimePercentage = status ? 1 : 0; } else { monitor.uptimePercentage = - (monitor.uptimePercentage * (n - 1) + (status ? 100 : 0)) / n; + (monitor.uptimePercentage * (n - 1) + (status ? 1: 0)) / n; } await monitor.save(); From 44fd1f8898148bbaf151ff8103d88f4af9b09929 Mon Sep 17 00:00:00 2001 From: M M Date: Sat, 31 Aug 2024 20:13:34 -0700 Subject: [PATCH 4/6] Use more strict comparison operators. --- Server/db/mongo/modules/checkModule.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js index 4f5aa5398..e8ef138e7 100644 --- a/Server/db/mongo/modules/checkModule.js +++ b/Server/db/mongo/modules/checkModule.js @@ -35,10 +35,10 @@ const createCheck = async (checkData) => { } if (monitor.uptimePercentage === undefined) { - monitor.uptimePercentage = status ? 1 : 0; + monitor.uptimePercentage = (status === true) ? 1 : 0; } else { monitor.uptimePercentage = - (monitor.uptimePercentage * (n - 1) + (status ? 1: 0)) / n; + (monitor.uptimePercentage * (n - 1) + (status === true ? 1: 0)) / n; } await monitor.save(); From 8f58b6e4380348f15f374f8d96047b3f5196aa6d Mon Sep 17 00:00:00 2001 From: M M Date: Sat, 31 Aug 2024 22:46:28 -0700 Subject: [PATCH 5/6] Fix logic to get accurate results. --- Server/db/mongo/modules/checkModule.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js index e8ef138e7..32968431d 100644 --- a/Server/db/mongo/modules/checkModule.js +++ b/Server/db/mongo/modules/checkModule.js @@ -24,10 +24,10 @@ const createCheck = async (checkData) => { try { const { monitorId, status } = checkData; - const check = await new Check({ ...checkData }).save(); - const n = await Check.countDocuments({ monitorId }) + 1; + const check = await new Check({ ...checkData }).save(); + const monitor = await Monitor.findById(monitorId); if (!monitor) { From 128a48d666e599ed162fcc67710bdbca3f163d70 Mon Sep 17 00:00:00 2001 From: M M Date: Sat, 31 Aug 2024 22:56:23 -0700 Subject: [PATCH 6/6] Multiply by 100 to get accurate percentage. --- Client/src/Pages/Monitors/Home/monitorData.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Pages/Monitors/Home/monitorData.jsx b/Client/src/Pages/Monitors/Home/monitorData.jsx index e4428e5e6..d3fd66958 100644 --- a/Client/src/Pages/Monitors/Home/monitorData.jsx +++ b/Client/src/Pages/Monitors/Home/monitorData.jsx @@ -36,7 +36,7 @@ export const buildData = (monitors, isAdmin, navigate) => { uptimePercentage = monitor.uptimePercentage === 0 ? "0" - : monitor.uptimePercentage.toFixed(2); + : (monitor.uptimePercentage * 100).toFixed(2); } const params = {