@oneuptime/common 7.0.3148 → 7.0.3153

package/Server/Utils/Realtime.ts

@@ -15,7 +15,6 @@ import Permission, {
 } from "../../Types/Permission";
 import { getModelTypeByName } from "../../Models/DatabaseModels/Index";
 import { getModelTypeByName as getAnalyticsModelTypeByname } from "../../Models/AnalyticsModels/Index";
-import DatabaseRequestType from "../Types/BaseDatabase/DatabaseRequestType";
 import ModelPermission from "../../Types/BaseDatabase/ModelPermission";
 import ModelEventType from "../../Types/Realtime/ModelEventType";
 import ListenToModelEventJSON from "../../Types/Realtime/ListenToModelEventJSON";
@@ -161,30 +160,12 @@ export default abstract class Realtime {
           projectId,
         );
 
-      let databaseRequestType: DatabaseRequestType = DatabaseRequestType.Read;
-
-      if (data.eventType === ModelEventType.Create) {
-        logger.debug("Event type is Create, setting request type to Create");
-        databaseRequestType = DatabaseRequestType.Create;
-      }
-
-      if (data.eventType === ModelEventType.Update) {
-        logger.debug("Event type is Update, setting request type to Update");
-        databaseRequestType = DatabaseRequestType.Update;
-      }
-
-      if (data.eventType === ModelEventType.Delete) {
-        logger.debug("Event type is Delete, setting request type to Delete");
-        databaseRequestType = DatabaseRequestType.Delete;
-      }
-
       // check if the user has access to this model
       if (
         userTenantAccessPermission &&
         this.hasPermissionsByModelName(
           userTenantAccessPermission,
           data.modelName,
-          databaseRequestType,
         )
       ) {
         logger.debug("User has access to the model, granting access");
@@ -297,7 +278,6 @@ export default abstract class Realtime {
   public static hasPermissionsByModelName(
     userProjectPermissions: UserTenantAccessPermission | Array<Permission>,
     modelName: string,
-    requestType: DatabaseRequestType,
   ): boolean {
     let modelPermissions: Array<Permission> = [];
 
@@ -315,21 +295,7 @@ export default abstract class Realtime {
       }
     }
 
-    if (requestType === DatabaseRequestType.Create) {
-      modelPermissions = new modelType().getCreatePermissions();
-    }
-
-    if (requestType === DatabaseRequestType.Read) {
-      modelPermissions = new modelType().getReadPermissions();
-    }
-
-    if (requestType === DatabaseRequestType.Update) {
-      modelPermissions = new modelType().getUpdatePermissions();
-    }
-
-    if (requestType === DatabaseRequestType.Delete) {
-      modelPermissions = new modelType().getDeletePermissions();
-    }
+    modelPermissions = new modelType().getReadPermissions();
 
     return ModelPermission.hasPermissions(
       userProjectPermissions,

package/Types/Email/EmailTemplateType.ts

@@ -25,10 +25,17 @@ enum EmailTemplateType {
   MonitorOwnerResourceCreated = "MonitorOwnerResourceCreated.hbs",
   MonitorProbesStatus = "MonitorProbesStatus.hbs",
   MonitorOwnerStatusChanged = "MonitorOwnerStatusChanged.hbs",
+
   IncidentOwnerAdded = "IncidentOwnerAdded.hbs",
   IncidentOwnerStateChanged = "IncidentOwnerStateChanged.hbs",
   IncidentOwnerNotePosted = "IncidentOwnerNotePosted.hbs",
   IncidentOwnerResourceCreated = "IncidentOwnerResourceCreated.hbs",
+
+  AlertOwnerAdded = "AlertOwnerAdded.hbs",
+  AlertOwnerStateChanged = "AlertOwnerStateChanged.hbs",
+  AlertOwnerNotePosted = "AlertOwnerNotePosted.hbs",
+  AlertOwnerResourceCreated = "AlertOwnerResourceCreated.hbs",
+
   ScheduledMaintenanceOwnerNotePosted = "ScheduledMaintenanceOwnerNotePosted.hbs",
   ScheduledMaintenanceOwnerAdded = "ScheduledMaintenanceOwnerAdded.hbs",
   ScheduledMaintenanceOwnerStateChanged = "ScheduledMaintenanceOwnerStateChanged.hbs",

package/Types/Icon/IconProp.ts

@@ -128,6 +128,7 @@ enum IconProp {
   NoSignal = "NoSignal",
   EyeSlash = "EyeSlash",
   SquareStack3D = "SquareStack3D",
+  ExclaimationCircle = "ExclaimationCircle",
 }
 
 export default IconProp;

package/Types/Monitor/CriteriaAlert.ts

@@ -0,0 +1,11 @@
+import ObjectID from "../ObjectID";
+
+export interface CriteriaAlert {
+  title: string;
+  description: string;
+  alertSeverityId?: ObjectID | undefined;
+  autoResolveAlert?: boolean | undefined;
+  remediationNotes?: string | undefined;
+  id: string;
+  onCallPolicyIds?: Array<ObjectID> | undefined;
+}

package/Types/Monitor/MonitorCriteria.ts

@@ -27,6 +27,7 @@ export default class MonitorCriteria extends DatabaseProperty {
     onlineMonitorStatusId: ObjectID;
     offlineMonitorStatusId: ObjectID;
     defaultIncidentSeverityId: ObjectID;
+    defaultAlertSeverityId: ObjectID;
   }): MonitorCriteria {
     const monitorCriteria: MonitorCriteria = new MonitorCriteria();
     const offlineCriteria: MonitorCriteriaInstance =
@@ -34,6 +35,7 @@ export default class MonitorCriteria extends DatabaseProperty {
         monitorType: arg.monitorType,
         monitorStatusId: arg.offlineMonitorStatusId,
         incidentSeverityId: arg.defaultIncidentSeverityId,
+        alertSeverityId: arg.defaultAlertSeverityId,
         monitorName: arg.monitorName,
       });
 

package/Types/Monitor/MonitorCriteriaInstance.ts

@@ -4,6 +4,7 @@ import { JSONObject, ObjectType } from "../JSON";
 import JSONFunctions from "../JSONFunctions";
 import ObjectID from "../ObjectID";
 import Typeof from "../Typeof";
+import { CriteriaAlert } from "./CriteriaAlert";
 import {
   CheckOn,
   CriteriaFilter,
@@ -19,10 +20,12 @@ export interface MonitorCriteriaInstanceType {
   filterCondition: FilterCondition;
   filters: Array<CriteriaFilter>;
   incidents: Array<CriteriaIncident>;
+  alerts: Array<CriteriaAlert>;
   name: string;
   description: string;
   changeMonitorStatus?: boolean | undefined;
   createIncidents?: boolean | undefined;
+  createAlerts?: boolean | undefined;
   id: string;
 }
 
@@ -43,8 +46,10 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
         },
       ],
       createIncidents: false,
+      createAlerts: false,
       changeMonitorStatus: false,
       incidents: [],
+      alerts: [],
       name: "",
       description: "",
     };
@@ -71,6 +76,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: false,
         name: `Check if ${arg.monitorName} is online`,
@@ -96,8 +103,10 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
         changeMonitorStatus: true,
         createIncidents: false,
+        createAlerts: false,
         name: `Check if ${arg.monitorName} is online`,
         description: `This criteria checks if the ${arg.monitorName} is online`,
       };
