@oneuptime/common 7.0.3985 → 7.0.3993

package/Server/Services/AlertService.ts

@@ -52,6 +52,8 @@ import Monitor from "../../Models/DatabaseModels/Monitor";
 import MonitorService from "./MonitorService";
 import { MessageBlocksByWorkspaceType } from "./WorkspaceNotificationRuleService";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import MetricType from "../../Models/DatabaseModels/MetricType";
+import Dictionary from "../../Types/Dictionary";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -946,8 +948,8 @@ ${alertSeverity.name}
           name: true,
         },
         alertSeverity: {
-          name: true,
           _id: true,
+          name: true,
         },
       },
       props: {
@@ -960,11 +962,10 @@ ${alertSeverity.name}
     }
 
     if (!alert.projectId) {
-      throw new BadDataException("Incient Project ID not found");
+      throw new BadDataException("Alert Project ID not found");
     }
 
     // get alert state timeline
-
     const alertStateTimelines: Array<AlertStateTimeline> =
       await AlertStateTimelineService.findBy({
         query: {
@@ -993,8 +994,7 @@ ${alertSeverity.name}
     const firstAlertStateTimeline: AlertStateTimeline | undefined =
       alertStateTimelines[0];
 
-    // delete all the alert metrics with this alert id because its a refresh.
-
+    // delete all the alert metrics with this alert id because it's a refresh
     await MetricService.deleteBy({
       query: {
         serviceId: data.alertId,
@@ -1005,9 +1005,9 @@ ${alertSeverity.name}
     });
 
     const itemsToSave: Array<Metric> = [];
+    const metricTypesMap: Dictionary<MetricType> = {};
 
     // now we need to create new metrics for this alert - TimeToAcknowledge, TimeToResolve, AlertCount, AlertDuration
-
     const alertStartsAt: Date =
       firstAlertStateTimeline?.startsAt ||
       alert.createdAt ||
@@ -1019,16 +1019,14 @@ ${alertSeverity.name}
     alertCountMetric.serviceId = alert.id!;
     alertCountMetric.serviceType = ServiceType.Alert;
     alertCountMetric.name = AlertMetricType.AlertCount;
-    alertCountMetric.description = "Number of alerts created";
     alertCountMetric.value = 1;
-    alertCountMetric.unit = "";
     alertCountMetric.attributes = {
       alertId: data.alertId.toString(),
       projectId: alert.projectId.toString(),
-      monitorId: alert.monitor?.id!.toString() || "",
-      monitorName: alert.monitor?.name!.toString() || "",
-      alertSeverityId: alert.alertSeverity?.id!.toString() || "",
-      alertSeverityName: alert.alertSeverity?.name!.toString() || "",
+      monitorId: alert.monitor?._id?.toString(),
+      monitorName: alert.monitor?.name?.toString(),
+      alertSeverityId: alert.alertSeverity?._id?.toString(),
+      alertSeverityName: alert.alertSeverity?.name?.toString(),
     };
 
     alertCountMetric.time = alertStartsAt;
@@ -1039,6 +1037,13 @@ ${alertSeverity.name}
 
     itemsToSave.push(alertCountMetric);
 
+    const metricType: MetricType = new MetricType();
+    metricType.name = alertCountMetric.name;
+    metricType.description = "Number of alerts created";
+    metricType.unit = "";
+    metricType.telemetryServices = [];
+    metricTypesMap[alertCountMetric.name] = metricType;
+
     // is the alert acknowledged?
     const isAlertAcknowledged: boolean = alertStateTimelines.some(
       (timeline: AlertStateTimeline) => {
@@ -1059,20 +1064,17 @@ ${alertSeverity.name}
         timeToAcknowledgeMetric.serviceId = alert.id!;
         timeToAcknowledgeMetric.serviceType = ServiceType.Alert;
         timeToAcknowledgeMetric.name = AlertMetricType.TimeToAcknowledge;
-        timeToAcknowledgeMetric.description =
-          "Time taken to acknowledge the alert";
         timeToAcknowledgeMetric.value = OneUptimeDate.getDifferenceInSeconds(
           ackAlertStateTimeline?.startsAt || OneUptimeDate.getCurrentDate(),
           alertStartsAt,
         );
-        timeToAcknowledgeMetric.unit = "seconds";
         timeToAcknowledgeMetric.attributes = {
           alertId: data.alertId.toString(),
           projectId: alert.projectId.toString(),
-          monitorId: alert.monitor?.id!.toString() || "",
-          monitorName: alert.monitor?.name!.toString() || "",
-          alertSeverityId: alert.alertSeverity?.id!.toString() || "",
-          alertSeverityName: alert.alertSeverity?.name!.toString() || "",
+          monitorId: alert.monitor?._id?.toString(),
+          monitorName: alert.monitor?.name?.toString(),
+          alertSeverityId: alert.alertSeverity?._id?.toString(),
+          alertSeverityName: alert.alertSeverity?.name?.toString(),
         };
 
         timeToAcknowledgeMetric.time =
@@ -1085,6 +1087,12 @@ ${alertSeverity.name}
         timeToAcknowledgeMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(timeToAcknowledgeMetric);
+
+        const metricType: MetricType = new MetricType();
+        metricType.name = timeToAcknowledgeMetric.name;
+        metricType.description = "Time taken to acknowledge the alert";
+        metricType.unit = "seconds";
+        metricTypesMap[timeToAcknowledgeMetric.name] = metricType;
       }
     }
 
@@ -1108,20 +1116,18 @@ ${alertSeverity.name}
         timeToResolveMetric.serviceId = alert.id!;
         timeToResolveMetric.serviceType = ServiceType.Alert;
         timeToResolveMetric.name = AlertMetricType.TimeToResolve;
-        timeToResolveMetric.description = "Time taken to resolve the alert";
         timeToResolveMetric.value = OneUptimeDate.getDifferenceInSeconds(
           resolvedAlertStateTimeline?.startsAt ||
             OneUptimeDate.getCurrentDate(),
           alertStartsAt,
         );
-        timeToResolveMetric.unit = "seconds";
         timeToResolveMetric.attributes = {
           alertId: data.alertId.toString(),
           projectId: alert.projectId.toString(),
-          monitorId: alert.monitor?.id!.toString() || "",
-          monitorName: alert.monitor?.name!.toString() || "",
-          alertSeverityId: alert.alertSeverity?.id!.toString() || "",
-          alertSeverityName: alert.alertSeverity?.name!.toString() || "",
+          monitorId: alert.monitor?._id?.toString(),
+          monitorName: alert.monitor?.name?.toString(),
+          alertSeverityId: alert.alertSeverity?._id?.toString(),
+          alertSeverityName: alert.alertSeverity?.name?.toString(),
         };
 
         timeToResolveMetric.time =
@@ -1134,11 +1140,16 @@ ${alertSeverity.name}
         timeToResolveMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(timeToResolveMetric);
+
+        const metricType: MetricType = new MetricType();
+        metricType.name = timeToResolveMetric.name;
+        metricType.description = "Time taken to resolve the alert";
+        metricType.unit = "seconds";
+        metricTypesMap[timeToResolveMetric.name] = metricType;
       }
     }
 
     // alert duration
-
     const alertDurationMetric: Metric = new Metric();
 
     const lastAlertStateTimeline: AlertStateTimeline | undefined =
@@ -1148,25 +1159,21 @@ ${alertSeverity.name}
       const alertEndsAt: Date =
         lastAlertStateTimeline.startsAt || OneUptimeDate.getCurrentDate();
 
-      // save metric.
-
       alertDurationMetric.projectId = alert.projectId;
       alertDurationMetric.serviceId = alert.id!;
       alertDurationMetric.serviceType = ServiceType.Alert;
       alertDurationMetric.name = AlertMetricType.AlertDuration;
-      alertDurationMetric.description = "Duration of the alert";
       alertDurationMetric.value = OneUptimeDate.getDifferenceInSeconds(
         alertEndsAt,
         alertStartsAt,
       );
-      alertDurationMetric.unit = "seconds";
       alertDurationMetric.attributes = {
         alertId: data.alertId.toString(),
         projectId: alert.projectId.toString(),
-        monitorId: alert.monitor?.id!.toString() || "",
-        monitorName: alert.monitor?.name!.toString() || "",
-        alertSeverityId: alert.alertSeverity?.id!.toString() || "",
-        alertSeverityName: alert.alertSeverity?.name!.toString() || "",
+        monitorId: alert.monitor?._id?.toString(),
+        monitorName: alert.monitor?.name?.toString(),
+        alertSeverityId: alert.alertSeverity?._id?.toString(),
+        alertSeverityName: alert.alertSeverity?.name?.toString(),
       };
 
       alertDurationMetric.time =
@@ -1177,6 +1184,14 @@ ${alertSeverity.name}
         alertDurationMetric.time,
       );
       alertDurationMetric.metricPointType = MetricPointType.Sum;
+
+      itemsToSave.push(alertDurationMetric);
+
+      const metricType: MetricType = new MetricType();
+      metricType.name = alertDurationMetric.name;
+      metricType.description = "Duration of the alert";
+      metricType.unit = "seconds";
+      metricTypesMap[alertDurationMetric.name] = metricType;
     }
 
     await MetricService.createMany({
@@ -1186,14 +1201,21 @@ ${alertSeverity.name}
       },
     });
 
