@oneuptime/common 9.1.1 → 9.1.2

package/Models/DatabaseModels/Incident.ts

@@ -228,6 +228,43 @@ export default class Incident extends BaseModel {
   })
   public description?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectIncident,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectIncident,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditProjectIncident,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Date,
+    title: "Declared At",
+    description: "Date and time when this incident was declared.",
+    isDefaultValueColumn: true,
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: false,
+    default: () => {
+      return "now()";
+    },
+  })
+  public declaredAt?: Date = undefined;
+
   @Index()
   @ColumnAccessControl({
     create: [],

package/Server/API/StatusPageAPI.ts

@@ -1421,6 +1421,7 @@ export default class StatusPageAPI extends BaseAPI<
           if (monitorsOnStatusPage.length > 0) {
             let select: Select<Incident> = {
               createdAt: true,
+              declaredAt: true,
               title: true,
               description: true,
               _id: true,
@@ -1474,6 +1475,7 @@ export default class StatusPageAPI extends BaseAPI<
                 },
                 select: select,
                 sort: {
+                  declaredAt: SortOrder.Descending,
                   createdAt: SortOrder.Descending,
                 },
 
@@ -3303,6 +3305,7 @@ export default class StatusPageAPI extends BaseAPI<
 
     let selectIncidents: Select<Incident> = {
       createdAt: true,
+      declaredAt: true,
       title: true,
       description: true,
       _id: true,
@@ -3336,6 +3339,7 @@ export default class StatusPageAPI extends BaseAPI<
         query: incidentQuery,
         select: selectIncidents,
         sort: {
+          declaredAt: SortOrder.Descending,
           createdAt: SortOrder.Descending,
         },
         skip: 0,
@@ -3373,6 +3377,7 @@ export default class StatusPageAPI extends BaseAPI<
           },
           select: selectIncidents,
           sort: {
+            declaredAt: SortOrder.Descending,
             createdAt: SortOrder.Descending,
           },
 

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

@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1764324618043 implements MigrationInterface {
+  public name = "MigrationName1764324618043";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ADD "declaredAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `UPDATE "Incident" SET "declaredAt" = "createdAt" WHERE "declaredAt" IS NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ALTER COLUMN "declaredAt" SET DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ALTER COLUMN "declaredAt" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_b26979b9f119310661734465a4" ON "Incident" ("declaredAt") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_b26979b9f119310661734465a4"`,
+    );
+    await queryRunner.query(`ALTER TABLE "Incident" DROP COLUMN "declaredAt"`);
+  }
+}

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

@@ -186,6 +186,7 @@ import { MigrationName1763471659817 } from "./1763471659817-MigrationName";
 import { MigrationName1763477560906 } from "./1763477560906-MigrationName";
 import { MigrationName1763480947474 } from "./1763480947474-MigrationName";
 import { MigrationName1763643080445 } from "./1763643080445-MigrationName";
+import { MigrationName1764324618043 } from "./1764324618043-MigrationName";
 
 export default [
   InitialMigration,
@@ -376,4 +377,5 @@ export default [
   MigrationName1763477560906,
   MigrationName1763480947474,
   MigrationName1763643080445,
+  MigrationName1764324618043,
 ];

package/Server/Services/IncidentService.ts

@@ -480,6 +480,14 @@ export class Service extends DatabaseService<Model> {
     const projectId: ObjectID =
       createBy.props.tenantId || createBy.data.projectId!;
 
+    if (!createBy.data.declaredAt) {
+      createBy.data.declaredAt = OneUptimeDate.getCurrentDate();
+    } else {
+      createBy.data.declaredAt = OneUptimeDate.fromString(
+        createBy.data.declaredAt as Date,
+      );
+    }
+
     // Determine the initial incident state
     let initialIncidentStateId: ObjectID | undefined = undefined;
 
@@ -975,6 +983,7 @@ ${incident.remediationNotes || "No remediation notes provided."}
         notifyOwners: false,
         rootCause: createdItem.rootCause,
         stateChangeLog: createdItem.createdStateLog,
+        timelineStartsAt: createdItem.declaredAt,
         props: {
           isRoot: true,
         },
@@ -1790,6 +1799,7 @@ ${incidentSeverity.name}
       limit: LIMIT_MAX,
       skip: 0,
       select: {
+        _id: true,
         projectId: true,
         monitors: {
           _id: true,
@@ -1821,6 +1831,18 @@ ${incidentSeverity.name}
             incident.monitors,
           );
         }
+
+        if (incident.projectId && incident.id) {
+          await MetricService.deleteBy({
+            query: {
+              projectId: incident.projectId,
+              serviceId: incident.id,
+            },
+            props: {
+              isRoot: true,
+            },
+          });
+        }
       }
     }
 
@@ -1838,6 +1860,7 @@ ${incidentSeverity.name}
     rootCause: string | undefined;
     stateChangeLog: JSONObject | undefined;
     props: DatabaseCommonInteractionProps | undefined;
+    timelineStartsAt?: Date | string | undefined;
   }): Promise<void> {
     const {
       projectId,
@@ -1849,8 +1872,13 @@ ${incidentSeverity.name}
       rootCause,
       stateChangeLog,
       props,
+      timelineStartsAt,
     } = data;
 
+    const declaredTimelineStart: Date | undefined = timelineStartsAt
+      ? OneUptimeDate.fromString(timelineStartsAt as Date)
+      : undefined;
+
     // get last monitor status timeline.
     const lastIncidentStatusTimeline: IncidentStateTimeline | null =
       await IncidentStateTimelineService.findOneBy({
@@ -1888,6 +1916,10 @@ ${incidentSeverity.name}
     statusTimeline.shouldStatusPageSubscribersBeNotified =
       shouldNotifyStatusPageSubscribers;
 
+    if (!lastIncidentStatusTimeline && declaredTimelineStart) {
+      statusTimeline.startsAt = declaredTimelineStart;
+    }
+
     // Map boolean to enum value
     statusTimeline.subscriberNotificationStatus = isSubscribersNotified
       ? StatusPageSubscriberNotificationStatus.Success
@@ -1914,6 +1946,7 @@ ${incidentSeverity.name}
       id: data.incidentId,
       select: {
         projectId: true,
+        declaredAt: true,
         monitors: {
           _id: true,
           name: true,
@@ -1970,6 +2003,7 @@ ${incidentSeverity.name}
 
     await MetricService.deleteBy({
       query: {
+        projectId: incident.projectId,
         serviceId: data.incidentId,
       },
       props: {
@@ -1983,6 +2017,7 @@ ${incidentSeverity.name}
 
     const incidentStartsAt: Date =
       firstIncidentStateTimeline?.startsAt ||
+      incident.declaredAt ||
       incident.createdAt ||
       OneUptimeDate.getCurrentDate();
 
@@ -2075,6 +2110,7 @@ ${incidentSeverity.name}
 
         timeToAcknowledgeMetric.time =
           ackIncidentStateTimeline?.startsAt ||
+          incident.declaredAt ||
           incident.createdAt ||
           OneUptimeDate.getCurrentDate();
         timeToAcknowledgeMetric.timeUnixNano = OneUptimeDate.toUnixNano(
@@ -2140,6 +2176,7 @@ ${incidentSeverity.name}
 
         timeToResolveMetric.time =
           resolvedIncidentStateTimeline?.startsAt ||
+          incident.declaredAt ||
           incident.createdAt ||
           OneUptimeDate.getCurrentDate();
         timeToResolveMetric.timeUnixNano = OneUptimeDate.toUnixNano(
@@ -2200,6 +2237,7 @@ ${incidentSeverity.name}
 
       incidentDurationMetric.time =
         lastIncidentStateTimeline?.startsAt ||
+        incident.declaredAt ||
         incident.createdAt ||
         OneUptimeDate.getCurrentDate();
       incidentDurationMetric.timeUnixNano = OneUptimeDate.toUnixNano(

package/Server/Services/MonitorService.ts

@@ -63,14 +63,13 @@ import MonitorFeedService from "./MonitorFeedService";
 import { MonitorFeedEventType } from "../../Models/DatabaseModels/MonitorFeed";
 import { Gray500, Green500 } from "../../Types/BrandColors";
 import LabelService from "./LabelService";
-import QueryOperator from "../../Types/BaseDatabase/QueryOperator";
-import { FindWhere } from "../../Types/BaseDatabase/Query";
 import logger from "../Utils/Logger";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import ExceptionMessages from "../../Types/Exception/ExceptionMessages";
 import Project from "../../Models/DatabaseModels/Project";
 import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
 import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
+import MetricService from "./MetricService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -136,12 +135,26 @@ export class Service extends DatabaseService<Model> {
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<Model>,
   ): Promise<OnDelete<Model>> {
-    if (deleteBy.query._id) {
-      // delete all the status page resource for this monitor.
+    const monitorsPendingDeletion: Array<Model> = await this.findBy({
+      query: deleteBy.query,
+      limit: LIMIT_MAX,
+      skip: 0,
+      select: {
+        _id: true,
+        projectId: true,
+      },
+      props: deleteBy.props,
+    });
 
+    for (const monitor of monitorsPendingDeletion) {
+      if (!monitor.id) {
+        continue;
+      }
+
+      // delete all the status page resources for this monitor.
       await StatusPageResourceService.deleteBy({
         query: {
-          monitorId: new ObjectID(deleteBy.query._id as string),
+          monitorId: monitor.id,
         },
         limit: LIMIT_MAX,
         skip: 0,
@@ -150,37 +163,19 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
-      let projectId: FindWhere<ObjectID> | QueryOperator<ObjectID> | undefined =
-        deleteBy.query.projectId || deleteBy.props.tenantId;
+      const projectId: ObjectID | undefined = monitor.projectId as
+        | ObjectID
+        | undefined;
 
       if (!projectId) {
-        // fetch this monitor from the database to get the projectId.
-        const monitor: Model | null = await this.findOneById({
-          id: new ObjectID(deleteBy.query._id as string) as ObjectID,
-          select: {
-            projectId: true,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
-
-        if (!monitor) {
-          throw new BadDataException(ExceptionMessages.MonitorNotFound);
-        }
-
-        if (!monitor.id) {
-          throw new BadDataException(ExceptionMessages.MonitorNotFound);
-        }
-
-        projectId = monitor.projectId!;
+        continue;
       }
 
       try {
         await WorkspaceNotificationRuleService.archiveWorkspaceChannels({
-          projectId: projectId as ObjectID,
+          projectId: projectId,
           notificationFor: {
-            monitorId: new ObjectID(deleteBy.query._id as string) as ObjectID,
+            monitorId: monitor.id,
           },
           sendMessageBeforeArchiving: {
             _type: "WorkspacePayloadMarkdown",
@@ -189,12 +184,17 @@ export class Service extends DatabaseService<Model> {
         });
       } catch (error) {
         logger.error(
-          `Error while archiving workspace channels for monitor ${deleteBy.query._id}: ${error}`,
+          `Error while archiving workspace channels for monitor ${monitor.id?.toString()}: ${error}`,
         );
       }
     }
 
-    return { deleteBy, carryForward: null };
+    return {
+      deleteBy,
+      carryForward: {
+        monitors: monitorsPendingDeletion,
+      },
+    };
   }
 
   @CaptureSpan()
@@ -208,6 +208,24 @@ export class Service extends DatabaseService<Model> {
       );
     }
 
+    if (onDelete.carryForward && onDelete.carryForward.monitors) {
+      for (const monitor of onDelete.carryForward.monitors as Array<Model>) {
+        if (!monitor.projectId || !monitor.id) {
+          continue;
+        }
+
+        await MetricService.deleteBy({
+          query: {
+            projectId: monitor.projectId,
+            serviceId: monitor.id,
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+      }
+    }
+
     return onDelete;
   }
 

package/Server/Services/ScheduledMaintenanceStateTimelineService.ts

@@ -510,12 +510,30 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
           monitors: {
             _id: true,
           },
+          nextSubscriberNotificationBeforeTheEventAt: true,
         },
         props: {
           isRoot: true,
         },
       });
 
+    const hasProgressedBeyondScheduledState: boolean = Boolean(
+      scheduledMaintenanceState && !scheduledMaintenanceState.isScheduledState,
+    );
+
+    if (
+      hasProgressedBeyondScheduledState &&
+      scheduledMaintenanceEvent?.nextSubscriberNotificationBeforeTheEventAt
+    ) {
+      await ScheduledMaintenanceService.updateOneById({
+        id: createdItem.scheduledMaintenanceId!,
+        data: {
+          nextSubscriberNotificationBeforeTheEventAt: null,
+        },
+        props: onCreate.createBy.props,
+      });
+    }
+
     if (isOngoingState) {
       if (
         scheduledMaintenanceEvent &&

package/Server/Services/TeamMemberService.ts

@@ -44,10 +44,11 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
   }
 
   @CaptureSpan()
-  private async isSCIMEnabled(projectId: ObjectID): Promise<boolean> {
+  private async isSCIMPushGroupsEnabled(projectId: ObjectID): Promise<boolean> {
     const count: PositiveNumber = await ProjectSCIMService.countBy({
       query: {
         projectId: projectId,
+        enablePushGroups: true,
       },
       props: {
         isRoot: true,
@@ -63,12 +64,12 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
     // Check if SCIM is enabled for the project
     if (
       !createBy.props.isRoot &&
-      (await this.isSCIMEnabled(
+      (await this.isSCIMPushGroupsEnabled(
         createBy.data.projectId! || createBy.props.tenantId,
       ))
     ) {
       throw new BadDataException(
-        "Cannot invite team members when SCIM is enabled for this project.",
+        "Cannot invite team members while SCIM Push Groups is enabled for this project. Disable Push Groups to manage members from OneUptime.",
       );
     }
 
@@ -311,10 +312,10 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
       !deleteBy.props.isRoot &&
       members.length > 0 &&
       members[0]?.projectId &&
-      (await this.isSCIMEnabled(members[0].projectId))
+      (await this.isSCIMPushGroupsEnabled(members[0].projectId))
     ) {
       throw new BadDataException(
-        "Cannot delete team members when SCIM is enabled for this project.",
+        "Cannot delete team members while SCIM Push Groups is enabled for this project. Disable Push Groups to manage members from OneUptime.",
       );
     }
 
@@ -346,11 +347,11 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
         });
 
         // Skip the one-member guard when SCIM manages membership for the project.
-        const isSCIMEnabled: boolean = await this.isSCIMEnabled(
+        const isPushGroupsManaged: boolean = await this.isSCIMPushGroupsEnabled(
           member.projectId!,
         );
 
-        if (!isSCIMEnabled && membersInTeam.toNumber() <= 1) {
+        if (!isPushGroupsManaged && membersInTeam.toNumber() <= 1) {
           throw new BadDataException(
             Errors.TeamMemberService.ONE_MEMBER_REQUIRED,
           );

package/Server/Services/TeamService.ts

@@ -71,6 +71,7 @@ export class Service extends DatabaseService<Model> {
       const scimCount: PositiveNumber = await ProjectSCIMService.countBy({
         query: {
           projectId: projectId,
+          enablePushGroups: true,
         },
         skip: new PositiveNumber(0),
         limit: new PositiveNumber(1),
@@ -82,7 +83,7 @@ export class Service extends DatabaseService<Model> {
 
       if (scimCount.toNumber() > 0) {
         throw new BadDataException(
-          `Cannot ${data.action} teams when SCIM is enabled for this project.`,
+          `Cannot ${data.action} teams while SCIM Push Groups is enabled for this project. Disable Push Groups to manage teams from OneUptime.`,
         );
       }
     }

package/Server/Utils/Browser.ts

@@ -166,7 +166,20 @@ export default class BrowserUtil {
       throw new BadDataException("Chrome executable path not found.");
     }
 
-    return `/root/.cache/ms-playwright/${chromeInstallationName}/chrome-linux/chrome`;
+    const chromeExecutableCandidates: Array<string> = [
+      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome-linux/chrome`,
+      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome-linux64/chrome`,
+      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome64/chrome`,
+      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome/chrome`,
+    ];
+
+    for (const executablePath of chromeExecutableCandidates) {
+      if (await LocalFile.doesFileExist(executablePath)) {
+        return executablePath;
+      }
+    }
+
+    throw new BadDataException("Chrome executable path not found.");
   }
 
   @CaptureSpan()
@@ -197,6 +210,19 @@ export default class BrowserUtil {
       throw new BadDataException("Firefox executable path not found.");
     }
 
-    return `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox/firefox`;
+    const firefoxExecutableCandidates: Array<string> = [
+      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox/firefox`,
+      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox-linux64/firefox`,
+      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox64/firefox`,
+      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox-64/firefox`,
+    ];
+
+    for (const executablePath of firefoxExecutableCandidates) {
+      if (await LocalFile.doesFileExist(executablePath)) {
+        return executablePath;
+      }
+    }
+
+    throw new BadDataException("Firefox executable path not found.");
   }
 }

package/Server/Utils/Telemetry.ts

@@ -226,7 +226,11 @@ export default class Telemetry {
       };
 
       if (logRecordProcessors.length > 0) {
-        loggerProviderConfig.processors = logRecordProcessors;
+        (
+          loggerProviderConfig as LoggerProviderConfig & {
+            processors?: Array<LogRecordProcessor>;
+          }
+        ).processors = logRecordProcessors;
       }
 
       this.loggerProvider = new LoggerProvider(loggerProviderConfig);
@@ -254,7 +258,11 @@ export default class Telemetry {
        */
 
       if (logRecordProcessors.length > 0) {
-        nodeSdkConfiguration.logRecordProcessors = logRecordProcessors;
+        (
+          nodeSdkConfiguration as opentelemetry.NodeSDKConfiguration & {
+            logRecordProcessors?: Array<LogRecordProcessor>;
+          }
+        ).logRecordProcessors = logRecordProcessors;
       }
 
       const sdk: opentelemetry.NodeSDK = new opentelemetry.NodeSDK(

package/Server/Utils/Workspace/MicrosoftTeams/Actions/Incident.ts

@@ -320,6 +320,7 @@ export default class MicrosoftTeamsIncidentActions {
             name: true,
           },
           createdAt: true,
+          declaredAt: true,
         },
         props: {
           isRoot: true,
@@ -331,7 +332,9 @@ export default class MicrosoftTeamsIncidentActions {
         return;
       }
 
-      const message: string = `**Incident Details**\n\n**Title:** ${incident.title}\n**Description:** ${incident.description || "No description"}\n**State:** ${incident.currentIncidentState?.name || "Unknown"}\n**Severity:** ${incident.incidentSeverity?.name || "Unknown"}\n**Created At:** ${incident.createdAt ? new Date(incident.createdAt).toLocaleString() : "Unknown"}`;
+      const declaredAt: Date | undefined =
+        incident.declaredAt || incident.createdAt || undefined;
+      const message: string = `**Incident Details**\n\n**Title:** ${incident.title}\n**Description:** ${incident.description || "No description"}\n**State:** ${incident.currentIncidentState?.name || "Unknown"}\n**Severity:** ${incident.incidentSeverity?.name || "Unknown"}\n**Declared At:** ${declaredAt ? new Date(declaredAt).toLocaleString() : "Unknown"}`;
 
       await turnContext.sendActivity(message);
       return;

package/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts

@@ -1929,11 +1929,13 @@ Just type any of these commands to get the information you need!`;
             color: true,
           },
           createdAt: true,
+          declaredAt: true,
           monitors: {
             name: true,
           },
         },
         sort: {
+          declaredAt: SortOrder.Descending,
           createdAt: SortOrder.Descending,
         },
         limit: 10,
@@ -1958,8 +1960,10 @@ If you need to report an incident or check historical incidents, please visit th
       for (const incident of activeIncidents) {
         const severity: string = incident.incidentSeverity?.name || "Unknown";
         const state: string = incident.currentIncidentState?.name || "Unknown";
-        const createdAt: string = incident.createdAt
-          ? OneUptimeDate.getDateAsFormattedString(incident.createdAt)
+        const declaredAt: Date | undefined =
+          incident.declaredAt || incident.createdAt;
+        const declaredAtText: string = declaredAt
+          ? OneUptimeDate.getDateAsFormattedString(declaredAt)
           : "Unknown";
 
         const severityIcon: string = ["Critical", "Major"].includes(severity)
@@ -1977,7 +1981,7 @@ If you need to report an incident or check historical incidents, please visit th
         message += `${severityIcon} **[Incident #${incident.incidentNumber}: ${incident.title}](${incidentUrl.toString()})**
 • **Severity:** ${severity}
 • **Status:** ${state}
-• **Created:** ${createdAt}
+• **Declared:** ${declaredAtText}
 `;
 
         if (incident.monitors && incident.monitors.length > 0) {