@@ -121,6 +130,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: false,
         name: `Check if ${arg.monitorName} is online`,
@@ -146,6 +157,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: false,
         name: `Check if ${arg.monitorName} is online`,
@@ -174,6 +187,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: false,
         name: `Check if ${arg.monitorName} is online`,
@@ -199,6 +214,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: false,
         name: `Check if ${arg.monitorName} is online`,
@@ -230,6 +247,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
           },
         ],
         incidents: [],
+        alerts: [],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: false,
         name: `Check if ${arg.monitorName} is online`,
@@ -257,6 +276,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
     monitorType: MonitorType;
     monitorStatusId: ObjectID;
     incidentSeverityId: ObjectID;
+    alertSeverityId: ObjectID;
     monitorName: string;
   }): MonitorCriteriaInstance {
     const monitorCriteriaInstance: MonitorCriteriaInstance =
@@ -291,6 +311,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
         ],
         changeMonitorStatus: true,
         createIncidents: true,
+        createAlerts: false,
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
         name: `Check if ${arg.monitorName} is offline`,
         description: `This criteria checks if the ${arg.monitorName} is offline`,
       };
@@ -316,6 +347,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
             value: 200,
           },
         ],
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        createAlerts: false,
         incidents: [
           {
             title: `${arg.monitorName} is offline`,
@@ -355,6 +397,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
             onCallPolicyIds: [],
           },
         ],
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        createAlerts: false,
         changeMonitorStatus: true,
         createIncidents: true,
         name: `Check if ${arg.monitorName} is offline`,
