diff --git a/client/src/Hooks/v1/monitorHooks.js b/client/src/Hooks/v1/monitorHooks.js
index e6b4b5261..9ee98cc55 100644
--- a/client/src/Hooks/v1/monitorHooks.js
+++ b/client/src/Hooks/v1/monitorHooks.js
@@ -538,6 +538,23 @@ const useExportMonitors = () => {
return [exportMonitors, isLoading];
};
+const useFetchJson = () => {
+ const [isLoading, setIsLoading] = useState(false);
+ const fetchJson = async () => {
+ try {
+ setIsLoading(true);
+ const res = await networkService.fetchJson();
+ createToast({ body: "JSON fetched successfully" });
+ return res?.data?.data ?? [];
+ } catch (error) {
+ createToast({ body: "Failed to create monitor." });
+ } finally {
+ setIsLoading(false);
+ }
+ };
+ return [fetchJson, isLoading];
+};
+
export {
useFetchMonitorsWithSummary,
useFetchMonitorsWithChecks,
@@ -557,4 +574,5 @@ export {
useCreateBulkMonitors,
useExportMonitors,
useFetchMonitorGames,
+ useFetchJson,
};
diff --git a/client/src/Pages/v1/Settings/SettingsExport.jsx b/client/src/Pages/v1/Settings/SettingsExport.jsx
new file mode 100644
index 000000000..fe04697f4
--- /dev/null
+++ b/client/src/Pages/v1/Settings/SettingsExport.jsx
@@ -0,0 +1,65 @@
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import ConfigBox from "@/Components/v1/ConfigBox/index.jsx";
+// Utils
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useTranslation } from "react-i18next";
+import Dialog from "@/Components/v1/Dialog/index.jsx";
+import { useState } from "react";
+
+const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) => {
+ const { t } = useTranslation();
+ const theme = useTheme();
+ // Local state
+ const [isOpen, setIsOpen] = useState(false);
+
+ if (!isAdmin) {
+ return null;
+ }
+
+ return (
+ <>
+
+
+
+ Export monitors to JSON
+
+
+ Export your monitors data as a JSON file for backup or transfer.
+
+
+
+
+
+
+ >
+ );
+};
+
+SettingsDemoMonitors.propTypes = {
+ isAdmin: PropTypes.bool,
+ handleChange: PropTypes.func,
+ HEADER_SX: PropTypes.object,
+};
+
+export default SettingsDemoMonitors;
diff --git a/client/src/Pages/v1/Settings/index.jsx b/client/src/Pages/v1/Settings/index.jsx
index 2732e331a..b6137121b 100644
--- a/client/src/Pages/v1/Settings/index.jsx
+++ b/client/src/Pages/v1/Settings/index.jsx
@@ -9,6 +9,7 @@ import SettingsDemoMonitors from "./SettingsDemoMonitors.jsx";
import SettingsAbout from "./SettingsAbout.jsx";
import SettingsEmail from "./SettingsEmail.jsx";
import SettingsGlobalThresholds from "./SettingsGlobalThresholds.jsx";
+import SettingsExport from "./SettingsExport.jsx";
import Button from "@mui/material/Button";
// Utils
import { settingsValidation } from "../../../Validation/validation.js";
@@ -30,6 +31,7 @@ import {
useAddDemoMonitors,
useDeleteAllMonitors,
useDeleteMonitorStats,
+ useFetchJson,
} from "../../../Hooks/v1/monitorHooks.js";
// Constants
const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
@@ -66,6 +68,7 @@ const Settings = () => {
});
const [deleteAllMonitors, isDeletingMonitors] = useDeleteAllMonitors();
const [deleteMonitorStats, isDeletingMonitorStats] = useDeleteMonitorStats();
+ const [fetchJson, isFetchingJson] = useFetchJson();
// Setup
const isAdmin = useIsAdmin();
@@ -128,6 +131,27 @@ const Settings = () => {
return;
}
+ if (name === "export") {
+ const json = await fetchJson();
+ if (!json || json.length === 0) {
+ return;
+ }
+
+ const blob = new Blob([JSON.stringify(json, null, 2)], {
+ type: "application/json",
+ });
+ const url = URL.createObjectURL(blob);
+
+ const link = document.createElement("a");
+ link.href = url;
+ link.download = "monitors.json";
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ URL.revokeObjectURL(url);
+ return;
+ }
+
// Validate
const { error } = settingsValidation.validate(newSettingsData.settings, {
abortEarly: false,
@@ -224,6 +248,12 @@ const Settings = () => {
setEmailPasswordHasBeenReset={setEmailPasswordHasBeenReset}
/>
+
{
diagnosticService: services.diagnosticService,
});
+ controllers.incidentController = new IncidentController(commonDependencies, {
+ incidentService: services.incidentService,
+ });
+
//V2
controllers.authControllerV2 = new AuthControllerV2(services.authServiceV2, services.inviteServiceV2);
controllers.inviteControllerV2 = new InviteControllerV2(services.inviteServiceV2);
diff --git a/server/src/config/routes.js b/server/src/config/routes.js
index 13b369262..5dace493c 100644
--- a/server/src/config/routes.js
+++ b/server/src/config/routes.js
@@ -13,6 +13,8 @@ import LogRoutes from "../routes/v1/logRoutes.js";
import DiagnosticRoutes from "../routes/v1//diagnosticRoute.js";
import NotificationRoutes from "../routes/v1/notificationRoute.js";
+import IncidentRoutes from "../routes/v1/incidentRoute.js";
+
//V2
import AuthRoutesV2 from "../routes/v2/auth.js";
import InviteRoutesV2 from "../routes/v2/invite.js";
@@ -34,6 +36,7 @@ export const setupRoutes = (app, controllers) => {
const statusPageRoutes = new StatusPageRoutes(controllers.statusPageController);
const notificationRoutes = new NotificationRoutes(controllers.notificationController);
const diagnosticRoutes = new DiagnosticRoutes(controllers.diagnosticController);
+ const incidentRoutes = new IncidentRoutes(controllers.incidentController);
app.use("/api/v1/auth", authApiLimiter, authRoutes.getRouter());
app.use("/api/v1/monitors", verifyJWT, monitorRoutes.getRouter());
@@ -46,6 +49,7 @@ export const setupRoutes = (app, controllers) => {
app.use("/api/v1/status-page", statusPageRoutes.getRouter());
app.use("/api/v1/notifications", verifyJWT, notificationRoutes.getRouter());
app.use("/api/v1/diagnostic", verifyJWT, diagnosticRoutes.getRouter());
+ app.use("/api/v1/incidents", verifyJWT, incidentRoutes.getRouter());
// V2
const authRoutesV2 = new AuthRoutesV2(controllers.authControllerV2);
diff --git a/server/src/config/services.js b/server/src/config/services.js
index c1679868d..004acc885 100644
--- a/server/src/config/services.js
+++ b/server/src/config/services.js
@@ -17,6 +17,7 @@ import DiagnosticService from "../service/v1/business/diagnosticService.js";
import InviteService from "../service/v1/business/inviteService.js";
import MaintenanceWindowService from "../service/v1/business/maintenanceWindowService.js";
import MonitorService from "../service/v1/business/monitorService.js";
+import IncidentService from "../service/v1/business/incidentService.js";
import papaparse from "papaparse";
import axios from "axios";
import got from "got";
@@ -57,6 +58,7 @@ import MonitorStats from "../db/v1/models/MonitorStats.js";
import Notification from "../db/v1/models/Notification.js";
import RecoveryToken from "../db/v1/models/RecoveryToken.js";
import AppSettings from "../db/v1/models/AppSettings.js";
+import Incident from "../db/v1/models/Incident.js";
import InviteModule from "../db/v1/modules/inviteModule.js";
import CheckModule from "../db/v1/modules/checkModule.js";
@@ -67,6 +69,7 @@ import MonitorModule from "../db/v1/modules/monitorModule.js";
import NotificationModule from "../db/v1/modules/notificationModule.js";
import RecoveryModule from "../db/v1/modules/recoveryModule.js";
import SettingsModule from "../db/v1/modules/settingsModule.js";
+import IncidentModule from "../db/v1/modules/incidentModule.js";
// V2 Business
import AuthServiceV2 from "../service/v2/business/AuthService.js";
@@ -120,6 +123,7 @@ export const initializeServices = async ({ logger, envSettings, settingsService
const notificationModule = new NotificationModule({ Notification, Monitor });
const recoveryModule = new RecoveryModule({ User, RecoveryToken, crypto, stringService });
const settingsModule = new SettingsModule({ AppSettings });
+ const incidentModule = new IncidentModule({ logger, Incident, Monitor, User });
const db = new MongoDB({
logger,
@@ -133,6 +137,7 @@ export const initializeServices = async ({ logger, envSettings, settingsService
notificationModule,
recoveryModule,
settingsModule,
+ incidentModule,
});
await db.connect();
@@ -152,8 +157,18 @@ export const initializeServices = async ({ logger, envSettings, settingsService
settingsService,
});
const emailService = new EmailService(settingsService, fs, path, compile, mjml2html, nodemailer, logger);
- const bufferService = new BufferService({ db, logger, envSettings });
- const statusService = new StatusService({ db, logger, buffer: bufferService });
+ const errorService = new ErrorService();
+
+ const incidentService = new IncidentService({
+ db,
+ logger,
+ errorService,
+ stringService,
+ });
+
+ const bufferService = new BufferService({ db, logger, envSettings, incidentService });
+
+ const statusService = new StatusService({ db, logger, buffer: bufferService, incidentService });
const notificationUtils = new NotificationUtils({
stringService,
@@ -169,8 +184,6 @@ export const initializeServices = async ({ logger, envSettings, settingsService
notificationUtils,
});
- const errorService = new ErrorService();
-
const superSimpleQueueHelper = new SuperSimpleQueueHelper({
db,
logger,
@@ -275,6 +288,7 @@ export const initializeServices = async ({ logger, envSettings, settingsService
inviteService,
maintenanceWindowService,
monitorService,
+ incidentService,
errorService,
logger,
//v2
diff --git a/server/src/controllers/v1/incidentController.js b/server/src/controllers/v1/incidentController.js
new file mode 100644
index 000000000..27bb93ee8
--- /dev/null
+++ b/server/src/controllers/v1/incidentController.js
@@ -0,0 +1,184 @@
+import BaseController from "./baseController.js";
+
+const SERVICE_NAME = "incidentController";
+
+/**
+ * Incident Controller
+ *
+ * Handles all incident-related HTTP requests including retrieving incidents,
+ * resolving incidents manually, and getting incident summaries.
+ *
+ * @class IncidentController
+ * @description Manages incident operations and tracking
+ */
+class IncidentController extends BaseController {
+ static SERVICE_NAME = SERVICE_NAME;
+
+ /**
+ * Creates an instance of IncidentController.
+ *
+ * @param {Object} commonDependencies - Common dependencies injected into the controller
+ * @param {Object} dependencies - The dependencies required by the controller
+ * @param {Object} dependencies.incidentService - Incident business logic service
+ */
+ constructor(commonDependencies, { incidentService }) {
+ super(commonDependencies);
+ this.incidentService = incidentService;
+ }
+
+ get serviceName() {
+ return IncidentController.SERVICE_NAME;
+ }
+
+ /**
+ * Retrieves all incidents for the current user's team with filtering and pagination.
+ *
+ * @async
+ * @function getIncidentsByTeam
+ * @param {Object} req - Express request object
+ * @param {Object} req.query - Query parameters for filtering and pagination
+ * @param {string} [req.query.sortOrder] - Sort order (asc/desc)
+ * @param {string} [req.query.dateRange] - Date range filter
+ * @param {string} [req.query.filter] - General filter string
+ * @param {number} [req.query.page] - Page number for pagination
+ * @param {number} [req.query.rowsPerPage] - Number of rows per page
+ * @param {boolean} [req.query.status] - Filter by incident status (true=active, false=resolved)
+ * @param {string} [req.query.monitorId] - Filter by monitor ID
+ * @param {string} [req.query.resolutionType] - Filter by resolution type (automatic/manual)
+ * @param {Object} req.user - Current authenticated user (from JWT)
+ * @param {string} req.user.teamId - User's team ID
+ * @param {Object} res - Express response object
+ * @returns {Promise