refactor: Update import statements for ProbeMonitor and ServerMonitor to use ProbeMonitorResponse and ServerMonitorResponse

2026-04-06 00:32:12 +02:00 · 2024-08-04 19:56:45 -06:00
parent 29764ae7c7
commit 13b1998261
18 changed files with 83 additions and 82 deletions
--- a/App/FeatureSet/Workers/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts
+++ b/App/FeatureSet/Workers/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts
@@ -6,7 +6,7 @@ import MonitorType from "Common/Types/Monitor/MonitorType";
 import { EVERY_MINUTE } from "Common/Utils/CronTime";
 import MonitorService from "CommonServer/Services/MonitorService";
 import logger from "CommonServer/Utils/Logger";
-import MonitorService from "CommonServer/Utils/Monitor/Monitor";
+import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Monitor from "Model/Models/Monitor";

 RunCron(
@@ -67,7 +67,7 @@ RunCron(
          onlyCheckForIncomingRequestReceivedAt: true,
        };

-        await MonitorResourceService.monitorResource(incomingRequest);
+        await MonitorResourceUtil.monitorResource(incomingRequest);
      } catch (error) {
        logger.error(
          `Error while processing incoming request monitor: ${monitor.id?.toString()}`,
--- a/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts
+++ b/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts
@@ -3,12 +3,12 @@ import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import OneUptimeDate from "Common/Types/Date";
 import { CheckOn } from "Common/Types/Monitor/CriteriaFilter";
 import MonitorType from "Common/Types/Monitor/MonitorType";
-import ServerMonitor from "Common/Types/Monitor/ServerMonitor/ServerMonitor";
+import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import { EVERY_MINUTE } from "Common/Utils/CronTime";
 import MonitorService from "CommonServer/Services/MonitorService";
 import QueryHelper from "CommonServer/Types/Database/QueryHelper";
 import logger from "CommonServer/Utils/Logger";
-import MonitorService from "CommonServer/Utils/Monitor/Monitor";
+import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Monitor from "Model/Models/Monitor";

 RunCron(
@@ -48,7 +48,7 @@ RunCron(
          continue;
        }

-        const serverMonitor: ServerMonitor = {
+        const serverMonitorResponse: ServerMonitorResponse = {
          monitorId: monitor.id!,
          onlyCheckRequestReceivedAt: true,
          requestReceivedAt:
@@ -56,9 +56,10 @@ RunCron(
          hostname: "",
        };

-        await MonitorResourceService.monitorResource(
-          serverMonitor,
+        await MonitorResourceUtil.monitorResource(
+          serverMonitorResponse,
        );
+        
      } catch (error) {
        logger.error(
          `Error in ServerMonitor:CheckOnlineStatus for monitorId: ${monitor.id}`,
--- a/App/FeatureSet/Workers/Jobs/TelemetryMonitor/MonitorTelemetryMonitor.ts
+++ b/App/FeatureSet/Workers/Jobs/TelemetryMonitor/MonitorTelemetryMonitor.ts
@@ -7,7 +7,7 @@ import { EVERY_MINUTE } from "Common/Utils/CronTime";
 import MonitorService from "CommonServer/Services/MonitorService";
 import QueryHelper from "CommonServer/Types/Database/QueryHelper";
 import logger from "CommonServer/Utils/Logger";
-import MonitorResourceService from "CommonServer/Utils/Monitor/MonitorResource";
+import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Monitor from "Model/Models/Monitor";
 import CronTab from "CommonServer/Utils/CronTab";

@@ -98,7 +98,7 @@ RunCron(
          onlyCheckForIncomingRequestReceivedAt: true,
        };

-        await MonitorResourceService.monitorResource(incomingRequest);
+        await MonitorResourceUtil.monitorResource(incomingRequest);
      } catch (error) {
        logger.error(
          `Error while processing incoming request monitor: ${monitor.id?.toString()}`,
--- a/Dashboard/src/Components/Monitor/SummaryView/CustomMonitorSummaryView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/CustomMonitorSummaryView.tsx
@@ -1,5 +1,5 @@
 import OneUptimeDate from "Common/Types/Date";
-import CustomCodeMonitor from "Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitor";
+import CustomCodeMonitorResponse from "Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse";
 import Button, { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
 import Detail from "CommonUI/src/Components/Detail/Detail";
 import Field from "CommonUI/src/Components/Detail/Field";
@@ -9,7 +9,7 @@ import FieldType from "CommonUI/src/Components/Types/FieldType";
 import React, { FunctionComponent, ReactElement } from "react";

 export interface ComponentProps {
-  customCodeMonitor: CustomCodeMonitor;
+  customCodeMonitor: CustomCodeMonitorResponse;
  moreDetailElement?: ReactElement;
  monitoredAt: Date;
 }
@@ -25,7 +25,7 @@ const CustomCodeMonitorSummaryView: FunctionComponent<ComponentProps> = (

  const [showMoreDetails, setShowMoreDetails] = React.useState<boolean>(false);

-  const customMonitor: CustomCodeMonitor =
+  const customMonitor: CustomCodeMonitorResponse =
    props.customCodeMonitor;

  let executionTimeInMS: number = customMonitor.executionTimeInMS || 0;
@@ -34,7 +34,7 @@ const CustomCodeMonitorSummaryView: FunctionComponent<ComponentProps> = (
    executionTimeInMS = Math.round(executionTimeInMS);
  }

-  const fields: Array<Field<CustomCodeMonitor>> = [];
+  const fields: Array<Field<CustomCodeMonitorResponse>> = [];

  if (
    customMonitor.logMessages &&
@@ -95,7 +95,7 @@ const CustomCodeMonitorSummaryView: FunctionComponent<ComponentProps> = (

        {showMoreDetails && (
          <div>
-            <Detail<CustomCodeMonitor>
+            <Detail<CustomCodeMonitorResponse>
              id={"custom-code-monitor-summary-detail"}
              item={customMonitor}
              fields={fields}
--- a/Dashboard/src/Components/Monitor/SummaryView/PingMonitorView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/PingMonitorView.tsx
@@ -1,10 +1,10 @@
 import OneUptimeDate from "Common/Types/Date";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import InfoCard from "CommonUI/src/Components/InfoCard/InfoCard";
 import React, { FunctionComponent, ReactElement } from "react";

 export interface ComponentProps {
-  probeMonitor: ProbeMonitor;
+  probeMonitor: ProbeMonitorResponse;
 }

 const PingMonitorView: FunctionComponent<ComponentProps> = (
--- a/Dashboard/src/Components/Monitor/SummaryView/SSLCertificateMonitorView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/SSLCertificateMonitorView.tsx
@@ -1,13 +1,13 @@
 import OneUptimeDate from "Common/Types/Date";
-import SslMonitor from "Common/Types/Monitor/SSLMonitor/SslMonitor";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import SslMonitorResponse from "Common/Types/Monitor/SSLMonitor/SslMonitorResponse";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import Button, { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
 import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
 import InfoCard from "CommonUI/src/Components/InfoCard/InfoCard";
 import React, { FunctionComponent, ReactElement } from "react";

 export interface ComponentProps {
-  probeMonitor: ProbeMonitor;
+  probeMonitor: ProbeMonitorResponse;
 }

 const SSLCertificateMonitorView: FunctionComponent<ComponentProps> = (
@@ -19,7 +19,7 @@ const SSLCertificateMonitorView: FunctionComponent<ComponentProps> = (
    );
  }

-  const sslResponse: SslMonitor =
+  const sslResponse: SslMonitorResponse =
    props.probeMonitor.sslResponse;

  const [showMoreDetails, setShowMoreDetails] = React.useState<boolean>(false);
--- a/Dashboard/src/Components/Monitor/SummaryView/ServerMonitorView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/ServerMonitorView.tsx
@@ -1,6 +1,6 @@
 import OneUptimeDate from "Common/Types/Date";
 import { BasicDiskMetrics } from "Common/Types/Infrastructure/BasicMetrics";
-import ServerMonitor from "Common/Types/Monitor/ServerMonitor/ServerMonitor";
+import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import Button, { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
 import Detail from "CommonUI/src/Components/Detail/Detail";
 import Field from "CommonUI/src/Components/Detail/Field";
@@ -12,7 +12,7 @@ import MemoryUtil from "Common/Utils/Memory";
 import NumberUtil from "Common/Utils/Number";

 export interface ComponentProps {
-  serverMonitor: ServerMonitor;
+  serverMonitorResponse: ServerMonitorResponse;
 }

 const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
@@ -20,9 +20,9 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
 ): ReactElement => {
  const [showMoreDetails, setShowMoreDetails] = React.useState<boolean>(false);

-  const fields: Array<Field<ServerMonitor>> = [];
+  const fields: Array<Field<ServerMonitorResponse>> = [];

-  if (props.serverMonitor?.processes) {
+  if (props.serverMonitorResponse?.processes) {
    fields.push({
      key: "processes",
      title: "Processes",
@@ -38,9 +38,9 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
          className="w-1/2 shadow-none border-2 border-gray-100 "
          title="CPU % Used"
          value={
-            props.serverMonitor?.basicInfrastructureMetrics?.cpuMetrics?.percentUsed?.toString()
+            props.serverMonitorResponse?.basicInfrastructureMetrics?.cpuMetrics?.percentUsed?.toString()
              ? NumberUtil.convertToTwoDecimalPlaces(
-                  props.serverMonitor.basicInfrastructureMetrics
+                  props.serverMonitorResponse.basicInfrastructureMetrics
                    .cpuMetrics.percentUsed,
                ).toString()
              : "-"
@@ -50,7 +50,7 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
          className="w-1/2 shadow-none border-2 border-gray-100 "
          title="CPU Cores"
          value={
-            props.serverMonitor?.basicInfrastructureMetrics?.cpuMetrics?.cores?.toString() ||
+            props.serverMonitorResponse?.basicInfrastructureMetrics?.cpuMetrics?.cores?.toString() ||
            "-" ||
            "-"
          }
@@ -66,9 +66,9 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
          className="w-1/3 shadow-none border-2 border-gray-100 "
          title="Total Memory (GB)"
          value={
-            props.serverMonitor?.basicInfrastructureMetrics?.memoryMetrics?.total?.toString()
+            props.serverMonitorResponse?.basicInfrastructureMetrics?.memoryMetrics?.total?.toString()
              ? MemoryUtil.convertToGb(
-                  props.serverMonitor.basicInfrastructureMetrics
+                  props.serverMonitorResponse.basicInfrastructureMetrics
                    .memoryMetrics.total,
                ).toString()
              : "-"
@@ -78,9 +78,9 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
          className="w-1/3 shadow-none border-2 border-gray-100 "
          title="Memory % Used"
          value={
-            props.serverMonitor?.basicInfrastructureMetrics?.memoryMetrics?.percentUsed?.toString()
+            props.serverMonitorResponse?.basicInfrastructureMetrics?.memoryMetrics?.percentUsed?.toString()
              ? NumberUtil.convertToTwoDecimalPlaces(
-                  props.serverMonitor.basicInfrastructureMetrics
+                  props.serverMonitorResponse.basicInfrastructureMetrics
                    .memoryMetrics.percentUsed,
                ).toString()
              : "-"
@@ -90,9 +90,9 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
          className="w-1/3 shadow-none border-2 border-gray-100 "
          title="Memory % Free"
          value={
-            props.serverMonitor?.basicInfrastructureMetrics?.memoryMetrics?.percentFree?.toString()
+            props.serverMonitorResponse?.basicInfrastructureMetrics?.memoryMetrics?.percentFree?.toString()
              ? NumberUtil.convertToTwoDecimalPlaces(
-                  props.serverMonitor.basicInfrastructureMetrics
+                  props.serverMonitorResponse.basicInfrastructureMetrics
                    .memoryMetrics.percentFree,
                ).toString()
              : "-"
@@ -104,7 +104,7 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (

  const getDiskMetrics: GetReactElementFunction = (): ReactElement => {
    const diskMetrics: Array<BasicDiskMetrics> | undefined =
-      props.serverMonitor?.basicInfrastructureMetrics?.diskMetrics;
+      props.serverMonitorResponse?.basicInfrastructureMetrics?.diskMetrics;

    if (!diskMetrics) {
      return <div></div>;
@@ -162,45 +162,45 @@ const ServerMonitorSummaryView: FunctionComponent<ComponentProps> = (
        <InfoCard
          className="w-1/2 shadow-none border-2 border-gray-100 "
          title="Hostname"
-          value={props.serverMonitor?.hostname || "-"}
+          value={props.serverMonitorResponse?.hostname || "-"}
        />
        <InfoCard
          className="w-1/2 shadow-none border-2 border-gray-100 "
          title="Last Ping At"
          value={
-            props.serverMonitor?.requestReceivedAt
+            props.serverMonitorResponse?.requestReceivedAt
              ? OneUptimeDate.getDateAsLocalFormattedString(
-                  props.serverMonitor.requestReceivedAt,
+                  props.serverMonitorResponse.requestReceivedAt,
                )
              : "-"
          }
        />
      </div>

-      {props.serverMonitor.failureCause && (
+      {props.serverMonitorResponse.failureCause && (
        <div className="flex space-x-3">
          <InfoCard
            className="w-full shadow-none border-2 border-gray-100 "
            title="Error"
-            value={props.serverMonitor.failureCause?.toString() || "-"}
+            value={props.serverMonitorResponse.failureCause?.toString() || "-"}
          />
        </div>
      )}

      {showMoreDetails && fields.length > 0 && (
        <div>
-          {props.serverMonitor?.basicInfrastructureMetrics
+          {props.serverMonitorResponse?.basicInfrastructureMetrics
            ?.cpuMetrics && getCpuMetrics()}

-          {props.serverMonitor?.basicInfrastructureMetrics
+          {props.serverMonitorResponse?.basicInfrastructureMetrics
            ?.memoryMetrics && getMemoryMetrics()}

-          {props.serverMonitor?.basicInfrastructureMetrics
+          {props.serverMonitorResponse?.basicInfrastructureMetrics
            ?.diskMetrics && getDiskMetrics()}

-          <Detail<ServerMonitor>
+          <Detail<ServerMonitorResponse>
            id={"website-monitor-summary-detail"}
-            item={props.serverMonitor}
+            item={props.serverMonitorResponse}
            fields={fields}
            showDetailsInNumberOfColumns={1}
          />
--- a/Dashboard/src/Components/Monitor/SummaryView/Summary.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/Summary.tsx
@@ -1,11 +1,11 @@
-import ServerMonitor from "Common/Types/Monitor/ServerMonitor/ServerMonitor";
+import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import ProbePicker from "./ProbePicker";
 import SummaryInfo from "./SummaryInfo";
 import IncomingMonitorRequest from "Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest";
 import MonitorType, {
  MonitorTypeHelper,
 } from "Common/Types/Monitor/MonitorType";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import Card from "CommonUI/src/Components/Card/Card";
 import { MonitorStepProbeResponse } from "Model/Models/MonitorProbe";
 import Probe from "Model/Models/Probe";
@@ -14,7 +14,7 @@ import React, { FunctionComponent, ReactElement, useEffect } from "react";
 export interface ComponentProps {
  probeMonitors?: Array<MonitorStepProbeResponse> | undefined;
  incomingMonitorRequest?: IncomingMonitorRequest | undefined;
-  serverMonitor?: ServerMonitor | undefined;
+  serverMonitor?: ServerMonitorResponse | undefined;
  probes?: Array<Probe>;
  monitorType: MonitorType;
 }
@@ -38,13 +38,13 @@ const Summary: FunctionComponent<ComponentProps> = (
    return <></>;
  }

-  const probeResponses: Array<ProbeMonitor> = [];
+  const probeResponses: Array<ProbeMonitorResponse> = [];

  for (const probeResponse of props.probeMonitors || []) {
    for (const monitorStepId in probeResponse) {
-      const probeMonitor: ProbeMonitor = probeResponse[
+      const probeMonitor: ProbeMonitorResponse = probeResponse[
        monitorStepId
-      ] as ProbeMonitor;
+      ] as ProbeMonitorResponse;
      if (
        probeMonitor.probeId?.toString() ===
        selectedProbe?.id?.toString()
--- a/Dashboard/src/Components/Monitor/SummaryView/SummaryInfo.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/SummaryInfo.tsx
@@ -1,4 +1,4 @@
-import ServerMonitor from "Common/Types/Monitor/ServerMonitor/ServerMonitor";
+import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import IncomingRequestMonitorView from "./IncomingRequestMonitorSummaryView";
 import PingMonitorView from "./PingMonitorView";
 import SSLCertificateMonitorView from "./SSLCertificateMonitorView";
@@ -9,27 +9,27 @@ import IncomingMonitorRequest from "Common/Types/Monitor/IncomingMonitor/Incomin
 import MonitorType, {
  MonitorTypeHelper,
 } from "Common/Types/Monitor/MonitorType";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
 import React, { FunctionComponent, ReactElement } from "react";

 export interface ComponentProps {
  monitorType: MonitorType;
-  probeMonitors?: Array<ProbeMonitor> | undefined; // this is an array because of multiple monitor steps.
+  probeMonitors?: Array<ProbeMonitorResponse> | undefined; // this is an array because of multiple monitor steps.
  incomingMonitorRequest?: IncomingMonitorRequest | undefined;
-  serverMonitor?: ServerMonitor | undefined;
+  serverMonitorResponse?: ServerMonitorResponse | undefined;
 }

 const SummaryInfo: FunctionComponent<ComponentProps> = (
  props: ComponentProps,
 ): ReactElement => {
  type GetProbeableMonitorSummarysInfo = (
-    probeMonitor: ProbeMonitor,
+    probeMonitor: ProbeMonitorResponse,
    key: number,
  ) => ReactElement;

  const getProbableMonitorSummarysInfo: GetProbeableMonitorSummarysInfo = (
-    probeMonitor: ProbeMonitor,
+    probeMonitor: ProbeMonitorResponse,
    key: number,
  ): ReactElement => {
    if (!probeMonitor) {
@@ -118,7 +118,7 @@ const SummaryInfo: FunctionComponent<ComponentProps> = (
    <div>
      {props.probeMonitors &&
        props.probeMonitors.map(
-          (probeMonitor: ProbeMonitor, index: number) => {
+          (probeMonitor: ProbeMonitorResponse, index: number) => {
            return getProbableMonitorSummarysInfo(probeMonitor, index);
          },
        )}
@@ -133,9 +133,9 @@ const SummaryInfo: FunctionComponent<ComponentProps> = (
      )}

      {props.monitorType === MonitorType.Server &&
-      props.serverMonitor ? (
+      props.serverMonitorResponse ? (
        <ServerMonitorSummaryView
-          serverMonitor={props.serverMonitor}
+        serverMonitorResponse={props.serverMonitorResponse}
        />
      ) : (
        <></>
--- a/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorItemView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorItemView.tsx
@@ -1,12 +1,12 @@
 import CustomCodeMonitorSummaryView from "./CustomMonitorSummaryView";
 import SummaryScreenshotGroup from "./ScreenshotGroup";
-import SyntheticMonitor from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitor";
+import SyntheticMonitorResponse from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitorResponse";
 import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
 import { GetReactElementFunction } from "CommonUI/src/Types/FunctionTypes";
 import React, { FunctionComponent, ReactElement } from "react";

 export interface ComponentProps {
-  syntheticMonitor: SyntheticMonitor;
+  syntheticMonitor: SyntheticMonitorResponse;
  monitoredAt: Date;
 }

@@ -19,7 +19,7 @@ const SyntheticMonitorItemView: FunctionComponent<ComponentProps> = (
    );
  }

-  const syntheticMonitor: SyntheticMonitor =
+  const syntheticMonitor: SyntheticMonitorResponse =
    props.syntheticMonitor;

  const getMoreDetails: GetReactElementFunction = (): ReactElement => {
--- a/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorView.tsx
@@ -1,12 +1,12 @@
 import SyntheticMonitorItemView from "./SyntheticMonitorItemView";
-import SyntheticMonitor from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitor";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import SyntheticMonitorResponse from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitorResponse";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
 import HorizontalRule from "CommonUI/src/Components/HorizontalRule/HorizontalRule";
 import React, { FunctionComponent, ReactElement } from "react";

 export interface ComponentProps {
-  probeMonitor: ProbeMonitor;
+  probeMonitor: ProbeMonitorResponse;
 }

 const SyntheticMonitorView: FunctionComponent<ComponentProps> = (
@@ -21,7 +21,7 @@ const SyntheticMonitorView: FunctionComponent<ComponentProps> = (
    );
  }

-  const syntheticMonitors: Array<SyntheticMonitor> =
+  const syntheticMonitors: Array<SyntheticMonitorResponse> =
    props.probeMonitor.syntheticMonitor;

  return (
@@ -29,7 +29,7 @@ const SyntheticMonitorView: FunctionComponent<ComponentProps> = (
      {syntheticMonitors &&
        syntheticMonitors.map(
          (
-            syntheticMonitor: SyntheticMonitor,
+            syntheticMonitor: SyntheticMonitorResponse,
            index: number,
          ) => {
            return (
--- a/Dashboard/src/Components/Monitor/SummaryView/WebsiteMonitorView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/WebsiteMonitorView.tsx
@@ -1,5 +1,5 @@
 import OneUptimeDate from "Common/Types/Date";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import Button, { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
 import Detail from "CommonUI/src/Components/Detail/Detail";
 import Field from "CommonUI/src/Components/Detail/Field";
--- a/Dashboard/src/Pages/Monitor/View/Index.tsx
+++ b/Dashboard/src/Pages/Monitor/View/Index.tsx
@@ -21,7 +21,7 @@ import IncomingMonitorRequest from "Common/Types/Monitor/IncomingMonitor/Incomin
 import MonitorType, {
  MonitorTypeHelper,
 } from "Common/Types/Monitor/MonitorType";
-import ServerMonitor from "Common/Types/Monitor/ServerMonitor/ServerMonitor";
+import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import ObjectID from "Common/Types/ObjectID";
 import Alert, { AlertType } from "CommonUI/src/Components/Alerts/Alert";
 import Card from "CommonUI/src/Components/Card/Card";
--- a/Ingestor/API/IncomingRequest.ts
+++ b/Ingestor/API/IncomingRequest.ts
@@ -14,7 +14,7 @@ import Express, {
  NextFunction,
  RequestHandler,
 } from "CommonServer/Utils/Express";
-import MonitorService from "CommonServer/Utils/Monitor/Monitor";
+import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Response from "CommonServer/Utils/Response";
 import Monitor from "Model/Models/Monitor";

@@ -77,7 +77,7 @@ const processIncomingRequest: RequestHandler = async (
    };

    // process probe response here.
-    await MonitorResourceService.monitorResource(incomingRequest);
+    await MonitorResourceUtil.monitorResource(incomingRequest);

    return Response.sendEmptySuccessResponse(req, res);
  } catch (err) {
--- a/Ingestor/API/Probe.ts
+++ b/Ingestor/API/Probe.ts
@@ -6,7 +6,7 @@ import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import ProbeApiIngestResponse from "Common/Types/Probe/ProbeApiIngestResponse";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import ProbeStatusReport from "Common/Types/Probe/ProbeStatusReport";
 import { DisableAutomaticIncidentCreation } from "CommonServer/EnvironmentConfig";
 import GlobalConfigService from "CommonServer/Services/GlobalConfigService";
@@ -20,7 +20,7 @@ import Express, {
  NextFunction,
 } from "CommonServer/Utils/Express";
 import logger from "CommonServer/Utils/Logger";
-import MonitorService from "CommonServer/Utils/Monitor/Monitor";
+import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Response from "CommonServer/Utils/Response";
 import GlobalConfig from "Model/Models/GlobalConfig";
 import Probe from "Model/Models/Probe";
@@ -232,7 +232,7 @@ router.post(
        });
      }

-      const probeResponse: ProbeMonitor = JSONFunctions.deserialize(
+      const probeResponse: ProbeMonitorResponse = JSONFunctions.deserialize(
        req.body["probeMonitor"],
      ) as any;

@@ -240,13 +240,13 @@ router.post(
        return Response.sendErrorResponse(
          req,
          res,
-          new BadDataException("ProbeMonitor not found"),
+          new BadDataException("ProbeMonitorResponse not found"),
        );
      }

      // process probe response here.
      const probeApiIngestResponse: ProbeApiIngestResponse =
-        await MonitorResourceService.monitorResource(probeResponse);
+        await MonitorResourceUtil.monitorResource(probeResponse);

      return Response.sendJsonObjectResponse(req, res, {
        probeApiIngestResponse: probeApiIngestResponse,
--- a/Ingestor/API/ServerMonitor.ts
+++ b/Ingestor/API/ServerMonitor.ts
@@ -2,7 +2,7 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import MonitorType from "Common/Types/Monitor/MonitorType";
-import ServerMonitor from "Common/Types/Monitor/ServerMonitor/ServerMonitor";
+import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import ObjectID from "Common/Types/ObjectID";
 import ProbeApiIngestResponse from "Common/Types/Probe/ProbeApiIngestResponse";
 import MonitorService from "CommonServer/Services/MonitorService";
@@ -12,7 +12,7 @@ import Express, {
  ExpressRouter,
  NextFunction,
 } from "CommonServer/Utils/Express";
-import MonitorService from "CommonServer/Utils/Monitor/Monitor";
+import MonitorResourceUtil from "CommonServer/Utils/Monitor/MonitorResource";
 import Response from "CommonServer/Utils/Response";
 import Monitor from "Model/Models/Monitor";

@@ -92,7 +92,7 @@ router.post(

      // now process this request.

-      const serverMonitor: ServerMonitor =
+      const serverMonitorResponse: ServerMonitorResponse =
        JSONFunctions.deserialize(
          req.body["serverMonitor"] as JSONObject,
        ) as any;
@@ -109,7 +109,7 @@ router.post(

      // process probe response here.
      const probeApiIngestResponse: ProbeApiIngestResponse =
-        await MonitorResourceService.monitorResource(
+        await MonitorResourceUtil.monitorResource(
          serverMonitor,
        );

--- a/Probe/Jobs/Monitor/FetchList.ts
+++ b/Probe/Jobs/Monitor/FetchList.ts
@@ -9,7 +9,7 @@ import URL from "Common/Types/API/URL";
 import OneUptimeDate from "Common/Types/Date";
 import APIException from "Common/Types/Exception/ApiException";
 import { JSONArray } from "Common/Types/JSON";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import Sleep from "Common/Types/Sleep";
 import API from "Common/Utils/API";
 import logger from "CommonServer/Utils/Logger";
--- a/Probe/Utils/Monitors/Monitor.ts
+++ b/Probe/Utils/Monitors/Monitor.ts
@@ -23,7 +23,7 @@ import MonitorType from "Common/Types/Monitor/MonitorType";
 import BrowserType from "Common/Types/Monitor/SyntheticMonitors/BrowserType";
 import SyntheticMonitor from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitor";
 import Port from "Common/Types/Port";
-import ProbeMonitor from "Common/Types/Monitor/Monitor";
+import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import ScreenSizeType from "Common/Types/ScreenSizeType";
 import API from "Common/Utils/API";
 import LocalCache from "CommonServer/Infrastructure/LocalCache";