@@ -374,6 +427,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
             value: 0, // if there are no logs then the monitor is offline
           },
         ],
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        createAlerts: false,
         incidents: [
           {
             title: `${arg.monitorName} is offline`,
@@ -403,6 +467,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
             value: 30, // if the request is not recieved in 30 minutes, then the monitor is offline
           },
         ],
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        createAlerts: false,
         incidents: [
           {
             title: `${arg.monitorName} is offline`,
@@ -435,6 +510,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
             value: undefined,
           },
         ],
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        createAlerts: false,
         incidents: [
           {
             title: `${arg.monitorName} is offline`,
@@ -457,6 +543,17 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
         id: ObjectID.generate().toString(),
         monitorStatusId: arg.monitorStatusId,
         filterCondition: FilterCondition.Any,
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} is currently offline.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        createAlerts: false,
         filters: [
           {
             checkOn: CheckOn.IsNotAValidCertificate,
@@ -626,6 +723,14 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
     return this;
   }
 
+  public setAlerts(alerts: Array<CriteriaAlert>): MonitorCriteriaInstance {
+    if (this.data) {
+      this.data.alerts = [...alerts];
+    }
+
+    return this;
+  }
+
   public setChangeMonitorStatus(
     changeMonitorStatus: boolean | undefined,
   ): MonitorCriteriaInstance {
@@ -646,6 +751,16 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
     return this;
   }
 
+  public setCreateAlerts(
+    createAlerts: boolean | undefined,
+  ): MonitorCriteriaInstance {
+    if (this.data) {
+      this.data.createAlerts = createAlerts;
+    }
+
+    return this;
+  }
+
   public override toJSON(): JSONObject {
     if (!this.data) {
       return MonitorCriteriaInstance.getNewMonitorCriteriaInstanceAsJSON();
@@ -659,6 +774,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
         filterCondition: this.data.filterCondition,
         filters: this.data.filters,
         incidents: this.data.incidents,
+        alerts: this.data.alerts,
+        createAlerts: this.data.createAlerts,
         changeMonitorStatus: this.data.changeMonitorStatus,
         createIncidents: this.data.createIncidents,
         name: this.data.name,
@@ -705,13 +822,21 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
     }
 
     if (!json["incidents"]) {
-      throw new BadDataException("json.incidents is null");
+      json["incidents"] = [];
     }
 
     if (!Array.isArray(json["incidents"])) {
       throw new BadDataException("json.incidents should be an array");
     }
 
+    if (!json["alerts"]) {
+      json["alerts"] = [];
+    }
+
+    if (!Array.isArray(json["alerts"])) {
+      throw new BadDataException("json.alerts should be an array");
+    }
+
     let monitorStatusId: ObjectID | undefined = undefined;
 
     if (
@@ -744,6 +869,12 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
       incidents.push({ ...(incident as any) });
     }
 
+    const alerts: Array<CriteriaAlert> = [];
+
+    for (const alert of json["alerts"]) {
+      alerts.push({ ...(alert as any) });
+    }
+
     const monitorCriteriaInstance: MonitorCriteriaInstance =
       new MonitorCriteriaInstance();
 
@@ -753,8 +884,10 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
       filterCondition,
       changeMonitorStatus: (json["changeMonitorStatus"] as boolean) || false,
       createIncidents: (json["createIncidents"] as boolean) || false,
+      createAlerts: (json["createAlerts"] as boolean) || false,
       filters: filters as any,
       incidents: incidents as any,
+      alerts: alerts as any,
       name: (json["name"] as string) || "",
       description: (json["description"] as string) || "",
     }) as any;

package/Types/Monitor/MonitorStep.ts

@@ -77,6 +77,7 @@ export default class MonitorStep extends DatabaseProperty {
     onlineMonitorStatusId: ObjectID;
     offlineMonitorStatusId: ObjectID;
     defaultIncidentSeverityId: ObjectID;
+    defaultAlertSeverityId: ObjectID;
   }): MonitorStep {
     const monitorStep: MonitorStep = new MonitorStep();
 

package/Types/Monitor/MonitorSteps.ts

@@ -40,6 +40,7 @@ export default class MonitorSteps extends DatabaseProperty {
     onlineMonitorStatusId: ObjectID;
     offlineMonitorStatusId: ObjectID;
     defaultIncidentSeverityId: ObjectID;
+    defaultAlertSeverityId: ObjectID;
   }): MonitorSteps {
     const monitorSteps: MonitorSteps = new MonitorSteps();
 

package/Types/NotificationSetting/NotificationSettingEventType.ts

@@ -5,6 +5,13 @@ enum NotificationSettingEventType {
   SEND_INCIDENT_STATE_CHANGED_OWNER_NOTIFICATION = "Send incident state changed notification when I am the owner of the incident",
   SEND_INCIDENT_OWNER_ADDED_NOTIFICATION = "Send notification when I am added as a owner to the incident",
 
+  // Alerts
+
+  SEND_ALERT_CREATED_OWNER_NOTIFICATION = "Send alert created notification when I am the owner of the alert",
+  SEND_ALERT_NOTE_POSTED_OWNER_NOTIFICATION = "Send alert note posted notification when I am the owner of the alert",
+  SEND_ALERT_STATE_CHANGED_OWNER_NOTIFICATION = "Send alert state changed notification when I am the owner of the alert",
+  SEND_ALERT_OWNER_ADDED_NOTIFICATION = "Send notification when I am added as a owner to the alert",
+
   // Monitors
   SEND_MONITOR_OWNER_ADDED_NOTIFICATION = "Send notification when I am added as a owner to the monitor",
   SEND_MONITOR_CREATED_OWNER_NOTIFICATION = "Send monitor created notification when I am the owner of the monitor",