diff --git a/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureMonitorForm.jsx b/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureMonitorForm.jsx index fa8a6ebe9..f0a701517 100644 --- a/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureMonitorForm.jsx +++ b/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureMonitorForm.jsx @@ -1,4 +1,4 @@ -import { useState } from "react"; +import { useState, useCallback } from "react"; const useInfrastructureMonitorForm = () => { const [infrastructureMonitor, setInfrastructureMonitor] = useState({ url: "", @@ -6,6 +6,8 @@ const useInfrastructureMonitorForm = () => { notifications: [], notify_email: false, interval: 0.25, + statusWindowSize: 5, + statusWindowThreshold: 60, cpu: false, usage_cpu: "", memory: false, @@ -29,9 +31,10 @@ const useInfrastructureMonitorForm = () => { [event.target.name]: event.target.checked, }); }; - const initializeInfrastructureMonitorForCreate = (globalSettings) => { + const initializeInfrastructureMonitorForCreate = useCallback((globalSettings) => { const gt = globalSettings?.data?.settings?.globalThresholds || {}; - setInfrastructureMonitor({ + setInfrastructureMonitor((prev) => ({ + ...prev, url: "", name: "", notifications: [], @@ -45,17 +48,20 @@ const useInfrastructureMonitorForm = () => { temperature: gt.temperature !== undefined, usage_temperature: gt.temperature !== undefined ? gt.temperature.toString() : "", secret: "", - }); - }; + })); + }, []); - const initializeInfrastructureMonitorForUpdate = (monitor) => { + const initializeInfrastructureMonitorForUpdate = useCallback((monitor) => { const MS_PER_MINUTE = 60000; const { thresholds = {} } = monitor; - setInfrastructureMonitor({ + setInfrastructureMonitor((prev) => ({ + ...prev, url: monitor.url.replace(/^https?:\/\//, ""), name: monitor.name || "", notifications: monitor.notifications || [], interval: monitor.interval / MS_PER_MINUTE, + statusWindowSize: monitor.statusWindowSize, + statusWindowThreshold: monitor.statusWindowThreshold, cpu: thresholds.usage_cpu !== undefined, usage_cpu: thresholds.usage_cpu !== undefined ? (thresholds.usage_cpu * 100).toString() : "", @@ -75,8 +81,8 @@ const useInfrastructureMonitorForm = () => { ? (thresholds.usage_temperature * 100).toString() : "", secret: monitor.secret || "", - }); - }; + })); + }, []); return { infrastructureMonitor, setInfrastructureMonitor, diff --git a/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx b/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx index da564ae7c..9b3ee0d04 100644 --- a/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx +++ b/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx @@ -12,6 +12,8 @@ const useInfrastructureSubmit = () => { ? infrastructureMonitor.url : infrastructureMonitor.name, interval: infrastructureMonitor.interval * MS_PER_MINUTE, + statusWindowSize: infrastructureMonitor.statusWindowSize, + statusWindowThreshold: infrastructureMonitor.statusWindowThreshold, cpu: infrastructureMonitor.cpu, ...(infrastructureMonitor.cpu ? { usage_cpu: infrastructureMonitor.usage_cpu } diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx index 28007c538..a9d16c926 100644 --- a/client/src/Pages/Infrastructure/Create/index.jsx +++ b/client/src/Pages/Infrastructure/Create/index.jsx @@ -86,7 +86,14 @@ const CreateInfrastructureMonitor = () => { setHttps(monitor.url.startsWith("https")); initializeInfrastructureMonitorForUpdate(monitor); } - }, [isCreate, monitor, globalSettings, globalSettingsLoading]); + }, [ + isCreate, + monitor, + globalSettings, + globalSettingsLoading, + initializeInfrastructureMonitorForCreate, + initializeInfrastructureMonitorForUpdate, + ]); // Handlers const onSubmit = async (event) => { @@ -281,6 +288,39 @@ const CreateInfrastructureMonitor = () => { setNotifications={infrastructureMonitor.notifications} /> + + + + {t("createMonitorPage.incidentConfigTitle")} + + + {t("createMonitorPage.incidentConfigDescription")} + + + + + + +