@oneuptime/common 9.5.0 → 9.5.2

package/Models/DatabaseModels/CallLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -464,6 +465,66 @@ export default class CallLog extends BaseModel {
   })
   public alertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this Call (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCallLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this Call (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/EmailLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import ProjectSmtpConfig from "./ProjectSmtpConfig";
@@ -499,6 +500,66 @@ export default class EmailLog extends BaseModel {
   })
   public alertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this email (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadEmailLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this email (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/PushNotificationLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -458,6 +459,66 @@ export default class PushNotificationLog extends BaseModel {
   })
   public alertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadPushLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this Push (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadPushLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this Push (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/SmsLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -465,6 +466,66 @@ export default class SmsLog extends BaseModel {
   })
   public alertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadSmsLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this SMS (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadSmsLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this SMS (if any)",
+    example: "d4e5f6a7-89ab-23de-f456-456789abcdef",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/WhatsAppLog.ts

@@ -1,6 +1,7 @@
 import Project from "./Project";
 import Incident from "./Incident";
 import Alert from "./Alert";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -476,6 +477,64 @@ export default class WhatsAppLog extends BaseModel {
   })
   public alertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWhatsAppLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/WorkspaceNotificationLog.ts

@@ -3,6 +3,7 @@ import Incident from "./Incident";
 import Alert from "./Alert";
 import AlertEpisode from "./AlertEpisode";
 import IncidentEpisode from "./IncidentEpisode";
+import Monitor from "./Monitor";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import StatusPage from "./StatusPage";
 import StatusPageAnnouncement from "./StatusPageAnnouncement";
@@ -501,6 +502,64 @@ export default class WorkspaceNotificationLog extends BaseModel {
   })
   public alertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "monitorId",
+    type: TableColumnType.Entity,
+    modelType: Monitor,
+    title: "Monitor",
+    description: "Monitor associated with this message (if any)",
+  })
+  @ManyToOne(
+    () => {
+      return Monitor;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "monitorId" })
+  public monitor?: Monitor = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWorkspaceNotificationLog,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Monitor ID",
+    description: "ID of Monitor associated with this message (if any)",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public monitorId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Server/Infrastructure/Postgres/SchemaMigrations/1770054293299-MigrationName.ts

