Merge pull request #956 from hpcc-systems/yadhap/JM-Frequency-increased

Made JM run more often. Removed some code that was interferring with …
hpcc-systems · Nov 25, 2024 · 2b389e4 · 2b389e4
2 parents 872b282 + 6ea11a0
commit 2b389e4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/Tombolo/server/config/monitorings.js b/Tombolo/server/config/monitorings.js
@@ -1,9 +1,9 @@
 // Job Monitoring configuration
-const job_monitoring_interval = 30; // in minutes
+const job_monitoring_interval = 20; // in minutes
 const jobMonitoringConfig = {
   job_monitoring_interval,
-  intermediate_job_monitoring_interval: 10, // in minutes
-  job_punctuality_monitoring_interval: job_monitoring_interval + 10
+  intermediate_job_monitoring_interval: 15, // in minutes
+  job_punctuality_monitoring_interval: 10, // in minutes
 };
 
 

diff --git a/Tombolo/server/jobs/jobMonitoring/monitorJobPunctuality.js b/Tombolo/server/jobs/jobMonitoring/monitorJobPunctuality.js
@@ -165,24 +165,31 @@ const Integrations = models.integrations;
           continue;
         }
 
-        let alertTimePassed = false;
-        let lateByInMinutes = 0;
+        // --------------------------------------------------
+        // let alertTimePassed = false;
+        // let lateByInMinutes = 0;
 
         /* jobLevelSeverity < severityThreshHold means the job is not so severe. 
         We can wait until expected completion time before notifying about unpunctuality */
 
-        if (jobLevelSeverity < severityThreshHold || !severityThreshHold) {
-          alertTimePassed = window.end < window.currentTime;
+        // if (jobLevelSeverity < severityThreshHold || !severityThreshHold) {
+        //   alertTimePassed = window.end < window.currentTime;
 
-          lateByInMinutes = Math.floor(
-            (window.currentTime - window.end) / 60000
-          );
-        } else { 
-          lateByInMinutes = Math.floor(
-            (window.currentTime - window.start) / 60000
-          );
-        }
+        //   lateByInMinutes = Math.floor(
+        //     (window.currentTime - window.end) / 60000
+        //   );
+        // } else { 
+        //   lateByInMinutes = Math.floor(
+        //     (window.currentTime - window.start) / 60000
+        //   );
+        // }
+        // -----------------------------------------------------
+
+           alertTimePassed = window.end < window.currentTime;
 
+           lateByInMinutes = Math.floor(
+             (window.currentTime - window.end) / 60000
+           );
 
         // If the time has not passed, or with in grace period of 10 minutes, continue
         if (!alertTimePassed || lateByInMinutes < 10) {
@@ -196,6 +203,7 @@ const Integrations = models.integrations;
 
         if (jobPunctualityDetails) {
           const { windowStartTime, windowEndTime } = jobPunctualityDetails;
+
           if (
             windowStartTime === window.start.toISOString() &&
             windowEndTime === window.end.toISOString()