refactor: Update import statements for UserProfile component to use FileUtil.getFileRoute instead of FileUtil.getFileURL

App/FeatureSet/Workers/Jobs/TelemetryMonitor/MonitorTelemetryMonitor.ts

@@ -4,19 +4,19 @@ import LIMIT_MAX, { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import MonitorType from "Common/Types/Monitor/MonitorType";
 import { EVERY_MINUTE } from "Common/Utils/CronTime";
 import MonitorService from "CommonServer/Services/MonitorService";
-import QueryHelper from "CommonServer/Types/AnalyticsDatabase/QueryHelper";
 import logger from "CommonServer/Utils/Logger";
 import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Monitor from "Common/Models/DatabaseModels/Monitor";
 import CronTab from "CommonServer/Utils/CronTab";
 import MonitorStep from "Common/Types/Monitor/MonitorStep";
 import LogMonitorResponse from "Common/Types/Monitor/LogMonitor/LogMonitorResponse";
-import MonitorStepLogMonitor from "Common/Types/Monitor/MonitorStepLogMonitor";
+import MonitorStepLogMonitor, {
+  MonitorStepLogMonitorUtil,
+} from "Common/Types/Monitor/MonitorStepLogMonitor";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import LogService from "CommonServer/Services/LogService";
 import Query from "CommonServer/Types/AnalyticsDatabase/Query";
 import Log from "Common/Models/AnalyticsModels/Log";
-import Search from "Common/Types/BaseDatabase/Search";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import DatabaseQueryHelper from "CommonServer/Types/Database/QueryHelper";
@@ -176,39 +176,7 @@ const monitorLogs: MonitorLogsFunction = async (data: {
     throw new BadDataException("Log query is missing");
   }
 
-  const query: Query<Log> = {};
-
-  if (logQuery.attributes) {
-    query.attributes = logQuery.attributes;
-  }
-
-  if (logQuery.body) {
-    query.body = new Search(logQuery.body);
-  }
-
-  if (logQuery.severityTexts && logQuery.severityTexts.length > 0) {
-    query.severityText = QueryHelper.any(
-      logQuery.severityTexts as Array<string>,
-    );
-  }
-
-  if (logQuery.telemetryServiceIds && logQuery.telemetryServiceIds.length > 0) {
-    query.serviceId = QueryHelper.any(logQuery.telemetryServiceIds);
-  }
-
-  if (!logQuery.lastXSecondsOfLogs) {
-    throw new BadDataException("Last X seconds of logs is missing");
-  }
-
-  const lastXSecondsOfLogs: number = logQuery.lastXSecondsOfLogs;
-
-  const endDate: Date = OneUptimeDate.getCurrentDate();
-  const startDate: Date = OneUptimeDate.addRemoveSeconds(
-    endDate,
-    lastXSecondsOfLogs * -1,
-  );
-
-  query.time = QueryHelper.inBetween(startDate, endDate);
+  const query: Query<Log> = MonitorStepLogMonitorUtil.toQuery(logQuery);
 
   const countLogs: PositiveNumber = await LogService.countBy({
     query: query,

Common/Models/DatabaseModels/Incident.ts

@@ -37,10 +37,14 @@ import {
   ManyToOne,
 } from "typeorm";
 import TelemetryType from "../../Types/Telemetry/TelemetryType";
+import Query from "../../Types/BaseDatabase/Query";
+import Log from "../AnalyticsModels/Log";
+import Span from "../AnalyticsModels/Span";
+import Metric from "../AnalyticsModels/Metric";
 
 export interface TelemetryIncidentQuery {
   telemetryType: TelemetryType;
-  telemetryQuery: JSONObject;
+  telemetryQuery: Query<Log> | Query<Span> | Query<Metric>;
 }
 
 @EnableDocumentation()

CommonServer/Utils/Monitor/MonitorResource.ts

@@ -41,7 +41,9 @@ import ProbeApiIngestResponse from "Common/Types/Probe/ProbeApiIngestResponse";
 import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import Typeof from "Common/Types/Typeof";
 import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
-import Incident from "Common/Models/DatabaseModels/Incident";
+import Incident, {
+  TelemetryIncidentQuery,
+} from "Common/Models/DatabaseModels/Incident";
 import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity";
 import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline";
 import Monitor from "Common/Models/DatabaseModels/Monitor";
@@ -50,6 +52,8 @@ import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTim
 import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy";
 import OneUptimeDate from "Common/Types/Date";
 import LogMonitorCriteria from "./Criteria/LogMonitorCriteria";
+import LogMonitorResponse from "Common/Types/Monitor/LogMonitor/LogMonitorResponse";
+import TelemetryType from "Common/Types/Telemetry/TelemetryType";
 
 export default class MonitorResourceUtil {
   public static async monitorResource(
@@ -333,12 +337,24 @@ export default class MonitorResourceUtil {
         }`,
       );
 
+      let telemetryQuery: TelemetryIncidentQuery | undefined = undefined;
+
+      if (dataToProcess && (dataToProcess as LogMonitorResponse).logQuery) {
+        telemetryQuery = {
+          telemetryQuery: (dataToProcess as LogMonitorResponse).logQuery,
+          telemetryType: TelemetryType.Log,
+        };
+      }
+
       await this.criteriaMetCreateIncidentsAndUpdateMonitorStatus({
         monitor: monitor,
         rootCause: response.rootCause,
         dataToProcess: dataToProcess,
         autoResolveCriteriaInstanceIdIncidentIdsDictionary,
         criteriaInstance: criteriaInstanceMap[response.criteriaMetId!]!,
+        props: {
+          telemetryQuery: telemetryQuery,
+        },
       });
     } else if (
       !response.criteriaMetId &&
@@ -649,6 +665,9 @@ export default class MonitorResourceUtil {
     autoResolveCriteriaInstanceIdIncidentIdsDictionary: Dictionary<
       Array<string>
     >;
+    props: {
+      telemetryQuery?: TelemetryIncidentQuery | undefined;
+    };
   }): Promise<void> {
     // criteria filters are met, now process the actions.
 
@@ -790,6 +809,10 @@ export default class MonitorResourceUtil {
 
         incident.isCreatedAutomatically = true;
 
+        if (input.props.telemetryQuery) {
+          incident.telemetryQuery = input.props.telemetryQuery;
+        }
+
         if (
           input.dataToProcess &&
           (input.dataToProcess as ProbeMonitorResponse).probeId