} The response from the axios GET request.
*/
+
async getMonitorsByTeamId(config) {
- const {
- authToken,
- teamId,
- limit,
- types,
- status,
- checkOrder,
- normalize,
- page,
- rowsPerPage,
- filter,
- field,
- order,
- } = config;
+ const { authToken, teamId, limit, types, page, rowsPerPage, filter, field, order } =
+ config;
const params = new URLSearchParams();
@@ -191,9 +177,6 @@ class NetworkService {
params.append("type", type);
});
}
- if (status) params.append("status", status);
- if (checkOrder) params.append("checkOrder", checkOrder);
- if (normalize) params.append("normalize", normalize);
if (page) params.append("page", page);
if (rowsPerPage) params.append("rowsPerPage", rowsPerPage);
if (filter) params.append("filter", filter);
diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js
index b16d31542..eca376b84 100644
--- a/Client/src/Validation/validation.js
+++ b/Client/src/Validation/validation.js
@@ -95,9 +95,48 @@ const monitorValidation = joi.object({
.string()
.trim()
.custom((value, helpers) => {
- const urlRegex =
- /^(https?:\/\/)?(([0-9]{1,3}\.){3}[0-9]{1,3}|[\da-z\.-]+)(\.[a-z\.]{2,6})?(:(\d+))?([\/\w \.-]*)*\/?$/i;
-
+ // Regex from https://gist.github.com/dperini/729294
+ var urlRegex = new RegExp(
+ "^" +
+ // protocol identifier (optional)
+ // short syntax // still required
+ "(?:(?:https?|ftp):\\/\\/)?" +
+ // user:pass BasicAuth (optional)
+ "(?:" +
+ // IP address exclusion
+ // private & local networks
+ "(?!(?:10|127)(?:\\.\\d{1,3}){3})" +
+ "(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})" +
+ "(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})" +
+ // IP address dotted notation octets
+ // excludes loopback network 0.0.0.0
+ // excludes reserved space >= 224.0.0.0
+ // excludes network & broadcast addresses
+ // (first & last IP address of each class)
+ "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
+ "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
+ "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
+ "|" +
+ // host & domain names, may end with dot
+ // can be replaced by a shortest alternative
+ // (?![-_])(?:[-\\w\\u00a1-\\uffff]{0,63}[^-_]\\.)+
+ "(?:" +
+ "(?:" +
+ "[a-z0-9\\u00a1-\\uffff]" +
+ "[a-z0-9\\u00a1-\\uffff_-]{0,62}" +
+ ")?" +
+ "[a-z0-9\\u00a1-\\uffff]\\." +
+ ")+" +
+ // TLD identifier name, may end with dot
+ "(?:[a-z\\u00a1-\\uffff]{2,}\\.?)" +
+ ")" +
+ // port number (optional)
+ "(?::\\d{2,5})?" +
+ // resource path (optional)
+ "(?:[/?#]\\S*)?" +
+ "$",
+ "i"
+ );
if (!urlRegex.test(value)) {
return helpers.error("string.invalidUrl");
}
diff --git a/Docker/dev/docker-compose.yaml b/Docker/dev/docker-compose.yaml
index d3b00adf6..f8b2c6936 100644
--- a/Docker/dev/docker-compose.yaml
+++ b/Docker/dev/docker-compose.yaml
@@ -24,6 +24,12 @@ services:
- "6379:6379"
volumes:
- ./redis/data:/data
+ healthcheck:
+ test: ["CMD", "redis-cli", "ping"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+ start_period: 5s
mongodb:
image: uptime_database_mongo:latest
restart: always
diff --git a/Docker/dist/docker-compose.yaml b/Docker/dist/docker-compose.yaml
index 8afa3c241..420941e7e 100644
--- a/Docker/dist/docker-compose.yaml
+++ b/Docker/dist/docker-compose.yaml
@@ -30,6 +30,12 @@ services:
- "6379:6379"
volumes:
- ./redis/data:/data
+ healthcheck:
+ test: ["CMD", "redis-cli", "ping"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+ start_period: 5s
mongodb:
image: bluewaveuptime/uptime_database_mongo:latest
restart: always
diff --git a/Docker/prod/docker-compose.yaml b/Docker/prod/docker-compose.yaml
index 1fb6a5d05..0da2da996 100644
--- a/Docker/prod/docker-compose.yaml
+++ b/Docker/prod/docker-compose.yaml
@@ -38,6 +38,12 @@ services:
- "6379:6379"
volumes:
- ./redis/data:/data
+ healthcheck:
+ test: ["CMD", "redis-cli", "ping"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+ start_period: 5s
mongodb:
image: uptime_database_mongo:latest
restart: always
diff --git a/Docker/test/docker-compose.yaml b/Docker/test/docker-compose.yaml
index 5a0080101..09ea94449 100644
--- a/Docker/test/docker-compose.yaml
+++ b/Docker/test/docker-compose.yaml
@@ -38,6 +38,12 @@ services:
- "6379:6379"
volumes:
- ./redis/data:/data
+ healthcheck:
+ test: ["CMD", "redis-cli", "ping"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+ start_period: 5s
mongodb:
image: uptime_database_mongo:latest
command: ["mongod", "--quiet", "--auth"]
diff --git a/README.md b/README.md
index 35e3f0fd5..8e9f34fb7 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-# **We're opening our $5000 grant funding announcement soon, powered by Checkmate and [UpRock](https://uprock.com) - check [our web page](https://checkmate.so) for preliminary details.**
+# **We're opening our $5000 grant funding announcement soon, in partnership with [UpRock](https://uprock.com) - check [our web page](https://checkmate.so) for preliminary details.**
-**If you would like to support us, please consider giving it a ⭐, and think about contributing or providing feedback. Need support or have a suggestion? Check our [Discord channel](https://discord.gg/NAb6H3UTjK) or [Discussions](https://github.com/bluewave-labs/checkmate/discussions) forum.**
-
-
+**If you would like to support us, please consider giving it a ⭐ and click on "watch" so you can latest news from us. Need support or have a suggestion? Check our [Discord channel](https://discord.gg/NAb6H3UTjK) or [Discussions](https://github.com/bluewave-labs/checkmate/discussions) forum.**
+
@@ -13,12 +12,14 @@
+[](https://www.bestpractices.dev/projects/9901)
+
-An open source server and infrastructure monitoring application
+An open source uptime and infrastructure monitoring application
-
+
Checkmate is an open source monitoring tool used to track the operational status and performance of servers and websites. It regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time.
@@ -112,8 +113,8 @@ Here's how you can contribute:
Also check other developer and contributor-friendly projects of BlueWave:
-- [BlueWave DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), an secure file sharing application, aka dataroom.
+- [DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), an secure file sharing application, aka dataroom.
- [BlueWave HRM](https://github.com/bluewave-labs/bluewave-hrm), a complete Human Resource Management platform.
-- [BlueWave Onboarding](https://github.com/bluewave-labs/bluewave-onboarding), an application that helps new users learn how to use your product via hints, tours, popups and banners.
+- [Guidefox](https://github.com/bluewave-labs/guidefox), an application that helps new users learn how to use your product via hints, tours, popups and banners.
- [VerifyWise](https://github.com/bluewave-labs/verifywise), the first open source AI governance platform.
diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js
index 5e16b3b18..686661a00 100644
--- a/Server/controllers/monitorController.js
+++ b/Server/controllers/monitorController.js
@@ -1,13 +1,11 @@
import {
getMonitorByIdParamValidation,
getMonitorByIdQueryValidation,
- getMonitorsByTeamIdValidation,
+ getMonitorsByTeamIdParamValidation,
+ getMonitorsByTeamIdQueryValidation,
createMonitorBodyValidation,
getMonitorURLByQueryValidation,
editMonitorBodyValidation,
- getMonitorsAndSummaryByTeamIdParamValidation,
- getMonitorsAndSummaryByTeamIdQueryValidation,
- getMonitorsByTeamIdQueryValidation,
pauseMonitorParamValidation,
getMonitorStatsByIdParamValidation,
getMonitorStatsByIdQueryValidation,
@@ -204,77 +202,6 @@ class MonitorController {
}
};
- /**
- * Retrieves all monitors and a summary for a team based on the team ID.
- * @async
- * @param {Object} req - The Express request object.
- * @property {Object} req.params - The parameters of the request.
- * @property {string} req.params.teamId - The ID of the team.
- * @property {Object} req.query - The query parameters of the request.
- * @property {string} req.query.type - The type of the request.
- * @param {Object} res - The Express response object.
- * @param {function} next - The next middleware function.
- * @returns {Object} The response object with a success status, a message, and the data containing the monitors and summary for the team.
- * @throws {Error} If there is an error during the process, especially if there is a validation error (422).
- */
- getMonitorsAndSummaryByTeamId = async (req, res, next) => {
- try {
- await getMonitorsAndSummaryByTeamIdParamValidation.validateAsync(req.params);
- await getMonitorsAndSummaryByTeamIdQueryValidation.validateAsync(req.query);
- } catch (error) {
- next(handleValidationError(error, SERVICE_NAME));
- return;
- }
-
- try {
- const { teamId } = req.params;
- const { type } = req.query;
- const monitorsSummary = await this.db.getMonitorsAndSummaryByTeamId(teamId, type);
- return res.status(200).json({
- success: true,
- msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),
- data: monitorsSummary,
- });
- } catch (error) {
- next(handleError(error, SERVICE_NAME, "getMonitorsAndSummaryByTeamId"));
- }
- };
-
- /**
- * Retrieves all monitors associated with a team by the team's ID.
- * @async
- * @param {Object} req - The Express request object.
- * @property {Object} req.params - The parameters of the request.
- * @property {string} req.params.teamId - The ID of the team.
- * @property {Object} req.query - The query parameters of the request.
- * @param {Object} res - The Express response object.
- * @param {function} next - The next middleware function.
- * @returns {Object} The response object with a success status, a message, and the data containing the monitors for the team.
- * @throws {Error} If there is an error during the process, especially if there is a validation error (422).
- */
- getMonitorsByTeamId = async (req, res, next) => {
- try {
- await getMonitorsByTeamIdValidation.validateAsync(req.params);
- await getMonitorsByTeamIdQueryValidation.validateAsync(req.query);
- } catch (error) {
- next(handleValidationError(error, SERVICE_NAME));
- return;
- }
-
- try {
- const teamId = req.params.teamId;
- const monitors = await this.db.getMonitorsByTeamId(req, res);
- return res.status(200).json({
- success: true,
- msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),
- data: monitors,
- });
- } catch (error) {
- next(handleError(error, SERVICE_NAME, "getMonitorsByTeamId"));
- next(error);
- }
- };
-
/**
* Creates a new monitor and adds it to the job queue.
* @async
@@ -564,6 +491,26 @@ class MonitorController {
next(handleError(error, SERVICE_NAME, "addDemoMonitors"));
}
};
+
+ getMonitorsByTeamId = async (req, res, next) => {
+ try {
+ await getMonitorsByTeamIdParamValidation.validateAsync(req.params);
+ await getMonitorsByTeamIdQueryValidation.validateAsync(req.query);
+ } catch (error) {
+ next(handleValidationError(error, SERVICE_NAME));
+ }
+
+ try {
+ const monitors = await this.db.getMonitorsByTeamId(req);
+ return res.status(200).json({
+ success: true,
+ msg: "good",
+ data: monitors,
+ });
+ } catch (error) {
+ next(handleError(error, SERVICE_NAME, "getMonitorsForDisplay"));
+ }
+ };
}
export default MonitorController;
diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js
index 773d6ef1e..0a552012d 100644
--- a/Server/db/mongo/modules/checkModule.js
+++ b/Server/db/mongo/modules/checkModule.js
@@ -175,6 +175,7 @@ const getTeamChecks = async (req) => {
case "all":
break;
case "down":
+ checksQuery.status = false;
break;
case "resolve":
checksQuery.statusCode = 5000;
diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 1143b9eeb..7b554ff32 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -8,7 +8,11 @@ import { NormalizeData, NormalizeDataUptimeDetails } from "../../../utils/dataUt
import fs from "fs";
import path from "path";
import { fileURLToPath } from "url";
-
+import {
+ buildUptimeDetailsPipeline,
+ buildHardwareDetailsPipeline,
+} from "./monitorModuleQueries.js";
+import { ObjectId } from "mongodb";
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
@@ -336,272 +340,9 @@ const getUptimeDetailsById = async (req) => {
};
const dateString = formatLookup[dateRange];
- const monitorData = await Check.aggregate([
- {
- $match: {
- monitorId: monitor._id,
- },
- },
- {
- $sort: {
- createdAt: 1,
- },
- },
- {
- $facet: {
- aggregateData: [
- {
- $group: {
- _id: null,
- avgResponseTime: {
- $avg: "$responseTime",
- },
- firstCheck: {
- $first: "$$ROOT",
- },
- lastCheck: {
- $last: "$$ROOT",
- },
- totalChecks: {
- $sum: 1,
- },
- },
- },
- ],
- uptimeDuration: [
- {
- $match: {
- status: false,
- },
- },
- {
- $sort: {
- createdAt: 1,
- },
- },
- {
- $group: {
- _id: null,
- lastFalseCheck: {
- $last: "$$ROOT",
- },
- },
- },
- ],
- groupChecks: [
- {
- $match: {
- createdAt: { $gte: dates.start, $lte: dates.end },
- },
- },
- {
- $group: {
- _id: {
- $dateToString: {
- format: dateString,
- date: "$createdAt",
- },
- },
- avgResponseTime: {
- $avg: "$responseTime",
- },
- totalChecks: {
- $sum: 1,
- },
- },
- },
- {
- $sort: {
- _id: 1,
- },
- },
- ],
- groupAggregate: [
- {
- $match: {
- createdAt: { $gte: dates.start, $lte: dates.end },
- },
- },
- {
- $group: {
- _id: null,
- avgResponseTime: {
- $avg: "$responseTime",
- },
- },
- },
- ],
- upChecksAggregate: [
- {
- $match: {
- status: true,
- },
- },
- {
- $group: {
- _id: null,
- avgResponseTime: {
- $avg: "$responseTime",
- },
- totalChecks: {
- $sum: 1,
- },
- },
- },
- ],
- upChecks: [
- {
- $match: {
- status: true,
- createdAt: { $gte: dates.start, $lte: dates.end },
- },
- },
- {
- $group: {
- _id: {
- $dateToString: {
- format: dateString,
- date: "$createdAt",
- },
- },
- totalChecks: {
- $sum: 1,
- },
- avgResponseTime: {
- $avg: "$responseTime",
- },
- },
- },
- {
- $sort: { _id: 1 },
- },
- ],
- downChecksAggregate: [
- {
- $match: {
- status: false,
- },
- },
- {
- $group: {
- _id: null,
- avgResponseTime: {
- $avg: "$responseTime",
- },
- totalChecks: {
- $sum: 1,
- },
- },
- },
- ],
- downChecks: [
- {
- $match: {
- status: false,
- createdAt: { $gte: dates.start, $lte: dates.end },
- },
- },
- {
- $group: {
- _id: {
- $dateToString: {
- format: dateString,
- date: "$createdAt",
- },
- },
- totalChecks: {
- $sum: 1,
- },
- avgResponseTime: {
- $avg: "$responseTime",
- },
- },
- },
- {
- $sort: { _id: 1 },
- },
- ],
- },
- },
- {
- $project: {
- avgResponseTime: {
- $arrayElemAt: ["$aggregateData.avgResponseTime", 0],
- },
- totalChecks: {
- $arrayElemAt: ["$aggregateData.totalChecks", 0],
- },
- latestResponseTime: {
- $arrayElemAt: ["$aggregateData.lastCheck.responseTime", 0],
- },
- timeSinceLastCheck: {
- $let: {
- vars: {
- lastCheck: {
- $arrayElemAt: ["$aggregateData.lastCheck", 0],
- },
- },
- in: {
- $cond: [
- {
- $ifNull: ["$$lastCheck", false],
- },
- {
- $subtract: [new Date(), "$$lastCheck.createdAt"],
- },
- 0,
- ],
- },
- },
- },
- timeSinceLastFalseCheck: {
- $let: {
- vars: {
- lastFalseCheck: {
- $arrayElemAt: ["$uptimeDuration.lastFalseCheck", 0],
- },
- firstCheck: {
- $arrayElemAt: ["$aggregateData.firstCheck", 0],
- },
- },
- in: {
- $cond: [
- {
- $ifNull: ["$$lastFalseCheck", false],
- },
- {
- $subtract: [new Date(), "$$lastFalseCheck.createdAt"],
- },
- {
- $cond: [
- {
- $ifNull: ["$$firstCheck", false],
- },
- {
- $subtract: [new Date(), "$$firstCheck.createdAt"],
- },
- 0,
- ],
- },
- ],
- },
- },
- },
- groupChecks: "$groupChecks",
- groupAggregate: {
- $arrayElemAt: ["$groupAggregate", 0],
- },
- upChecksAggregate: {
- $arrayElemAt: ["$upChecksAggregate", 0],
- },
- upChecks: "$upChecks",
- downChecksAggregate: {
- $arrayElemAt: ["$downChecksAggregate", 0],
- },
- downChecks: "$downChecks",
- },
- },
- ]);
+ const monitorData = await Check.aggregate(
+ buildUptimeDetailsPipeline(monitor, dates, dateString)
+ );
const normalizedGroupChecks = NormalizeDataUptimeDetails(
monitorData[0].groupChecks,
@@ -715,261 +456,9 @@ const getHardwareDetailsById = async (req) => {
month: "%Y-%m-%dT00:00:00Z",
};
const dateString = formatLookup[dateRange];
- const hardwareStats = await HardwareCheck.aggregate([
- {
- $match: {
- monitorId: monitor._id,
- createdAt: { $gte: dates.start, $lte: dates.end },
- },
- },
- {
- $sort: {
- createdAt: 1,
- },
- },
- {
- $facet: {
- aggregateData: [
- {
- $group: {
- _id: null,
- latestCheck: {
- $last: "$$ROOT",
- },
- totalChecks: {
- $sum: 1,
- },
- },
- },
- ],
- upChecks: [
- {
- $match: {
- status: true,
- },
- },
- {
- $group: {
- _id: null,
- totalChecks: {
- $sum: 1,
- },
- },
- },
- ],
- checks: [
- {
- $limit: 1,
- },
- {
- $project: {
- diskCount: {
- $size: "$disk",
- },
- },
- },
- {
- $lookup: {
- from: "hardwarechecks",
- let: {
- diskCount: "$diskCount",
- },
- pipeline: [
- {
- $match: {
- $expr: {
- $and: [
- { $eq: ["$monitorId", monitor._id] },
- { $gte: ["$createdAt", dates.start] },
- { $lte: ["$createdAt", dates.end] },
- ],
- },
- },
- },
- {
- $group: {
- _id: {
- $dateToString: {
- format: dateString,
- date: "$createdAt",
- },
- },
- avgCpuUsage: {
- $avg: "$cpu.usage_percent",
- },
- avgMemoryUsage: {
- $avg: "$memory.usage_percent",
- },
- avgTemperatures: {
- $push: {
- $ifNull: ["$cpu.temperature", [0]],
- },
- },
- disks: {
- $push: "$disk",
- },
- },
- },
- {
- $project: {
- _id: 1,
- avgCpuUsage: 1,
- avgMemoryUsage: 1,
- avgTemperature: {
- $map: {
- input: {
- $range: [
- 0,
- {
- $size: {
- // Handle null temperatures array
- $ifNull: [
- { $arrayElemAt: ["$avgTemperatures", 0] },
- [0], // Default to single-element array if null
- ],
- },
- },
- ],
- },
- as: "index",
- in: {
- $avg: {
- $map: {
- input: "$avgTemperatures",
- as: "tempArray",
- in: {
- $ifNull: [
- { $arrayElemAt: ["$$tempArray", "$$index"] },
- 0, // Default to 0 if element is null
- ],
- },
- },
- },
- },
- },
- },
- disks: {
- $map: {
- input: {
- $range: [0, "$$diskCount"],
- },
- as: "diskIndex",
- in: {
- name: {
- $concat: [
- "disk",
- {
- $toString: "$$diskIndex",
- },
- ],
- },
- readSpeed: {
- $avg: {
- $map: {
- input: "$disks",
- as: "diskArray",
- in: {
- $arrayElemAt: [
- "$$diskArray.read_speed_bytes",
- "$$diskIndex",
- ],
- },
- },
- },
- },
- writeSpeed: {
- $avg: {
- $map: {
- input: "$disks",
- as: "diskArray",
- in: {
- $arrayElemAt: [
- "$$diskArray.write_speed_bytes",
- "$$diskIndex",
- ],
- },
- },
- },
- },
- totalBytes: {
- $avg: {
- $map: {
- input: "$disks",
- as: "diskArray",
- in: {
- $arrayElemAt: [
- "$$diskArray.total_bytes",
- "$$diskIndex",
- ],
- },
- },
- },
- },
- freeBytes: {
- $avg: {
- $map: {
- input: "$disks",
- as: "diskArray",
- in: {
- $arrayElemAt: [
- "$$diskArray.free_bytes",
- "$$diskIndex",
- ],
- },
- },
- },
- },
- usagePercent: {
- $avg: {
- $map: {
- input: "$disks",
- as: "diskArray",
- in: {
- $arrayElemAt: [
- "$$diskArray.usage_percent",
- "$$diskIndex",
- ],
- },
- },
- },
- },
- },
- },
- },
- },
- },
- ],
- as: "hourlyStats",
- },
- },
- {
- $unwind: "$hourlyStats",
- },
- {
- $replaceRoot: {
- newRoot: "$hourlyStats",
- },
- },
- ],
- },
- },
- {
- $project: {
- aggregateData: {
- $arrayElemAt: ["$aggregateData", 0],
- },
- upChecks: {
- $arrayElemAt: ["$upChecks", 0],
- },
- checks: {
- $sortArray: {
- input: "$checks",
- sortBy: { _id: 1 },
- },
- },
- },
- },
- ]);
+ const hardwareStats = await HardwareCheck.aggregate(
+ buildHardwareDetailsPipeline(monitor, dates, dateString)
+ );
const monitorStats = {
...monitor.toObject(),
@@ -1016,121 +505,167 @@ const getMonitorById = async (monitorId) => {
}
};
-/**
- * Get monitors and Summary by TeamID
- * @async
- * @param {Express.Request} req
- * @param {Express.Response} res
- * @returns {Promise>}
- * @throws {Error}
- */
+const getMonitorsByTeamId = async (req) => {
+ let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
-const getMonitorsAndSummaryByTeamId = async (teamId, type) => {
- try {
- const monitors = await Monitor.find({ teamId, type });
- const monitorCounts = monitors.reduce(
- (acc, monitor) => {
- if (monitor.status === true) {
- acc.up += 1;
- } else if (monitor.status === false) {
- acc.down += 1;
- } else if (monitor.isActive === false) {
- acc.paused += 1;
- }
- return acc;
+ // Parse ints
+ limit = parseInt(limit);
+ page = parseInt(page);
+ rowsPerPage = parseInt(rowsPerPage);
+
+ // Build the match stage
+ const matchStage = { teamId: ObjectId.createFromHexString(req.params.teamId) };
+ if (type !== undefined) {
+ matchStage.type = Array.isArray(type) ? { $in: type } : type;
+ }
+
+ const skip = page && rowsPerPage ? page * rowsPerPage : 0;
+
+ const sort = { [field]: order === "asc" ? 1 : -1 };
+
+ const results = await Monitor.aggregate([
+ { $match: matchStage },
+ {
+ $facet: {
+ summary: [
+ {
+ $group: {
+ _id: null,
+ totalMonitors: { $sum: 1 },
+ upMonitors: {
+ $sum: {
+ $cond: [{ $eq: ["$status", true] }, 1, 0],
+ },
+ },
+ downMonitors: {
+ $sum: {
+ $cond: [{ $eq: ["$status", false] }, 1, 0],
+ },
+ },
+ pausedMonitors: {
+ $sum: {
+ $cond: [{ $eq: ["$isActive", false] }, 1, 0],
+ },
+ },
+ },
+ },
+ {
+ $project: {
+ _id: 0,
+ },
+ },
+ ],
+ monitors: [
+ ...(filter !== undefined
+ ? [
+ {
+ $match: {
+ $or: [
+ { name: { $regex: filter, $options: "i" } },
+ { url: { $regex: filter, $options: "i" } },
+ ],
+ },
+ },
+ ]
+ : []),
+ { $sort: sort },
+ { $skip: skip },
+ ...(rowsPerPage ? [{ $limit: rowsPerPage }] : []),
+ {
+ $lookup: {
+ from: "checks",
+ let: { monitorId: "$_id" },
+ pipeline: [
+ {
+ $match: {
+ $expr: { $eq: ["$monitorId", "$$monitorId"] },
+ },
+ },
+ { $sort: { createdAt: -1 } },
+ ...(limit ? [{ $limit: limit }] : []),
+ ],
+ as: "standardchecks",
+ },
+ },
+ {
+ $lookup: {
+ from: "pagespeedchecks",
+ let: { monitorId: "$_id" },
+ pipeline: [
+ {
+ $match: {
+ $expr: { $eq: ["$monitorId", "$$monitorId"] },
+ },
+ },
+ { $sort: { createdAt: -1 } },
+ ...(limit ? [{ $limit: limit }] : []),
+ ],
+ as: "pagespeedchecks",
+ },
+ },
+ {
+ $lookup: {
+ from: "hardwarechecks",
+ let: { monitorId: "$_id" },
+ pipeline: [
+ {
+ $match: {
+ $expr: { $eq: ["$monitorId", "$$monitorId"] },
+ },
+ },
+ { $sort: { createdAt: -1 } },
+ ...(limit ? [{ $limit: limit }] : []),
+ ],
+ as: "hardwarechecks",
+ },
+ },
+ {
+ $addFields: {
+ checks: {
+ $switch: {
+ branches: [
+ {
+ case: { $in: ["$type", ["http", "ping", "docker", "port"]] },
+ then: "$standardchecks",
+ },
+ {
+ case: { $eq: ["$type", "pagespeed"] },
+ then: "$pagespeedchecks",
+ },
+ {
+ case: { $eq: ["$type", "hardware"] },
+ then: "$hardwarechecks",
+ },
+ ],
+ default: [],
+ },
+ },
+ },
+ },
+ {
+ $project: {
+ standardchecks: 0,
+ pagespeedchecks: 0,
+ hardwarechecks: 0,
+ },
+ },
+ ],
},
- { up: 0, down: 0, paused: 0 }
- );
- monitorCounts.total = monitors.length;
- return { monitors, monitorCounts };
- } catch (error) {
- error.service = SERVICE_NAME;
- error.method = "getMonitorsAndSummaryByTeamId";
- throw error;
- }
-};
+ },
+ {
+ $project: {
+ summary: { $arrayElemAt: ["$summary", 0] },
+ monitors: 1,
+ },
+ },
+ ]);
-/**
- * Get monitors by TeamID
- * @async
- * @param {Express.Request} req
- * @param {Express.Response} res
- * @returns {Promise>}
- * @throws {Error}
- */
-const getMonitorsByTeamId = async (req, res) => {
- try {
- let {
- limit,
- type,
- status,
- checkOrder,
- normalize,
- page,
- rowsPerPage,
- filter,
- field,
- order,
- } = req.query;
-
- const monitorQuery = { teamId: req.params.teamId };
-
- if (type !== undefined) {
- monitorQuery.type = Array.isArray(type) ? { $in: type } : type;
- }
- // Add filter if provided
- // $options: "i" makes the search case-insensitive
- if (filter !== undefined) {
- monitorQuery.$or = [
- { name: { $regex: filter, $options: "i" } },
- { url: { $regex: filter, $options: "i" } },
- ];
- }
- const monitorCount = await Monitor.countDocuments(monitorQuery);
-
- // Pagination
- const skip = page && rowsPerPage ? page * rowsPerPage : 0;
-
- // Build Sort option
- const sort = field ? { [field]: order === "asc" ? 1 : -1 } : {};
-
- const monitors = await Monitor.find(monitorQuery)
- .skip(skip)
- .limit(rowsPerPage)
- .sort(sort);
-
- // Early return if limit is set to -1, indicating we don't want any checks
- if (limit === "-1") {
- return { monitors, monitorCount };
- }
- // Map each monitor to include its associated checks
- const monitorsWithChecks = await Promise.all(
- monitors.map(async (monitor) => {
- let model = CHECK_MODEL_LOOKUP[monitor.type];
-
- // Checks are order newest -> oldest
- let checks = await model
- .find({
- monitorId: monitor._id,
- ...(status && { status }),
- })
- .sort({ createdAt: checkOrder === "asc" ? 1 : -1 })
-
- .limit(limit || 0);
-
- //Normalize checks if requested
- if (normalize !== undefined) {
- checks = NormalizeData(checks, 10, 100);
- }
- return { ...monitor.toObject(), checks };
- })
- );
- return { monitors: monitorsWithChecks, monitorCount };
- } catch (error) {
- error.service = SERVICE_NAME;
- error.method = "getMonitorsByTeamId";
- throw error;
- }
+ let { monitors, summary } = results[0];
+ monitors = monitors.map((monitor) => {
+ monitor.checks = NormalizeData(monitor.checks, 10, 100);
+ return monitor;
+ });
+ return { monitors, summary };
};
/**
@@ -1262,9 +797,8 @@ export {
getAllMonitorsWithUptimeStats,
getMonitorStatsById,
getMonitorById,
- getUptimeDetailsById,
- getMonitorsAndSummaryByTeamId,
getMonitorsByTeamId,
+ getUptimeDetailsById,
createMonitor,
deleteMonitor,
deleteAllMonitors,
diff --git a/Server/db/mongo/modules/monitorModuleQueries.js b/Server/db/mongo/modules/monitorModuleQueries.js
new file mode 100644
index 000000000..ccafbcbdc
--- /dev/null
+++ b/Server/db/mongo/modules/monitorModuleQueries.js
@@ -0,0 +1,525 @@
+const buildUptimeDetailsPipeline = (monitor, dates, dateString) => {
+ return [
+ {
+ $match: {
+ monitorId: monitor._id,
+ },
+ },
+ {
+ $sort: {
+ createdAt: 1,
+ },
+ },
+ {
+ $facet: {
+ aggregateData: [
+ {
+ $group: {
+ _id: null,
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ firstCheck: {
+ $first: "$$ROOT",
+ },
+ lastCheck: {
+ $last: "$$ROOT",
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ },
+ },
+ ],
+ uptimeDuration: [
+ {
+ $match: {
+ status: false,
+ },
+ },
+ {
+ $sort: {
+ createdAt: 1,
+ },
+ },
+ {
+ $group: {
+ _id: null,
+ lastFalseCheck: {
+ $last: "$$ROOT",
+ },
+ },
+ },
+ ],
+ groupChecks: [
+ {
+ $match: {
+ createdAt: { $gte: dates.start, $lte: dates.end },
+ },
+ },
+ {
+ $group: {
+ _id: {
+ $dateToString: {
+ format: dateString,
+ date: "$createdAt",
+ },
+ },
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ },
+ },
+ {
+ $sort: {
+ _id: 1,
+ },
+ },
+ ],
+ groupAggregate: [
+ {
+ $match: {
+ createdAt: { $gte: dates.start, $lte: dates.end },
+ },
+ },
+ {
+ $group: {
+ _id: null,
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ },
+ },
+ ],
+ upChecksAggregate: [
+ {
+ $match: {
+ status: true,
+ },
+ },
+ {
+ $group: {
+ _id: null,
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ },
+ },
+ ],
+ upChecks: [
+ {
+ $match: {
+ status: true,
+ createdAt: { $gte: dates.start, $lte: dates.end },
+ },
+ },
+ {
+ $group: {
+ _id: {
+ $dateToString: {
+ format: dateString,
+ date: "$createdAt",
+ },
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ },
+ },
+ {
+ $sort: { _id: 1 },
+ },
+ ],
+ downChecksAggregate: [
+ {
+ $match: {
+ status: false,
+ },
+ },
+ {
+ $group: {
+ _id: null,
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ },
+ },
+ ],
+ downChecks: [
+ {
+ $match: {
+ status: false,
+ createdAt: { $gte: dates.start, $lte: dates.end },
+ },
+ },
+ {
+ $group: {
+ _id: {
+ $dateToString: {
+ format: dateString,
+ date: "$createdAt",
+ },
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ avgResponseTime: {
+ $avg: "$responseTime",
+ },
+ },
+ },
+ {
+ $sort: { _id: 1 },
+ },
+ ],
+ },
+ },
+ {
+ $project: {
+ avgResponseTime: {
+ $arrayElemAt: ["$aggregateData.avgResponseTime", 0],
+ },
+ totalChecks: {
+ $arrayElemAt: ["$aggregateData.totalChecks", 0],
+ },
+ latestResponseTime: {
+ $arrayElemAt: ["$aggregateData.lastCheck.responseTime", 0],
+ },
+ timeSinceLastCheck: {
+ $let: {
+ vars: {
+ lastCheck: {
+ $arrayElemAt: ["$aggregateData.lastCheck", 0],
+ },
+ },
+ in: {
+ $cond: [
+ {
+ $ifNull: ["$$lastCheck", false],
+ },
+ {
+ $subtract: [new Date(), "$$lastCheck.createdAt"],
+ },
+ 0,
+ ],
+ },
+ },
+ },
+ timeSinceLastFalseCheck: {
+ $let: {
+ vars: {
+ lastFalseCheck: {
+ $arrayElemAt: ["$uptimeDuration.lastFalseCheck", 0],
+ },
+ firstCheck: {
+ $arrayElemAt: ["$aggregateData.firstCheck", 0],
+ },
+ },
+ in: {
+ $cond: [
+ {
+ $ifNull: ["$$lastFalseCheck", false],
+ },
+ {
+ $subtract: [new Date(), "$$lastFalseCheck.createdAt"],
+ },
+ {
+ $cond: [
+ {
+ $ifNull: ["$$firstCheck", false],
+ },
+ {
+ $subtract: [new Date(), "$$firstCheck.createdAt"],
+ },
+ 0,
+ ],
+ },
+ ],
+ },
+ },
+ },
+ groupChecks: "$groupChecks",
+ groupAggregate: {
+ $arrayElemAt: ["$groupAggregate", 0],
+ },
+ upChecksAggregate: {
+ $arrayElemAt: ["$upChecksAggregate", 0],
+ },
+ upChecks: "$upChecks",
+ downChecksAggregate: {
+ $arrayElemAt: ["$downChecksAggregate", 0],
+ },
+ downChecks: "$downChecks",
+ },
+ },
+ ];
+};
+
+const buildHardwareDetailsPipeline = (monitor, dates, dateString) => {
+ return [
+ {
+ $match: {
+ monitorId: monitor._id,
+ createdAt: { $gte: dates.start, $lte: dates.end },
+ },
+ },
+ {
+ $sort: {
+ createdAt: 1,
+ },
+ },
+ {
+ $facet: {
+ aggregateData: [
+ {
+ $group: {
+ _id: null,
+ latestCheck: {
+ $last: "$$ROOT",
+ },
+ totalChecks: {
+ $sum: 1,
+ },
+ },
+ },
+ ],
+ upChecks: [
+ {
+ $match: {
+ status: true,
+ },
+ },
+ {
+ $group: {
+ _id: null,
+ totalChecks: {
+ $sum: 1,
+ },
+ },
+ },
+ ],
+ checks: [
+ {
+ $limit: 1,
+ },
+ {
+ $project: {
+ diskCount: {
+ $size: "$disk",
+ },
+ },
+ },
+ {
+ $lookup: {
+ from: "hardwarechecks",
+ let: {
+ diskCount: "$diskCount",
+ },
+ pipeline: [
+ {
+ $match: {
+ $expr: {
+ $and: [
+ { $eq: ["$monitorId", monitor._id] },
+ { $gte: ["$createdAt", dates.start] },
+ { $lte: ["$createdAt", dates.end] },
+ ],
+ },
+ },
+ },
+ {
+ $group: {
+ _id: {
+ $dateToString: {
+ format: dateString,
+ date: "$createdAt",
+ },
+ },
+ avgCpuUsage: {
+ $avg: "$cpu.usage_percent",
+ },
+ avgMemoryUsage: {
+ $avg: "$memory.usage_percent",
+ },
+ avgTemperatures: {
+ $push: {
+ $ifNull: ["$cpu.temperature", [0]],
+ },
+ },
+ disks: {
+ $push: "$disk",
+ },
+ },
+ },
+ {
+ $project: {
+ _id: 1,
+ avgCpuUsage: 1,
+ avgMemoryUsage: 1,
+ avgTemperature: {
+ $map: {
+ input: {
+ $range: [
+ 0,
+ {
+ $size: {
+ // Handle null temperatures array
+ $ifNull: [
+ { $arrayElemAt: ["$avgTemperatures", 0] },
+ [0], // Default to single-element array if null
+ ],
+ },
+ },
+ ],
+ },
+ as: "index",
+ in: {
+ $avg: {
+ $map: {
+ input: "$avgTemperatures",
+ as: "tempArray",
+ in: {
+ $ifNull: [
+ { $arrayElemAt: ["$$tempArray", "$$index"] },
+ 0, // Default to 0 if element is null
+ ],
+ },
+ },
+ },
+ },
+ },
+ },
+ disks: {
+ $map: {
+ input: {
+ $range: [0, "$$diskCount"],
+ },
+ as: "diskIndex",
+ in: {
+ name: {
+ $concat: [
+ "disk",
+ {
+ $toString: "$$diskIndex",
+ },
+ ],
+ },
+ readSpeed: {
+ $avg: {
+ $map: {
+ input: "$disks",
+ as: "diskArray",
+ in: {
+ $arrayElemAt: [
+ "$$diskArray.read_speed_bytes",
+ "$$diskIndex",
+ ],
+ },
+ },
+ },
+ },
+ writeSpeed: {
+ $avg: {
+ $map: {
+ input: "$disks",
+ as: "diskArray",
+ in: {
+ $arrayElemAt: [
+ "$$diskArray.write_speed_bytes",
+ "$$diskIndex",
+ ],
+ },
+ },
+ },
+ },
+ totalBytes: {
+ $avg: {
+ $map: {
+ input: "$disks",
+ as: "diskArray",
+ in: {
+ $arrayElemAt: [
+ "$$diskArray.total_bytes",
+ "$$diskIndex",
+ ],
+ },
+ },
+ },
+ },
+ freeBytes: {
+ $avg: {
+ $map: {
+ input: "$disks",
+ as: "diskArray",
+ in: {
+ $arrayElemAt: ["$$diskArray.free_bytes", "$$diskIndex"],
+ },
+ },
+ },
+ },
+ usagePercent: {
+ $avg: {
+ $map: {
+ input: "$disks",
+ as: "diskArray",
+ in: {
+ $arrayElemAt: [
+ "$$diskArray.usage_percent",
+ "$$diskIndex",
+ ],
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ ],
+ as: "hourlyStats",
+ },
+ },
+ {
+ $unwind: "$hourlyStats",
+ },
+ {
+ $replaceRoot: {
+ newRoot: "$hourlyStats",
+ },
+ },
+ ],
+ },
+ },
+ {
+ $project: {
+ aggregateData: {
+ $arrayElemAt: ["$aggregateData", 0],
+ },
+ upChecks: {
+ $arrayElemAt: ["$upChecks", 0],
+ },
+ checks: {
+ $sortArray: {
+ input: "$checks",
+ sortBy: { _id: 1 },
+ },
+ },
+ },
+ },
+ ];
+};
+
+export { buildUptimeDetailsPipeline, buildHardwareDetailsPipeline };
diff --git a/Server/package-lock.json b/Server/package-lock.json
index 01ca7d510..30306bf29 100644
--- a/Server/package-lock.json
+++ b/Server/package-lock.json
@@ -11,9 +11,9 @@
"dependencies": {
"axios": "^1.7.2",
"bcrypt": "5.1.1",
- "bullmq": "5.34.6",
+ "bullmq": "5.34.8",
"cors": "^2.8.5",
- "dockerode": "4.0.2",
+ "dockerode": "4.0.3",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"handlebars": "^4.7.8",
@@ -352,6 +352,37 @@
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
},
+ "node_modules/@grpc/grpc-js": {
+ "version": "1.12.5",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz",
+ "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@grpc/proto-loader": "^0.7.13",
+ "@js-sdsl/ordered-map": "^4.4.2"
+ },
+ "engines": {
+ "node": ">=12.10.0"
+ }
+ },
+ "node_modules/@grpc/proto-loader": {
+ "version": "0.7.13",
+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+ "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "lodash.camelcase": "^4.3.0",
+ "long": "^5.0.0",
+ "protobufjs": "^7.2.5",
+ "yargs": "^17.7.2"
+ },
+ "bin": {
+ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/@hapi/hoek": {
"version": "9.3.0",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -850,6 +881,16 @@
"@jridgewell/sourcemap-codec": "^1.4.14"
}
},
+ "node_modules/@js-sdsl/ordered-map": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+ "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+ "license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/js-sdsl"
+ }
+ },
"node_modules/@mapbox/node-pre-gyp": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
@@ -967,6 +1008,70 @@
"node": ">=14"
}
},
+ "node_modules/@protobufjs/aspromise": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+ "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/base64": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+ "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/codegen": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+ "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/eventemitter": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+ "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/fetch": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+ "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "@protobufjs/aspromise": "^1.1.1",
+ "@protobufjs/inquire": "^1.1.0"
+ }
+ },
+ "node_modules/@protobufjs/float": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+ "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/inquire": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+ "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/path": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+ "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/pool": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+ "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/@protobufjs/utf8": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
+ "license": "BSD-3-Clause"
+ },
"node_modules/@scarf/scarf": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.4.0.tgz",
@@ -1132,7 +1237,6 @@
"version": "22.10.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.4.tgz",
"integrity": "sha512-99l6wv4HEzBQhvaU/UGoeBoCK61SCROQaCCGyQSgX2tEQ3rKkNZ2S7CEWnS/4s1LV+8ODdK21UeyR1fHP2mXug==",
- "dev": true,
"license": "MIT",
"dependencies": {
"undici-types": "~6.20.0"
@@ -1640,9 +1744,9 @@
}
},
"node_modules/bullmq": {
- "version": "5.34.6",
- "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.34.6.tgz",
- "integrity": "sha512-pRCYyO9RlkQWxdmKlrNnUthyFwurYXRYLVXD1YIx+nCCdhAOiHatD8FDHbsT/w2I31c0NWoMcfZiIGuipiF7Lg==",
+ "version": "5.34.8",
+ "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.34.8.tgz",
+ "integrity": "sha512-id5mmPg3K8tNXQ9VVlmUxBSeLmliIWUrB8Hd5c62PFrIiHywz4TN1PEqU6OWvYXEvoFCr8/BlnbE4JCrGqPVmg==",
"license": "MIT",
"dependencies": {
"cron-parser": "^4.9.0",
@@ -2654,9 +2758,9 @@
}
},
"node_modules/docker-modem": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.3.tgz",
- "integrity": "sha512-89zhop5YVhcPEt5FpUFGr3cDyceGhq/F9J+ZndQ4KfqNvfbJpPMfgeixFgUj5OjCYAboElqODxY5Z1EBsSa6sg==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.5.tgz",
+ "integrity": "sha512-Cxw8uEcvNTRmsQuGqzzfiCnfGgf96tVJItLh8taOX0miTcIBALKH5TckCSuZbpbjP7uhAl81dOL9sxfa6HgCIg==",
"license": "Apache-2.0",
"dependencies": {
"debug": "^4.1.1",
@@ -2669,19 +2773,36 @@
}
},
"node_modules/dockerode": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.2.tgz",
- "integrity": "sha512-9wM1BVpVMFr2Pw3eJNXrYYt6DT9k0xMcsSCjtPvyQ+xa1iPg/Mo3T/gUcwI0B2cczqCeCYRPF8yFYDwtFXT0+w==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.3.tgz",
+ "integrity": "sha512-QSXJFcBQNaGZO6U3qWW4B7p8yRIJn/dWmvL2AQWfO/bjptBBO6QYdVkYSYFz9qoivP2jsOHZfmXMAfrK0BMKyg==",
"license": "Apache-2.0",
"dependencies": {
"@balena/dockerignore": "^1.0.2",
- "docker-modem": "^5.0.3",
- "tar-fs": "~2.0.1"
+ "@grpc/grpc-js": "^1.11.1",
+ "@grpc/proto-loader": "^0.7.13",
+ "docker-modem": "^5.0.5",
+ "protobufjs": "^7.3.2",
+ "tar-fs": "~2.0.1",
+ "uuid": "^10.0.0"
},
"engines": {
"node": ">= 8.0"
}
},
+ "node_modules/dockerode/node_modules/uuid": {
+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+ "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "license": "MIT",
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
"node_modules/dom-serializer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -4650,6 +4771,12 @@
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"license": "MIT"
},
+ "node_modules/lodash.camelcase": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+ "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+ "license": "MIT"
+ },
"node_modules/lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -4770,6 +4897,12 @@
"node": ">= 12.0.0"
}
},
+ "node_modules/long": {
+ "version": "5.2.3",
+ "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+ "license": "Apache-2.0"
+ },
"node_modules/loupe": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
@@ -6958,6 +7091,30 @@
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"license": "MIT"
},
+ "node_modules/protobufjs": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+ "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+ "hasInstallScript": true,
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "@protobufjs/aspromise": "^1.1.2",
+ "@protobufjs/base64": "^1.1.2",
+ "@protobufjs/codegen": "^2.0.4",
+ "@protobufjs/eventemitter": "^1.1.0",
+ "@protobufjs/fetch": "^1.1.0",
+ "@protobufjs/float": "^1.0.2",
+ "@protobufjs/inquire": "^1.1.0",
+ "@protobufjs/path": "^1.1.2",
+ "@protobufjs/pool": "^1.1.0",
+ "@protobufjs/utf8": "^1.1.0",
+ "@types/node": ">=13.7.0",
+ "long": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -8111,7 +8268,6 @@
"version": "6.20.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
- "dev": true,
"license": "MIT"
},
"node_modules/unfetch": {
diff --git a/Server/package.json b/Server/package.json
index d93c6c640..222f95f16 100644
--- a/Server/package.json
+++ b/Server/package.json
@@ -18,9 +18,9 @@
"dependencies": {
"axios": "^1.7.2",
"bcrypt": "5.1.1",
- "bullmq": "5.34.6",
+ "bullmq": "5.34.8",
"cors": "^2.8.5",
- "dockerode": "4.0.2",
+ "dockerode": "4.0.3",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"handlebars": "^4.7.8",
diff --git a/Server/routes/monitorRoute.js b/Server/routes/monitorRoute.js
index d47351486..92b529417 100644
--- a/Server/routes/monitorRoute.js
+++ b/Server/routes/monitorRoute.js
@@ -17,6 +17,7 @@ class MonitorRoutes {
"/hardware/details/:monitorId",
this.monitorController.getHardwareDetailsById
);
+
this.router.get(
"/uptime/details/:monitorId",
this.monitorController.getUptimeDetailsById
@@ -30,10 +31,7 @@ class MonitorRoutes {
);
});
this.router.get("/:monitorId", this.monitorController.getMonitorById);
- this.router.get(
- "/team/summary/:teamId",
- this.monitorController.getMonitorsAndSummaryByTeamId
- );
+
this.router.get("/team/:teamId", this.monitorController.getMonitorsByTeamId);
this.router.get(
diff --git a/Server/service/jobQueue.js b/Server/service/jobQueue.js
index 9b5663350..177ca34c5 100644
--- a/Server/service/jobQueue.js
+++ b/Server/service/jobQueue.js
@@ -217,14 +217,51 @@ class NewJobQueue {
connection: this.connection,
concurrency: 5,
});
- worker.on("failed", (job, err) => {
- this.logger.error({
- message: `Worker failed job: ${job.id}`,
- service: SERVICE_NAME,
- method: "createWorker",
- stack: err.stack,
- });
- });
+
+ // worker.on("active", (job) => {
+ // this.logger.info({
+ // message: `Worker started processing job: ${job.id}`,
+ // service: SERVICE_NAME,
+ // method: "createWorker",
+ // });
+ // });
+
+ // worker.on("completed", (job) => {
+ // this.logger.info({
+ // message: `Worker completed job: ${job.id}`,
+ // service: SERVICE_NAME,
+ // method: "createWorker",
+ // });
+ // });
+
+ // // Log job progress updates
+ // worker.on("progress", (job, progress) => {
+ // this.logger.info({
+ // message: `Job progress: ${job.id}`,
+ // service: SERVICE_NAME,
+ // method: "createWorker",
+ // details: `Progress: ${progress}%`,
+ // });
+ // });
+
+ // // Log when a job fails
+ // worker.on("failed", (job, err) => {
+ // this.logger.error({
+ // message: `Worker failed job: ${job.id}`,
+ // service: SERVICE_NAME,
+ // method: "createWorker",
+ // details: `Error: ${err.message}`,
+ // stack: err.stack,
+ // });
+ // });
+
+ // worker.on("stalled", (jobId) => {
+ // this.logger.warn({
+ // message: `Worker stalled job: ${jobId}`,
+ // service: SERVICE_NAME,
+ // method: "createWorker",
+ // });
+ // });
return worker;
}
@@ -353,8 +390,9 @@ class NewJobQueue {
const jobs = await queue.getJobs();
const ret = await Promise.all(
jobs.map(async (job) => {
+ console.log(job);
const state = await job.getState();
- return { url: job.data.url, state };
+ return { url: job.data.url, state, progress: job.progress };
})
);
stats[name] = { jobs: ret, workers: this.workers[name].length };
diff --git a/Server/service/settingsService.js b/Server/service/settingsService.js
index fb85939ca..24931f6ce 100644
--- a/Server/service/settingsService.js
+++ b/Server/service/settingsService.js
@@ -2,7 +2,7 @@ const SERVICE_NAME = "SettingsService";
import dotenv from "dotenv";
dotenv.config();
const envConfig = {
- logLevel: undefined,
+ logLevel: process.env.LOG_LEVEL,
apiBaseUrl: undefined,
clientHost: process.env.CLIENT_HOST,
jwtSecret: process.env.JWT_SECRET,
diff --git a/Server/utils/dataUtils.js b/Server/utils/dataUtils.js
index fd10a4257..ca6ca66df 100644
--- a/Server/utils/dataUtils.js
+++ b/Server/utils/dataUtils.js
@@ -38,7 +38,7 @@ const NormalizeData = (checks, rangeMin, rangeMax) => {
Math.min(rangeMax, normalizedResponseTime)
);
return {
- ...check._doc,
+ ...check,
responseTime: normalizedResponseTime,
originalResponseTime: originalResponseTime,
};
@@ -47,7 +47,7 @@ const NormalizeData = (checks, rangeMin, rangeMax) => {
return normalizedChecks;
} else {
return checks.map((check) => {
- return { ...check._doc, originalResponseTime: check.responseTime };
+ return { ...check, originalResponseTime: check.responseTime };
});
}
};
diff --git a/Server/validation/joi.js b/Server/validation/joi.js
index dbffef937..d30235048 100644
--- a/Server/validation/joi.js
+++ b/Server/validation/joi.js
@@ -136,32 +136,12 @@ const getMonitorByIdQueryValidation = joi.object({
normalize: joi.boolean(),
});
-const getMonitorsAndSummaryByTeamIdParamValidation = joi.object({
- teamId: joi.string().required(),
-});
-
-const getMonitorsAndSummaryByTeamIdQueryValidation = joi.object({
- type: joi
- .alternatives()
- .try(
- joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port"),
- joi
- .array()
- .items(
- joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port")
- )
- ),
-});
-
-const getMonitorsByTeamIdValidation = joi.object({
+const getMonitorsByTeamIdParamValidation = joi.object({
teamId: joi.string().required(),
});
const getMonitorsByTeamIdQueryValidation = joi.object({
- status: joi.boolean(),
- checkOrder: joi.string().valid("asc", "desc"),
limit: joi.number(),
- normalize: joi.boolean(),
type: joi
.alternatives()
.try(
@@ -467,9 +447,7 @@ export {
createMonitorBodyValidation,
getMonitorByIdParamValidation,
getMonitorByIdQueryValidation,
- getMonitorsAndSummaryByTeamIdParamValidation,
- getMonitorsAndSummaryByTeamIdQueryValidation,
- getMonitorsByTeamIdValidation,
+ getMonitorsByTeamIdParamValidation,
getMonitorsByTeamIdQueryValidation,
getMonitorStatsByIdParamValidation,
getMonitorStatsByIdQueryValidation,