diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 4f0e9c049..616a37877 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -300,6 +300,28 @@ const useCreateMonitor = () => {
return [createMonitor, isLoading];
};
+const useFetchGlobalSettings = () => {
+ const [isLoading, setIsLoading] = useState(true);
+ const [globalSettings, setGlobalSettings] = useState(undefined);
+ useEffect(() => {
+ const fetchGlobalSettings = async () => {
+ try {
+ const res = await networkService.getAppSettings();
+ setGlobalSettings(res?.data);
+ } catch (error) {
+ console.error("Failed to fetch global settings:", error);
+ createToast({ body: "Failed to load global settings" });
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ fetchGlobalSettings();
+ }, []);
+
+ return [globalSettings, isLoading];
+};
+
const useDeleteMonitor = () => {
const [isLoading, setIsLoading] = useState(false);
const navigate = useNavigate();
@@ -499,6 +521,7 @@ export {
useFetchUptimeMonitorById,
useFetchHardwareMonitorById,
useCreateMonitor,
+ useFetchGlobalSettings,
useDeleteMonitor,
useUpdateMonitor,
usePauseMonitor,
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index c406b6b40..cde9315aa 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -3,7 +3,6 @@ import { useTheme } from "@emotion/react";
import { useParams } from "react-router-dom";
import { useState, useEffect } from "react";
import { useSelector } from "react-redux";
-
// Utility and Network
import { infrastructureMonitorValidation } from "../../../Validation/validation";
import { useFetchHardwareMonitorById } from "../../../Hooks/monitorHooks";
@@ -11,7 +10,11 @@ import { capitalizeFirstLetter } from "../../../Utils/stringUtils";
import { useTranslation } from "react-i18next";
import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
import NotificationsConfig from "../../../Components/NotificationConfig";
-import { useUpdateMonitor, useCreateMonitor } from "../../../Hooks/monitorHooks";
+import {
+ useUpdateMonitor,
+ useCreateMonitor,
+ useFetchGlobalSettings,
+} from "../../../Hooks/monitorHooks";
// MUI
import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
@@ -65,6 +68,7 @@ const CreateInfrastructureMonitor = () => {
useGetNotificationsByTeamId();
const [updateMonitor, isUpdating] = useUpdateMonitor();
const [createMonitor, isCreating] = useCreateMonitor();
+ const [globalSettings, globalSettingsLoading] = useFetchGlobalSettings();
// State
const [errors, setErrors] = useState({});
@@ -87,35 +91,64 @@ const CreateInfrastructureMonitor = () => {
});
// Populate form fields if editing
+
useEffect(() => {
- if (isCreate || !monitor) return;
+ if (isCreate) {
+ if (globalSettingsLoading) return;
- setInfrastructureMonitor({
- url: monitor.url.replace(/^https?:\/\//, ""),
- name: monitor.name || "",
- notifications: monitor.notifications,
- interval: monitor.interval / MS_PER_MINUTE,
- cpu: monitor.thresholds?.usage_cpu !== undefined,
- usage_cpu: monitor.thresholds?.usage_cpu ? monitor.thresholds.usage_cpu * 100 : "",
+ const gt = globalSettings?.data?.settings?.globalThresholds || {};
- memory: monitor.thresholds?.usage_memory !== undefined,
- usage_memory: monitor.thresholds?.usage_memory
- ? monitor.thresholds.usage_memory * 100
- : "",
+ setHttps(false);
- disk: monitor.thresholds?.usage_disk !== undefined,
- usage_disk: monitor.thresholds?.usage_disk
- ? monitor.thresholds.usage_disk * 100
- : "",
+ setInfrastructureMonitor({
+ url: "",
+ name: "",
+ notifications: [],
+ interval: 0.25,
+ cpu: gt.cpu !== undefined,
+ usage_cpu: gt.cpu !== undefined ? gt.cpu.toString() : "",
+ memory: gt.memory !== undefined,
+ usage_memory: gt.memory !== undefined ? gt.memory.toString() : "",
+ disk: gt.disk !== undefined,
+ usage_disk: gt.disk !== undefined ? gt.disk.toString() : "",
+ temperature: gt.temperature !== undefined,
+ usage_temperature: gt.temperature !== undefined ? gt.temperature.toString() : "",
+ secret: "",
+ });
+ } else if (monitor) {
+ const { thresholds = {} } = monitor;
- temperature: monitor.thresholds?.usage_temperature !== undefined,
- usage_temperature: monitor.thresholds?.usage_temperature
- ? monitor.thresholds.usage_temperature * 100
- : "",
- secret: monitor.secret || "",
- });
- setHttps(monitor.url.startsWith("https"));
- }, [isCreate, monitor]);
+ setHttps(monitor.url.startsWith("https"));
+
+ setInfrastructureMonitor({
+ url: monitor.url.replace(/^https?:\/\//, ""),
+ name: monitor.name || "",
+ notifications: monitor.notifications || [],
+ interval: monitor.interval / MS_PER_MINUTE,
+ cpu: thresholds.usage_cpu !== undefined,
+ usage_cpu:
+ thresholds.usage_cpu !== undefined
+ ? (thresholds.usage_cpu * 100).toString()
+ : "",
+ memory: thresholds.usage_memory !== undefined,
+ usage_memory:
+ thresholds.usage_memory !== undefined
+ ? (thresholds.usage_memory * 100).toString()
+ : "",
+ disk: thresholds.usage_disk !== undefined,
+ usage_disk:
+ thresholds.usage_disk !== undefined
+ ? (thresholds.usage_disk * 100).toString()
+ : "",
+ temperature: thresholds.usage_temperature !== undefined,
+ usage_temperature:
+ thresholds.usage_temperature !== undefined
+ ? (thresholds.usage_temperature * 100).toString()
+ : "",
+ secret: monitor.secret || "",
+ });
+ }
+ }, [isCreate, monitor, globalSettings, globalSettingsLoading]);
// Handlers
const onSubmit = async (event) => {
diff --git a/client/src/Pages/Settings/SettingsGlobalThresholds.jsx b/client/src/Pages/Settings/SettingsGlobalThresholds.jsx
new file mode 100644
index 000000000..acc101ab4
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsGlobalThresholds.jsx
@@ -0,0 +1,95 @@
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import ConfigBox from "../../Components/ConfigBox";
+import TextInput from "../../Components/Inputs/TextInput";
+
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useTranslation } from "react-i18next";
+
+const SettingsGlobalThresholds = ({
+ isAdmin,
+ HEADING_SX,
+ settingsData,
+ setSettingsData,
+}) => {
+ const { t } = useTranslation(); // For language translation
+ const theme = useTheme(); // MUI theme access
+
+ // Handles input change and updates parent state
+ const handleChange = (e, min, max) => {
+ const { name, value } = e.target;
+
+ const numValue = parseFloat(value);
+ const isValidNumber =
+ value === "" ||
+ (!isNaN(numValue) && isFinite(numValue) && numValue >= min && numValue <= max);
+
+ if (isValidNumber) {
+ setSettingsData((prev) => ({
+ ...prev,
+ settings: {
+ ...prev.settings,
+ globalThresholds: {
+ ...prev.settings?.globalThresholds,
+ [name]: value,
+ },
+ },
+ }));
+ }
+ };
+
+ // Only render this section for admins
+ if (!isAdmin) return null;
+
+ return (
+
+ {/* Header and description */}
+
+
+ {t("settingsPage.globalThresholds.title", "Global Thresholds")}
+
+
+ {t(
+ "settingsPage.globalThresholds.description",
+ "Configure global CPU, Memory, Disk, and Temperature thresholds."
+ )}
+
+
+
+ {/* Threshold inputs */}
+
+ {[
+ ["CPU Threshold (%)", "cpu", 1, 100],
+ ["Memory Threshold (%)", "memory", 1, 100],
+ ["Disk Threshold (%)", "disk", 1, 100],
+ ["Temperature Threshold (°C)", "temperature", 1, 150],
+ ].map(([label, name, min, max]) => (
+ handleChange(e, min, max)}
+ />
+ ))}
+
+
+ );
+};
+
+// Prop types
+SettingsGlobalThresholds.propTypes = {
+ isAdmin: PropTypes.bool,
+ HEADING_SX: PropTypes.object,
+ settingsData: PropTypes.object,
+ setSettingsData: PropTypes.func,
+};
+
+export default SettingsGlobalThresholds;
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index dae6bd680..92f58b4c0 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -8,6 +8,7 @@ import SettingsPagespeed from "./SettingsPagespeed";
import SettingsDemoMonitors from "./SettingsDemoMonitors";
import SettingsAbout from "./SettingsAbout";
import SettingsEmail from "./SettingsEmail";
+import SettingsGlobalThresholds from "./SettingsGlobalThresholds";
import Button from "@mui/material/Button";
// Utils
import { settingsValidation } from "../../Validation/validation";
@@ -48,6 +49,7 @@ const Settings = () => {
setIsApiKeySet,
setIsEmailPasswordSet,
});
+
const [addDemoMonitors, isAddingDemoMonitors] = useAddDemoMonitors();
const [isSaving, saveError, saveSettings] = useSaveSettings({
@@ -149,6 +151,7 @@ const Settings = () => {
error.details.forEach((err) => {
newErrors[err.path[0]] = err.message;
});
+
setErrors(newErrors);
}
saveSettings(settingsData?.settings);
@@ -190,6 +193,13 @@ const Settings = () => {
handleChange={handleChange}
errors={errors}
/>
+
+
{
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 584894543..97aa761d1 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -873,6 +873,10 @@
"title": "Display timezone"
},
"title": "Settings",
+ "globalThresholds": {
+ "title": "Global Thresholds",
+ "description": "Configure global CPU, Memory, Disk, and Temperature thresholds. If a value is provided, it will automatically be enabled for monitoring."
+ },
"uiSettings": {
"description": "Switch between light and dark mode, or change user interface language.",
"labelLanguage": "Language",
diff --git a/server/src/db/models/AppSettings.js b/server/src/db/models/AppSettings.js
index cd63118e9..2313d638c 100755
--- a/server/src/db/models/AppSettings.js
+++ b/server/src/db/models/AppSettings.js
@@ -65,6 +65,12 @@ const AppSettingsSchema = mongoose.Schema(
type: Number,
default: 1,
},
+ globalThresholds: {
+ cpu: { type: Number },
+ memory: { type: Number },
+ disk: { type: Number },
+ temperature: { type: Number },
+ },
},
{
timestamps: true,
diff --git a/server/src/validation/joi.js b/server/src/validation/joi.js
index 744b0ec74..f2c15205b 100755
--- a/server/src/validation/joi.js
+++ b/server/src/validation/joi.js
@@ -416,6 +416,15 @@ const updateAppSettingsBodyValidation = joi.object({
systemEmailIgnoreTLS: joi.boolean(),
systemEmailRequireTLS: joi.boolean(),
systemEmailRejectUnauthorized: joi.boolean(),
+
+ globalThresholds: joi
+ .object({
+ cpu: joi.number().min(1).max(100).allow("").optional(),
+ memory: joi.number().min(1).max(100).allow("").optional(),
+ disk: joi.number().min(1).max(100).allow("").optional(),
+ temperature: joi.number().min(1).max(150).allow("").optional(),
+ })
+ .optional(),
});
//****************************************