Merge pull request #947 from hpcc-systems/yadhap/change-date-format-i…

…n-monitoring-notifications formatted date to locale string on job monitoring notifications
hpcc-systems · Nov 21, 2024 · dc198c4 · dc198c4
2 parents 25addd5 + 2dfb2d9
commit dc198c4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/Tombolo/server/jobs/jobMonitoring/monitorIntermediateStateJobs.js b/Tombolo/server/jobs/jobMonitoring/monitorIntermediateStateJobs.js
@@ -244,6 +244,7 @@ const monitoring_logs = models.monitoring_logs;
                 },
                 jobName: jobName,
                 wuState: wuData.State,
+                wuId: wuData.Wuid,
                 monitoringName,
                 issue: {
                   Issue: _.startCase(notificationDescription),
@@ -253,7 +254,7 @@ const monitoring_logs = models.monitoring_logs;
                   State: wuData.State,
                   "Discovered at": findLocalDateTimeAtCluster(
                     clusterDetail.timezone_offset
-                  ),
+                  ).toLocaleString(),
                 },
                 notificationId: generateNotificationId({
                   notificationPrefix,
@@ -267,10 +268,10 @@ const monitoring_logs = models.monitoring_logs;
                 }, // region: "USA",  product: "Telematics",  domain: "Insurance", severity: 3,
                 firstLogged: findLocalDateTimeAtCluster(
                   clusterDetail.timezone_offset
-                ),
+                ).toLocaleString(),
                 lastLogged: findLocalDateTimeAtCluster(
                   clusterDetail.timezone_offset
-                ),
+                ).toLocaleString(),
               });
 
               // Add notification payload to notificationsToBeQueued

diff --git a/Tombolo/server/jobs/jobMonitoring/monitorJobPunctuality.js b/Tombolo/server/jobs/jobMonitoring/monitorJobPunctuality.js
@@ -315,8 +315,8 @@ const Integrations = models.integrations;
               Issue: `Job not started on expected time`,
               Cluster: clusterInfo.name,
               "Job Name/Filter": jobNamePattern,
-              "Expected Start": window.start,
-              "Current Time": window.currentTime,
+              "Expected Start": (window.start).toLocaleString(),
+              "Current Time": (window.currentTime).toLocaleString(),
             },
             notificationId: generateNotificationId({
               notificationPrefix,
@@ -330,10 +330,10 @@ const Integrations = models.integrations;
             }, // region: "USA",  product: "Telematics",  domain: "Insurance", severity: 3,
             firstLogged: new Date(
               now.getTime() + offSet * 60 * 1000
-            ).toISOString(),
+            ).toLocaleString(),
             lastLogged: new Date(
               now.getTime() + offSet * 60 * 1000
-            ).toISOString(),
+            ).toLocaleString(),
           });
 
           // Queue email notification
@@ -373,6 +373,7 @@ const Integrations = models.integrations;
           );
         }
       } catch (error) {
+        console.log(error);
         logger.error(
           `Error while processing jobs for  punctuality check ${jobMonitoring.id}: ${error.message}`
         );

diff --git a/Tombolo/server/jobs/jobMonitoring/monitorJobs.js b/Tombolo/server/jobs/jobMonitoring/monitorJobs.js
@@ -364,6 +364,7 @@ const monitoring_name = "Job Monitoring";
         recipients: { primaryContacts, secondaryContacts, notifyContacts },
         jobName: jobName,
         wuState: wu.State,
+        wuId : wu.Wuid,
         monitoringName,
         issue: {
           Issue: `Job in ${wu.State} state`,
@@ -372,7 +373,7 @@ const monitoring_name = "Job Monitoring";
           "Returned Job": wu.Jobname,
           "Discovered at": findLocalDateTimeAtCluster(
             clusterInfoObj[clusterId].timezone_offset
-          ),
+          ).toLocaleString(),
           State: wu.State,
         },
         notificationId: generateNotificationId({
@@ -387,10 +388,10 @@ const monitoring_name = "Job Monitoring";
         }, // region: "USA",  product: "Telematics",  domain: "Insurance", severity: 3,
         firstLogged: findLocalDateTimeAtCluster(
           clusterInfoObj[clusterId].timezone_offset
-        ),
+        ).toLocaleString(),
         lastLogged: findLocalDateTimeAtCluster(
           clusterInfoObj[clusterId].timezone_offset
-        ),
+        ).toLocaleString(),
       });
 
       //Create notification queue

diff --git a/Tombolo/server/jobs/jobMonitoring/monitorJobsUtil.js b/Tombolo/server/jobs/jobMonitoring/monitorJobsUtil.js
@@ -560,6 +560,7 @@ const createNotificationPayload = ({
   recipients,
   notificationId,
   asrSpecificMetaData = {}, // region: "USA",  product: "Telematics",  domain: "Insurance", severity: 3,
+  wuId,
   issue,
   firstLogged,
   lastLogged,
@@ -583,6 +584,7 @@ const createNotificationPayload = ({
       issue,
       firstLogged,
       lastLogged,
+      wuId,
       remedy: {
         Instruction:
           "Please contact one of the following to facilitate issue resolution:",

diff --git a/Tombolo/server/notificationTemplates/email/jobMonitoring.ejs b/Tombolo/server/notificationTemplates/email/jobMonitoring.ejs
@@ -93,6 +93,14 @@
             </tr>
             <% }%>
 
+            <% if(typeof wuId !== 'undefined'){ %>
+            <tr class="section-table-td">
+              <td class="section-table-td"> WUID</td>
+              <td class="section-table-td"><%= wuId %> </td>
+            </tr>
+            <% }%>
+
+
             <% if(typeof severity !== 'undefined'){ %>
             <tr class="section-table-td">
               <td class="section-table-td"> Severity</td>