Refactor MonitorResourceUtil to support ExecutionTime metric in synth…

…etic monitors
OneUptime · Oct 29, 2024 · 9b35836 · 9b35836
1 parent 809f9a3
commit 9b35836
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 4 deletions.
diff --git a/Common/Server/Utils/Monitor/MonitorResource.ts b/Common/Server/Utils/Monitor/MonitorResource.ts
@@ -674,6 +674,36 @@ export default class MonitorResourceUtil {
       itemsToSave.push(monitorMetricsByMinute);
     }
 
+    if (
+      (data.dataToProcess as ProbeMonitorResponse) &&
+      (data.dataToProcess as ProbeMonitorResponse).syntheticMonitorResponse &&
+      (
+        (data.dataToProcess as ProbeMonitorResponse).syntheticMonitorResponse ||
+        []
+      ).length > 0
+    ) {
+      for (const syntheticMonitorResponse of (
+        data.dataToProcess as ProbeMonitorResponse
+      ).syntheticMonitorResponse || []) {
+        const monitorMetricsByMinute: MonitorMetricsByMinute =
+          new MonitorMetricsByMinute();
+        monitorMetricsByMinute.monitorId = data.monitorId;
+        monitorMetricsByMinute.projectId = data.projectId;
+        monitorMetricsByMinute.metricType = CheckOn.ExecutionTime;
+        monitorMetricsByMinute.metricValue =
+          syntheticMonitorResponse.executionTimeInMS;
+        monitorMetricsByMinute.miscData = {
+          probeId: (
+            data.dataToProcess as ProbeMonitorResponse
+          ).probeId.toString(),
+          browserType: syntheticMonitorResponse.browserType,
+          screenSizeType: syntheticMonitorResponse.screenSizeType,
+        };
+
+        itemsToSave.push(monitorMetricsByMinute);
+      }
+    }
+
     if ((data.dataToProcess as ProbeMonitorResponse).responseTimeInMs) {
       const monitorMetricsByMinute: MonitorMetricsByMinute =
         new MonitorMetricsByMinute();

diff --git a/Common/Types/Monitor/CriteriaFilter.ts b/Common/Types/Monitor/CriteriaFilter.ts
@@ -166,7 +166,10 @@ export class CriteriaFilterUtil {
         CheckOn.CPUUsagePercent,
         CheckOn.MemoryUsagePercent,
       ];
-    } else if (monitorType === MonitorType.CustomJavaScriptCode) {
+    } else if (
+      monitorType === MonitorType.CustomJavaScriptCode ||
+      monitorType === MonitorType.SyntheticMonitor
+    ) {
       return [CheckOn.ExecutionTime];
     }
     return [];

diff --git a/Dashboard/src/Components/Monitor/MonitorCharts/MonitorChart.tsx b/Dashboard/src/Components/Monitor/MonitorCharts/MonitorChart.tsx
@@ -89,9 +89,11 @@ export class MonitorCharts {
     miscData: MonitorMetricsMiscData | undefined;
     probes: Array<Probe>;
   }): string {
+    let seriesName: string = data.checkOn;
+
     if (data.miscData) {
       if (data.miscData.diskPath) {
-        return data.miscData.diskPath;
+        seriesName = data.miscData.diskPath;
       }
 
       if (data.miscData.probeId) {
@@ -100,12 +102,20 @@ export class MonitorCharts {
         });
 
         if (probe) {
-          return probe.name || "Probe";
+          seriesName = probe.name || "Probe";
         }
       }
+
+      if (data.miscData.browserType) {
+        seriesName += " " + data.miscData.browserType;
+      }
+
+      if (data.miscData.screenSizeType) {
+        seriesName += " (" + data.miscData.screenSizeType + ")";
+      }
     }
 
-    return data.checkOn;
+    return seriesName;
   }
 
   public static getChartData(data: {