@@ -0,0 +1,117 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770054293299 implements MigrationInterface {
+  public name = "MigrationName1770054293299";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "CallLog" ADD "monitorId" uuid`);
+    await queryRunner.query(`ALTER TABLE "EmailLog" ADD "monitorId" uuid`);
+    await queryRunner.query(`ALTER TABLE "SmsLog" ADD "monitorId" uuid`);
+    await queryRunner.query(`ALTER TABLE "WhatsAppLog" ADD "monitorId" uuid`);
+    await queryRunner.query(
+      `ALTER TABLE "PushNotificationLog" ADD "monitorId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationLog" ADD "monitorId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_dae47ce94b4f0bd1e27f9c5b34" ON "CallLog" ("monitorId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_51bdfa7eca53b8fbd7e1de3557" ON "EmailLog" ("monitorId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_0df98915051e60a98a99db94de" ON "SmsLog" ("monitorId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6c9e7c1df0058db3cb6d9a6e96" ON "WhatsAppLog" ("monitorId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_be5e4a65d5e061fa3e40dae6df" ON "PushNotificationLog" ("monitorId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_c8788e8f074fc4f8e9efd08af7" ON "WorkspaceNotificationLog" ("monitorId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CallLog" ADD CONSTRAINT "FK_dae47ce94b4f0bd1e27f9c5b345" FOREIGN KEY ("monitorId") REFERENCES "Monitor"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "EmailLog" ADD CONSTRAINT "FK_51bdfa7eca53b8fbd7e1de35573" FOREIGN KEY ("monitorId") REFERENCES "Monitor"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "SmsLog" ADD CONSTRAINT "FK_0df98915051e60a98a99db94de0" FOREIGN KEY ("monitorId") REFERENCES "Monitor"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" ADD CONSTRAINT "FK_6c9e7c1df0058db3cb6d9a6e965" FOREIGN KEY ("monitorId") REFERENCES "Monitor"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "PushNotificationLog" ADD CONSTRAINT "FK_be5e4a65d5e061fa3e40dae6dff" FOREIGN KEY ("monitorId") REFERENCES "Monitor"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationLog" ADD CONSTRAINT "FK_c8788e8f074fc4f8e9efd08af76" FOREIGN KEY ("monitorId") REFERENCES "Monitor"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationLog" DROP CONSTRAINT "FK_c8788e8f074fc4f8e9efd08af76"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "PushNotificationLog" DROP CONSTRAINT "FK_be5e4a65d5e061fa3e40dae6dff"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" DROP CONSTRAINT "FK_6c9e7c1df0058db3cb6d9a6e965"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "SmsLog" DROP CONSTRAINT "FK_0df98915051e60a98a99db94de0"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "EmailLog" DROP CONSTRAINT "FK_51bdfa7eca53b8fbd7e1de35573"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CallLog" DROP CONSTRAINT "FK_dae47ce94b4f0bd1e27f9c5b345"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_c8788e8f074fc4f8e9efd08af7"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_be5e4a65d5e061fa3e40dae6df"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_6c9e7c1df0058db3cb6d9a6e96"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0df98915051e60a98a99db94de"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_51bdfa7eca53b8fbd7e1de3557"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_dae47ce94b4f0bd1e27f9c5b34"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationLog" DROP COLUMN "monitorId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "PushNotificationLog" DROP COLUMN "monitorId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" DROP COLUMN "monitorId"`,
+    );
+    await queryRunner.query(`ALTER TABLE "SmsLog" DROP COLUMN "monitorId"`);
+    await queryRunner.query(`ALTER TABLE "EmailLog" DROP COLUMN "monitorId"`);
+    await queryRunner.query(`ALTER TABLE "CallLog" DROP COLUMN "monitorId"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -248,6 +248,7 @@ import { MigrationName1769772215532 } from "./1769772215532-MigrationName";
 import { MigrationName1769774527481 } from "./1769774527481-MigrationName";
 import { MigrationName1769780297584 } from "./1769780297584-MigrationName";
 import { MigrationName1769802715014 } from "./1769802715014-MigrationName";
+import { MigrationName1770054293299 } from "./1770054293299-MigrationName";
 
 export default [
   InitialMigration,
@@ -500,4 +501,5 @@ export default [
   MigrationName1769774527481,
   MigrationName1769780297584,
   MigrationName1769802715014,
+  MigrationName1770054293299,
 ];

package/Server/Services/CallService.ts

@@ -30,6 +30,7 @@ export class CallService extends BaseService {
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
       incidentEpisodeId?: ObjectID | undefined;
+      monitorId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;
@@ -60,6 +61,7 @@ export class CallService extends BaseService {
       incidentId: options.incidentId?.toString(),
       alertId: options.alertId?.toString(),
       alertEpisodeId: options.alertEpisodeId?.toString(),
+      monitorId: options.monitorId?.toString(),
       scheduledMaintenanceId: options.scheduledMaintenanceId?.toString(),
       statusPageId: options.statusPageId?.toString(),
       statusPageAnnouncementId: options.statusPageAnnouncementId?.toString(),

package/Server/Services/MailService.ts

@@ -25,6 +25,7 @@ export class MailService extends BaseService {
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
       incidentEpisodeId?: ObjectID | undefined;
+      monitorId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;
@@ -74,6 +75,10 @@ export class MailService extends BaseService {
       body["alertEpisodeId"] = options.alertEpisodeId.toString();
     }
 
+    if (options?.monitorId) {
+      body["monitorId"] = options.monitorId.toString();
+    }
+
     if (options?.scheduledMaintenanceId) {
       body["scheduledMaintenanceId"] =
         options.scheduledMaintenanceId.toString();

package/Server/Services/MonitorService.ts

@@ -1314,6 +1314,7 @@ ${createdItem.description?.trim() || "No description provided."}
           }),
         whatsAppMessage,
         eventType,
+        monitorId: monitor.id!,
       });
     }
   }
@@ -1440,6 +1441,7 @@ ${createdItem.description?.trim() || "No description provided."}
           }),
         whatsAppMessage,
         eventType,
+        monitorId: monitor.id!,
       });
     }
   }

package/Server/Services/PushNotificationService.ts

@@ -26,6 +26,7 @@ export interface PushNotificationOptions {
   incidentId?: ObjectID | undefined;
   alertId?: ObjectID | undefined;
   alertEpisodeId?: ObjectID | undefined;
+  monitorId?: ObjectID | undefined;
   scheduledMaintenanceId?: ObjectID | undefined;
   statusPageId?: ObjectID | undefined;
   statusPageAnnouncementId?: ObjectID | undefined;
@@ -163,6 +164,9 @@ export default class PushNotificationService {
         if (options.alertId) {
           log.alertId = options.alertId;
         }
+        if (options.monitorId) {
+          log.monitorId = options.monitorId;
+        }
         if (options.scheduledMaintenanceId) {
           log.scheduledMaintenanceId = options.scheduledMaintenanceId;
         }

package/Server/Services/SmsService.ts

@@ -30,6 +30,7 @@ export class SmsService extends BaseService {
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
       incidentEpisodeId?: ObjectID | undefined;
+      monitorId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;
@@ -61,6 +62,7 @@ export class SmsService extends BaseService {
       incidentId: options.incidentId?.toString(),
       alertId: options.alertId?.toString(),
       alertEpisodeId: options.alertEpisodeId?.toString(),
+      monitorId: options.monitorId?.toString(),
       scheduledMaintenanceId: options.scheduledMaintenanceId?.toString(),
       statusPageId: options.statusPageId?.toString(),
       statusPageAnnouncementId: options.statusPageAnnouncementId?.toString(),