Update server monitor criteria and request handling for accurate time…

… tracking
OneUptime · Dec 19, 2024 · 282373b · 282373b
1 parent 43faeb6
commit 282373b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts
@@ -61,7 +61,7 @@ export default class ServerMonitorCriteria {
       input.criteriaFilter.evaluateOverTimeOptions
     ) {
       offlineIfNotCheckedInMinutes =
-        input.criteriaFilter.evaluateOverTimeOptions.timeValueInMinutes || 2;
+        input.criteriaFilter.evaluateOverTimeOptions.timeValueInMinutes || 3;
     }
 
     if (

diff --git a/ProbeIngest/API/ServerMonitor.ts b/ProbeIngest/API/ServerMonitor.ts
@@ -15,6 +15,7 @@ import Express, {
 import MonitorResourceUtil from "Common/Server/Utils/Monitor/MonitorResource";
 import Response from "Common/Server/Utils/Response";
 import Monitor from "Common/Models/DatabaseModels/Monitor";
+import OneUptimeDate from "Common/Types/Date";
 
 const router: ExpressRouter = Express.getRouter();
 
@@ -107,6 +108,8 @@ router.post(
 
       serverMonitorResponse.monitorId = monitor.id;
 
+      serverMonitorResponse.requestReceivedAt = OneUptimeDate.getCurrentDate();
+
       // process probe response here.
       const probeApiIngestResponse: ProbeApiIngestResponse =
         await MonitorResourceUtil.monitorResource(serverMonitorResponse);

diff --git a/Worker/Jobs/ServerMonitor/CheckOnlineStatus.ts b/Worker/Jobs/ServerMonitor/CheckOnlineStatus.ts
@@ -16,7 +16,7 @@ RunCron(
   { schedule: EVERY_MINUTE, runOnStartup: false },
   async () => {
     try {
-      const threeMinsAgo: Date = OneUptimeDate.getSomeMinutesAgo(3);
+      const threeMinsAgo: Date = OneUptimeDate.getSomeMinutesAgo(2);
 
       const serverMonitors: Array<Monitor> = await MonitorService.findBy({
         query: {