-    // index attributes.
+    // index attributes
     TelemetryUtil.indexAttributes({
-      attributes: ["monitorId", "projectId", "alertId", "monitorNames"],
+      attributes: ["monitorId", "projectId", "alertId", "monitorName"],
       projectId: alert.projectId,
       telemetryType: TelemetryType.Metric,
     }).catch((err: Error) => {
       logger.error(err);
     });
+
+    TelemetryUtil.indexMetricNameServiceNameMap({
+      metricNameServiceNameMap: metricTypesMap,
+      projectId: alert.projectId,
+    }).catch((err: Error) => {
+      logger.error(err);
+    });
   }
 
   @CaptureSpan()

package/Server/Services/IncidentService.ts

@@ -59,6 +59,8 @@ import WorkspaceType from "../../Types/Workspace/WorkspaceType";
 import { MessageBlocksByWorkspaceType } from "./WorkspaceNotificationRuleService";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import { Dictionary } from "lodash";
+import MetricType from "../../Models/DatabaseModels/MetricType";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -1327,15 +1329,15 @@ ${incidentSeverity.name}
       incident.createdAt ||
       OneUptimeDate.getCurrentDate();
 
+    const metricTypesMap: Dictionary<MetricType> = {};
+
     const incidentCountMetric: Metric = new Metric();
 
     incidentCountMetric.projectId = incident.projectId;
     incidentCountMetric.serviceId = incident.id!;
     incidentCountMetric.serviceType = ServiceType.Incident;
     incidentCountMetric.name = IncidentMetricType.IncidentCount;
