github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

fix(monitor): normalize disk paths when matching disk metrics (handle backslashes, trailing slashes and root path)

Browse Source
This commit is contained in:
Nawaz Dhandala
2025-11-05 17:47:33 +00:00
parent 8be7b68faf
commit 1a3301e715
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts
View File

@@ -84,6 +84,25 @@ export default class ServerMonitorCriteria {
`Offline if not checked in minutes: ${offlineIfNotCheckedInMinutes}`,
);
const normalizeDiskPath: (value: string | undefined | null) => string = (
value: string | undefined | null,
): string => {
let normalized: string = (value || "").trim().toLowerCase();
if (normalized === "/") {
return normalized;
}
normalized = normalized.replace(/\\/g, "/");
normalized = normalized.replace(/\/+$/g, "");
if (normalized === "") {
return "/";
}
return normalized;
};
if (
input.criteriaFilter.checkOn === CheckOn.IsOnline &&
differenceInMinutes >= offlineIfNotCheckedInMinutes
@@ -169,13 +188,13 @@ export default class ServerMonitorCriteria {
const diskPath: string =
input.criteriaFilter.serverMonitorOptions?.diskPath || "/";
const normalizedDiskPath: string = normalizeDiskPath(diskPath);
const diskMetric: BasicDiskMetrics | undefined = (
input.dataToProcess as ServerMonitorResponse
).basicInfrastructureMetrics?.diskMetrics.find(
(item: BasicDiskMetrics) => {
return (
item.diskPath.trim().toLowerCase() === diskPath.trim().toLowerCase()
);
return normalizeDiskPath(item.diskPath) === normalizedDiskPath;
},
);