diff --git a/Client/src/Pages/Monitors/Home/monitorData.jsx b/Client/src/Pages/Monitors/Home/monitorData.jsx index c82a1fa95..d3fd66958 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 * 100).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; }; + + + diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js index 7736ca3c1..32968431d 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 n = await Check.countDocuments({ monitorId }) + 1; + const check = await new Check({ ...checkData }).save(); + + const monitor = await Monitor.findById(monitorId); + + if (!monitor) { + throw new Error("Monitor not found"); + } + + if (monitor.uptimePercentage === undefined) { + monitor.uptimePercentage = (status === true) ? 1 : 0; + } else { + monitor.uptimePercentage = + (monitor.uptimePercentage * (n - 1) + (status === true ? 1: 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,