-    incidentCountMetric.description = "Number of incidents created";
     incidentCountMetric.value = 1;
-    incidentCountMetric.unit = "";
     incidentCountMetric.attributes = {
       incidentId: data.incidentId.toString(),
       projectId: incident.projectId.toString(),
@@ -1359,6 +1361,16 @@ ${incidentSeverity.name}
 
     itemsToSave.push(incidentCountMetric);
 
+    // add metric type for this to map.
+    const metricType: MetricType = new MetricType();
+    metricType.name = incidentCountMetric.name;
+    metricType.description = "Number of incidents created";
+    metricType.unit = "";
+    metricType.telemetryServices = [];
+
+    // add to map.
+    metricTypesMap[incidentCountMetric.name] = metricType;
+
     // is the incident acknowledged?
     const isIncidentAcknowledged: boolean = incidentStateTimelines.some(
       (timeline: IncidentStateTimeline) => {
@@ -1379,13 +1391,10 @@ ${incidentSeverity.name}
         timeToAcknowledgeMetric.serviceId = incident.id!;
         timeToAcknowledgeMetric.serviceType = ServiceType.Incident;
         timeToAcknowledgeMetric.name = IncidentMetricType.TimeToAcknowledge;
-        timeToAcknowledgeMetric.description =
-          "Time taken to acknowledge the incident";
         timeToAcknowledgeMetric.value = OneUptimeDate.getDifferenceInSeconds(
           ackIncidentStateTimeline?.startsAt || OneUptimeDate.getCurrentDate(),
           incidentStartsAt,
         );
-        timeToAcknowledgeMetric.unit = "seconds";
         timeToAcknowledgeMetric.attributes = {
           incidentId: data.incidentId.toString(),
           projectId: incident.projectId.toString(),
@@ -1411,6 +1420,15 @@ ${incidentSeverity.name}
         timeToAcknowledgeMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(timeToAcknowledgeMetric);
+
+        // add metric type for this to map.
+        const metricType: MetricType = new MetricType();
+        metricType.name = timeToAcknowledgeMetric.name;
+        metricType.description = "Time taken to acknowledge the incident";
+        metricType.unit = "seconds";
+
+        // add to map.
+        metricTypesMap[timeToAcknowledgeMetric.name] = metricType;
       }
     }
 
@@ -1434,13 +1452,11 @@ ${incidentSeverity.name}
         timeToResolveMetric.serviceId = incident.id!;
         timeToResolveMetric.serviceType = ServiceType.Incident;
         timeToResolveMetric.name = IncidentMetricType.TimeToResolve;
-        timeToResolveMetric.description = "Time taken to resolve the incident";
         timeToResolveMetric.value = OneUptimeDate.getDifferenceInSeconds(
           resolvedIncidentStateTimeline?.startsAt ||
             OneUptimeDate.getCurrentDate(),
           incidentStartsAt,
         );
-        timeToResolveMetric.unit = "seconds";
         timeToResolveMetric.attributes = {
           incidentId: data.incidentId.toString(),
           projectId: incident.projectId.toString(),
@@ -1466,6 +1482,14 @@ ${incidentSeverity.name}
         timeToResolveMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(timeToResolveMetric);
+
+        // add metric type for this to map.
+        const metricType: MetricType = new MetricType();
+        metricType.name = timeToResolveMetric.name;
+        metricType.description = "Time taken to resolve the incident";
+        metricType.unit = "seconds";
+        // add to map.
+        metricTypesMap[timeToResolveMetric.name] = metricType;
       }
     }
 
@@ -1486,12 +1510,10 @@ ${incidentSeverity.name}
       incidentDurationMetric.serviceId = incident.id!;
       incidentDurationMetric.serviceType = ServiceType.Incident;
       incidentDurationMetric.name = IncidentMetricType.IncidentDuration;
-      incidentDurationMetric.description = "Duration of the incident";
       incidentDurationMetric.value = OneUptimeDate.getDifferenceInSeconds(
         incidentEndsAt,
         incidentStartsAt,
       );
-      incidentDurationMetric.unit = "seconds";
       incidentDurationMetric.attributes = {
         incidentId: data.incidentId.toString(),
         projectId: incident.projectId.toString(),
@@ -1515,6 +1537,17 @@ ${incidentSeverity.name}
         incidentDurationMetric.time,
       );
       incidentDurationMetric.metricPointType = MetricPointType.Sum;
+
+      itemsToSave.push(incidentDurationMetric);
+
+      // add metric type for this to map.
+      const metricType: MetricType = new MetricType();
+      metricType.name = incidentDurationMetric.name;
+      metricType.description = "Duration of the incident";
+      metricType.unit = "seconds";
+
+      // add to map.
+      metricTypesMap[incidentDurationMetric.name] = metricType;
     }
 
     await MetricService.createMany({
@@ -1532,6 +1565,13 @@ ${incidentSeverity.name}
     }).catch((err: Error) => {
       logger.error(err);
     });
