From ccc9faa89289498a62208b8aedc66a76523e3a40 Mon Sep 17 00:00:00 2001 From: Owaise Imdad Date: Sun, 8 Jun 2025 00:13:47 +0530 Subject: [PATCH 1/3] Feature for adding capture version on the deatils page. --- client/src/Components/MonitorStatusHeader/index.jsx | 10 +++++++++- .../Details/Hooks/useHardwareMonitorsFetch.jsx | 1 - server/db/models/HardwareCheck.js | 10 ++++++++++ server/service/statusService.js | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx index edadfb8df..1f0189cae 100644 --- a/client/src/Components/MonitorStatusHeader/index.jsx +++ b/client/src/Components/MonitorStatusHeader/index.jsx @@ -36,7 +36,15 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => { - Checking every {formatDurationRounded(monitor?.interval)}. + Checking every {formatDurationRounded(monitor?.interval)}{" "} + {monitor?.stats?.aggregateData?.latestCheck?.capture?.version && ( + <> + {" "} + with Capture agent{" "} + {monitor.stats.aggregateData.latestCheck.capture.version} + + )} + . diff --git a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx index 30a54eef0..f7cb2abb1 100644 --- a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx +++ b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx @@ -17,7 +17,6 @@ const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => { monitorId: monitorId, dateRange: dateRange, }); - response.data.data; setMonitor(response.data.data); } catch (error) { setNetworkError(true); diff --git a/server/db/models/HardwareCheck.js b/server/db/models/HardwareCheck.js index 76b9dfc2e..bda9f693c 100755 --- a/server/db/models/HardwareCheck.js +++ b/server/db/models/HardwareCheck.js @@ -35,6 +35,11 @@ const errorSchema = mongoose.Schema({ err: { type: String, default: "" }, }); +const captureSchema = mongoose.Schema({ + version: { type: String, default: "" }, + mode: { type: String, default: "" }, +}); + const HardwareCheckSchema = mongoose.Schema( { ...BaseCheckSchema.obj, @@ -59,6 +64,11 @@ const HardwareCheckSchema = mongoose.Schema( type: [errorSchema], default: () => [], }, + + capture: { + type: captureSchema, + default: () => ({}), + }, }, { timestamps: true } ); diff --git a/server/service/statusService.js b/server/service/statusService.js index a53552717..edb58ad0d 100755 --- a/server/service/statusService.js +++ b/server/service/statusService.js @@ -254,6 +254,7 @@ class StatusService { check.disk = disk ?? {}; check.host = host ?? {}; check.errors = errors ?? []; + check.capture = payload?.capture ?? {}; } return check; }; From 3886617b11e0ae41e801f63c7ef177c98d362b06 Mon Sep 17 00:00:00 2001 From: Owaise Imdad Date: Sun, 8 Jun 2025 17:32:45 +0530 Subject: [PATCH 2/3] Fix formatted the files. --- client/src/Pages/Settings/index.jsx | 4 ++-- client/src/Pages/Uptime/Create/index.jsx | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx index f7271e6db..dd0135edb 100644 --- a/client/src/Pages/Settings/index.jsx +++ b/client/src/Pages/Settings/index.jsx @@ -205,7 +205,7 @@ const Settings = () => { bottom: 0, boxShadow: theme.shape.boxShadow, zIndex: 1000, - mt : 3, + mt: 3, backgroundColor: theme.palette.primary.main, display: "flex", justifyContent: "flex-end", @@ -216,7 +216,7 @@ const Settings = () => { border: 1, borderStyle: "solid", borderColor: theme.palette.primary.lowContrast, - borderRadius: theme.spacing(2) + borderRadius: theme.spacing(2), }} >