From 004184b0f445d7b56f80c86a5ab6663370297c1e Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 27 Dec 2024 11:16:09 -0800 Subject: [PATCH] add port types to monitor operations on BE --- Server/db/mongo/modules/monitorModule.js | 8 +++++++- Server/validation/joi.js | 12 ++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js index fa72aad21..61eab4e0e 100644 --- a/Server/db/mongo/modules/monitorModule.js +++ b/Server/db/mongo/modules/monitorModule.js @@ -21,6 +21,7 @@ const CHECK_MODEL_LOOKUP = { http: Check, ping: Check, docker: Check, + port: Check, pagespeed: PageSpeedCheck, hardware: HardwareCheck, }; @@ -351,7 +352,12 @@ const getMonitorStatsById = async (req) => { ), }; - if (monitor.type === "http" || monitor.type === "ping" || monitor.type === "docker") { + if ( + monitor.type === "http" || + monitor.type === "ping" || + monitor.type === "docker" || + monitor.type === "port" + ) { // HTTP/PING Specific stats monitorStats.periodAvgResponseTime = getAverageResponseTime(checksForDateRange); monitorStats.periodUptime = getUptimePercentage(checksForDateRange); diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 86e1fa7a6..141394ac8 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -144,10 +144,12 @@ const getMonitorsAndSummaryByTeamIdQueryValidation = joi.object({ type: joi .alternatives() .try( - joi.string().valid("http", "ping", "pagespeed", "docker", "hardware"), + joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port"), joi .array() - .items(joi.string().valid("http", "ping", "pagespeed", "docker", "hardware")) + .items( + joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port") + ) ), }); @@ -163,10 +165,12 @@ const getMonitorsByTeamIdQueryValidation = joi.object({ type: joi .alternatives() .try( - joi.string().valid("http", "ping", "pagespeed", "docker", "hardware"), + joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port"), joi .array() - .items(joi.string().valid("http", "ping", "pagespeed", "docker", "hardware")) + .items( + joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port") + ) ), page: joi.number(), rowsPerPage: joi.number(),