+
+    TelemetryUtil.indexMetricNameServiceNameMap({
+      metricNameServiceNameMap: metricTypesMap,
+      projectId: incident.projectId,
+    }).catch((err: Error) => {
+      logger.error(err);
+    });
   }
 
   @CaptureSpan()

package/Server/Utils/Monitor/MonitorResource.ts

@@ -55,6 +55,7 @@ import MetricMonitorCriteria from "./Criteria/MetricMonitorCriteria";
 import MetricMonitorResponse from "../../../Types/Monitor/MetricMonitor/MetricMonitorResponse";
 import FilterCondition from "../../../Types/Filter/FilterCondition";
 import CaptureSpan from "../Telemetry/CaptureSpan";
+import MetricType from "../../../Models/DatabaseModels/MetricType";
 
 export default class MonitorResourceUtil {
   @CaptureSpan()
@@ -621,6 +622,11 @@ export default class MonitorResourceUtil {
 
     const itemsToSave: Array<Metric> = [];
 
+    // Metric name to serviceId map
+    // example: "cpu.usage" -> [serviceId1, serviceId2]
+    // since these are monitor metrics. They dont belong to any service so we can keep the array empty.
+    const metricNameServiceNameMap: Dictionary<MetricType> = {};
+
     if (
       (data.dataToProcess as ServerMonitorResponse).basicInfrastructureMetrics
     ) {
@@ -645,9 +651,9 @@ export default class MonitorResourceUtil {
         monitorMetric.serviceId = data.monitorId;
         monitorMetric.serviceType = ServiceType.Monitor;
         monitorMetric.name = MonitorMetricType.IsOnline;
-        monitorMetric.description = CheckOn.IsOnline + " status for monitor";
+
         monitorMetric.value = isOnline ? 1 : 0;
-        monitorMetric.unit = "";
+
         monitorMetric.attributes = {
           monitorId: data.monitorId.toString(),
           projectId: data.projectId.toString(),
@@ -666,6 +672,15 @@ export default class MonitorResourceUtil {
         monitorMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(monitorMetric);
+
+        // add MetricType
+        const metricType: MetricType = new MetricType();
+        metricType.name = MonitorMetricType.IsOnline;
+        metricType.description = CheckOn.IsOnline + " status for monitor";
+        metricType.unit = "";
+
+        // add to map
+        metricNameServiceNameMap[MonitorMetricType.IsOnline] = metricType;
       }
 
       const basicMetrics: BasicInfrastructureMetrics | undefined = (
@@ -683,9 +698,9 @@ export default class MonitorResourceUtil {
         monitorMetric.serviceId = data.monitorId;
         monitorMetric.serviceType = ServiceType.Monitor;
         monitorMetric.name = MonitorMetricType.CPUUsagePercent;
-        monitorMetric.description = CheckOn.CPUUsagePercent + " of Server/VM";
+
         monitorMetric.value = basicMetrics.cpuMetrics.percentUsed;
-        monitorMetric.unit = "%";
+
         monitorMetric.attributes = {
           monitorId: data.monitorId.toString(),
           projectId: data.projectId.toString(),
@@ -704,6 +719,14 @@ export default class MonitorResourceUtil {
         monitorMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(monitorMetric);
+
+        const metricType: MetricType = new MetricType();
+        metricType.name = MonitorMetricType.CPUUsagePercent;
+        metricType.description = CheckOn.CPUUsagePercent + " of Server/VM";
+        metricType.unit = "%";
+
+        metricNameServiceNameMap[MonitorMetricType.CPUUsagePercent] =
+          metricType;
       }
 
       if (basicMetrics.memoryMetrics) {
@@ -713,10 +736,9 @@ export default class MonitorResourceUtil {
         monitorMetric.serviceId = data.monitorId;
         monitorMetric.serviceType = ServiceType.Monitor;
         monitorMetric.name = MonitorMetricType.MemoryUsagePercent;
-        monitorMetric.description =
-          CheckOn.MemoryUsagePercent + " of Server/VM";
+
         monitorMetric.value = basicMetrics.memoryMetrics.percentUsed;
-        monitorMetric.unit = "%";
+
         monitorMetric.attributes = {
           monitorId: data.monitorId.toString(),
           projectId: data.projectId.toString(),
@@ -735,6 +757,14 @@ export default class MonitorResourceUtil {
         monitorMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(monitorMetric);
+
+        const metricType: MetricType = new MetricType();
+        metricType.name = MonitorMetricType.MemoryUsagePercent;
+        metricType.description = CheckOn.MemoryUsagePercent + " of Server/VM";
+        metricType.unit = "%";
+
+        metricNameServiceNameMap[MonitorMetricType.MemoryUsagePercent] =
+          metricType;
       }
 
       if (basicMetrics.diskMetrics && basicMetrics.diskMetrics.length > 0) {
@@ -745,10 +775,9 @@ export default class MonitorResourceUtil {
           monitorMetric.serviceId = data.monitorId;
           monitorMetric.serviceType = ServiceType.Monitor;
           monitorMetric.name = MonitorMetricType.DiskUsagePercent;
-          monitorMetric.description =
-            CheckOn.DiskUsagePercent + " of Server/VM";
+
           monitorMetric.value = diskMetric.percentUsed;
-          monitorMetric.unit = "%";
+
           monitorMetric.attributes = {
             monitorId: data.monitorId.toString(),
             projectId: data.projectId.toString(),
@@ -769,6 +798,14 @@ export default class MonitorResourceUtil {
           monitorMetric.metricPointType = MetricPointType.Sum;
 
           itemsToSave.push(monitorMetric);
+
+          const metricType: MetricType = new MetricType();
+          metricType.name = MonitorMetricType.DiskUsagePercent;
+          metricType.description = CheckOn.DiskUsagePercent + " of Server/VM";
+          metricType.unit = "%";
+
+          metricNameServiceNameMap[MonitorMetricType.DiskUsagePercent] =
+            metricType;
         }
       }
     }
@@ -783,11 +820,11 @@ export default class MonitorResourceUtil {
       monitorMetric.serviceId = data.monitorId;
       monitorMetric.serviceType = ServiceType.Monitor;
       monitorMetric.name = MonitorMetricType.ExecutionTime;
-      monitorMetric.description = CheckOn.ExecutionTime + " of this monitor";
+
       monitorMetric.value = (
         data.dataToProcess as ProbeMonitorResponse
       ).customCodeMonitorResponse?.executionTimeInMS;
-      monitorMetric.unit = "ms";
+
       monitorMetric.attributes = {
         monitorId: data.monitorId.toString(),
         projectId: data.projectId.toString(),
@@ -809,6 +846,13 @@ export default class MonitorResourceUtil {
       monitorMetric.metricPointType = MetricPointType.Sum;
 
       itemsToSave.push(monitorMetric);
+
+      const metricType: MetricType = new MetricType();
+      metricType.name = MonitorMetricType.ExecutionTime;
+      metricType.description = CheckOn.ExecutionTime + " of this monitor";
+      metricType.unit = "ms";
+
+      metricNameServiceNameMap[MonitorMetricType.ExecutionTime] = metricType;
     }
 
     if (
@@ -828,9 +872,9 @@ export default class MonitorResourceUtil {
         monitorMetric.serviceId = data.monitorId;
         monitorMetric.serviceType = ServiceType.Monitor;
         monitorMetric.name = MonitorMetricType.ExecutionTime;
-        monitorMetric.description = CheckOn.ExecutionTime + " of this monitor";
+
         monitorMetric.value = syntheticMonitorResponse.executionTimeInMS;
-        monitorMetric.unit = "ms";
+
         monitorMetric.attributes = {
           monitorId: data.monitorId.toString(),
           projectId: data.projectId.toString(),
@@ -854,6 +898,13 @@ export default class MonitorResourceUtil {
         monitorMetric.metricPointType = MetricPointType.Sum;
 
         itemsToSave.push(monitorMetric);
+
+        const metricType: MetricType = new MetricType();
+        metricType.name = MonitorMetricType.ExecutionTime;
+        metricType.description = CheckOn.ExecutionTime + " of this monitor";
+        metricType.unit = "ms";
+
+        metricNameServiceNameMap[MonitorMetricType.ExecutionTime] = metricType;
       }
     }
 
@@ -864,11 +915,11 @@ export default class MonitorResourceUtil {
       monitorMetric.serviceId = data.monitorId;
       monitorMetric.serviceType = ServiceType.Monitor;
       monitorMetric.name = MonitorMetricType.ResponseTime;
-      monitorMetric.description = CheckOn.ResponseTime + " of this monitor";
+
       monitorMetric.value = (
         data.dataToProcess as ProbeMonitorResponse
       ).responseTimeInMs;
-      monitorMetric.unit = "ms";
+
       monitorMetric.attributes = {
         monitorId: data.monitorId.toString(),
         projectId: data.projectId.toString(),
@@ -890,6 +941,13 @@ export default class MonitorResourceUtil {
       monitorMetric.metricPointType = MetricPointType.Sum;
 
       itemsToSave.push(monitorMetric);
+
+      const metricType: MetricType = new MetricType();
+      metricType.name = MonitorMetricType.ResponseTime;
+      metricType.description = CheckOn.ResponseTime + " of this monitor";
+      metricType.unit = "ms";
+
+      metricNameServiceNameMap[MonitorMetricType.ResponseTime] = metricType;
     }
 
     if ((data.dataToProcess as ProbeMonitorResponse).isOnline !== undefined) {
@@ -899,12 +957,12 @@ export default class MonitorResourceUtil {
       monitorMetric.serviceId = data.monitorId;
       monitorMetric.serviceType = ServiceType.Monitor;
       monitorMetric.name = MonitorMetricType.IsOnline;
-      monitorMetric.description = CheckOn.IsOnline + " status for monitor";
+
       monitorMetric.value = (data.dataToProcess as ProbeMonitorResponse)
         .isOnline
         ? 1
         : 0;
-      monitorMetric.unit = "";
+
       monitorMetric.attributes = {
         monitorId: data.monitorId.toString(),
         projectId: data.projectId.toString(),
@@ -926,6 +984,13 @@ export default class MonitorResourceUtil {
       monitorMetric.metricPointType = MetricPointType.Sum;
 
       itemsToSave.push(monitorMetric);
+
+      const metricType: MetricType = new MetricType();
+      metricType.name = MonitorMetricType.IsOnline;
+      metricType.description = CheckOn.IsOnline + " status for monitor";
+      metricType.unit = "";
+
+      metricNameServiceNameMap[MonitorMetricType.IsOnline] = metricType;
     }
 
     if ((data.dataToProcess as ProbeMonitorResponse).responseCode) {
@@ -935,12 +1000,11 @@ export default class MonitorResourceUtil {
       monitorMetric.serviceId = data.monitorId;
       monitorMetric.serviceType = ServiceType.Monitor;
       monitorMetric.name = MonitorMetricType.ResponseStatusCode;
-      monitorMetric.description =
-        CheckOn.ResponseStatusCode + " for this monitor";
+
       monitorMetric.value = (
         data.dataToProcess as ProbeMonitorResponse
       ).responseCode;
-      monitorMetric.unit = "Status Code";
+
       monitorMetric.attributes = {
         monitorId: data.monitorId.toString(),
         projectId: data.projectId.toString(),
@@ -954,6 +1018,14 @@ export default class MonitorResourceUtil {
       monitorMetric.metricPointType = MetricPointType.Sum;
 
       itemsToSave.push(monitorMetric);
+
+      const metricType: MetricType = new MetricType();
+      metricType.name = MonitorMetricType.ResponseStatusCode;
+      metricType.description = CheckOn.ResponseStatusCode + " for this monitor";
+      metricType.unit = "Status Code";
+
+      metricNameServiceNameMap[MonitorMetricType.ResponseStatusCode] =
+        metricType;
     }
 
     await MetricService.createMany({
@@ -963,18 +1035,6 @@ export default class MonitorResourceUtil {
       },
     });
 
-    // Metric name to serviceId map
-    // example: "cpu.usage" -> [serviceId1, serviceId2]
-    // since these are monitor metrics. They dont belong to any service so we can keep the array empty.
-    const metricNameServiceNameMap: Dictionary<Array<ObjectID>> = {};
-
-    for (const metric of itemsToSave) {
-      const metricName: string = metric.name!;
-      if (!metricNameServiceNameMap[metricName]) {
-        metricNameServiceNameMap[metricName] = [];
-      }
-    }
-
     // index metrics
     TelemetryUtil.indexMetricNameServiceNameMap({
       projectId: data.projectId,