@oneuptime/common 7.0.3567 → 7.0.3589

package/Models/DatabaseModels/MonitorTest.ts

@@ -442,6 +442,7 @@ export default class MonitorTest extends BaseModel {
   })
   public monitorStepProbeResponse?: MonitorStepProbeResponse = undefined;
 
+  @Index()
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/StatusPageAnnouncement.ts

@@ -164,7 +164,12 @@ export default class StatusPageAnnouncement extends BaseModel {
       Permission.ProjectMember,
       Permission.ReadStatusPageAnnouncement,
     ],
-    update: [],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditStatusPageAnnouncement,
+    ],
   })
   @TableColumn({
     required: false,

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

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1737997557974 implements MigrationInterface {
+  public name = "MigrationName1737997557974";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE INDEX "IDX_4d5e62631b2b63aaecb00950ef" ON "MonitorTest" ("isInQueue") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_4d5e62631b2b63aaecb00950ef"`,
+    );
+  }
+}

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

@@ -98,6 +98,7 @@ import { MigrationName1736856662868 } from "./1736856662868-MigrationName";
 import { MigrationName1737141420441 } from "./1737141420441-MigrationName";
 import { MigrationName1737713529424 } from "./1737713529424-MigrationName";
 import { MigrationName1737715240684 } from "./1737715240684-MigrationName";
+import { MigrationName1737997557974 } from "./1737997557974-MigrationName";
 
 export default [
   InitialMigration,
@@ -200,4 +201,5 @@ export default [
   MigrationName1737141420441,
   MigrationName1737713529424,
   MigrationName1737715240684,
+  MigrationName1737997557974,
 ];

package/Server/Services/AlertService.ts

@@ -41,6 +41,10 @@ import AlertMetricType from "../../Types/Alerts/AlertMetricType";
 import AlertFeedService from "./AlertFeedService";
 import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
 import { Gray500, Red500 } from "../../Types/BrandColors";
+import Label from "../../Models/DatabaseModels/Label";
+import LabelService from "./LabelService";
+import AlertSeverity from "../../Models/DatabaseModels/AlertSeverity";
+import AlertSeverityService from "./AlertSeverityService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -492,74 +496,132 @@ ${createdItem.remediationNotes || "No remediation notes provided."}`,
 
     if (updatedItemIds.length > 0) {
       for (const alertId of updatedItemIds) {
+        let shouldAddAlertFeed: boolean = false;
+        let feedInfoInMarkdown: string = "**Alert was updated.**";
+
+        const createdByUserId: ObjectID | undefined | null =
+          onUpdate.updateBy.props.userId;
+
         if (onUpdate.updateBy.data.title) {
           // add alert feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
 
-          await AlertFeedService.createAlertFeed({
-            alertId: alertId,
-            projectId: onUpdate.updateBy.props.tenantId as ObjectID,
-            alertFeedEventType: AlertFeedEventType.AlertUpdated,
-            displayColor: Gray500,
-            feedInfoInMarkdown: `**Alert title was updated.** Here's the new title.
-    
+          feedInfoInMarkdown += `\n\n**Title**: 
 ${onUpdate.updateBy.data.title || "No title provided."}
-              `,
-            userId: createdByUserId || undefined,
-          });
+`;
+          shouldAddAlertFeed = true;
         }
 
         if (onUpdate.updateBy.data.rootCause) {
-          // add alert feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
+          if (onUpdate.updateBy.data.title) {
+            // add alert feed.
 
-          await AlertFeedService.createAlertFeed({
-            alertId: alertId,
-            projectId: onUpdate.updateBy.props.tenantId as ObjectID,
-            alertFeedEventType: AlertFeedEventType.AlertUpdated,
-            displayColor: Gray500,
-            feedInfoInMarkdown: `**Alert root cause was updated.** Here's the new root cause.
-          
+            feedInfoInMarkdown += `\n\n**Root Cause**: 
 ${onUpdate.updateBy.data.rootCause || "No root cause provided."}
-            `,
-            userId: createdByUserId || undefined,
-          });
+  `;
+            shouldAddAlertFeed = true;
+          }
         }
 
         if (onUpdate.updateBy.data.description) {
           // add alert feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
 
-          await AlertFeedService.createAlertFeed({
-            alertId: alertId,
-            projectId: onUpdate.updateBy.props.tenantId as ObjectID,
-            alertFeedEventType: AlertFeedEventType.AlertUpdated,
-            displayColor: Gray500,
-            feedInfoInMarkdown: `**Alert description was updated.** Here's the new description.
-          
-${onUpdate.updateBy.data.description || "No description provided."}
-            `,
-            userId: createdByUserId || undefined,
-          });
+          feedInfoInMarkdown += `\n\n**Alert Description**: 
+          ${onUpdate.updateBy.data.description || "No description provided."}
+          `;
+          shouldAddAlertFeed = true;
         }
 
         if (onUpdate.updateBy.data.remediationNotes) {
           // add alert feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
 
+          feedInfoInMarkdown += `\n\n**Remediation Notes**: 
+${onUpdate.updateBy.data.remediationNotes || "No remediation notes provided."}
+        `;
+          shouldAddAlertFeed = true;
+        }
+
+        if (
+          onUpdate.updateBy.data.labels &&
+          onUpdate.updateBy.data.labels.length > 0 &&
+          Array.isArray(onUpdate.updateBy.data.labels)
+        ) {
+          const labelIds: Array<ObjectID> = (
+            onUpdate.updateBy.data.labels as any
+          )
+            .map((label: Label) => {
+              if (label._id) {
+                return new ObjectID(label._id?.toString());
+              }
+
+              return null;
+            })
+            .filter((labelId: ObjectID | null) => {
+              return labelId !== null;
+            });
+
+          const labels: Array<Label> = await LabelService.findBy({
+            query: {
+              _id: QueryHelper.any(labelIds),
+            },
+            select: {
+              name: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            props: {
+              isRoot: true,
+            },
+          });
+
+          if (labels.length > 0) {
+            feedInfoInMarkdown += `\n\n**Labels**:
+
+${labels
+  .map((label: Label) => {
+    return `- ${label.name}`;
+  })
+  .join("\n")}
+`;
+
+            shouldAddAlertFeed = true;
+          }
+        }
+
+        if (
+          onUpdate.updateBy.data.alertSeverity &&
+          (onUpdate.updateBy.data.alertSeverity as any)._id
+        ) {
+          const alertSeverity: AlertSeverity | null =
+            await AlertSeverityService.findOneBy({
+              query: {
+                _id: new ObjectID(
+                  (onUpdate.updateBy.data.alertSeverity as any)?._id.toString(),
+                ),
+              },
+              select: {
+                name: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (alertSeverity) {
+            feedInfoInMarkdown += `\n\n**Alert Severity**:
+${alertSeverity.name}
+`;
+
+            shouldAddAlertFeed = true;
+          }
+        }
+
+        if (shouldAddAlertFeed) {
           await AlertFeedService.createAlertFeed({
             alertId: alertId,
             projectId: onUpdate.updateBy.props.tenantId as ObjectID,
             alertFeedEventType: AlertFeedEventType.AlertUpdated,
             displayColor: Gray500,
-            feedInfoInMarkdown: `**Remediation notes were updated.** Here are the new notes.
-    
-${onUpdate.updateBy.data.remediationNotes || "No remediation notes provided."}
-                `,
+            feedInfoInMarkdown: feedInfoInMarkdown,
             userId: createdByUserId || undefined,
           });
         }

package/Server/Services/IncidentService.ts

@@ -50,6 +50,10 @@ import Semaphore, {
 import IncidentFeedService from "./IncidentFeedService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
 import { Gray500, Red500 } from "../../Types/BrandColors";
+import Label from "../../Models/DatabaseModels/Label";
+import LabelService from "./LabelService";
+import IncidentSeverity from "../../Models/DatabaseModels/IncidentSeverity";
+import IncidentSeverityService from "./IncidentSeverityService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -644,74 +648,134 @@ ${createdItem.remediationNotes || "No remediation notes provided."}`,
 
     if (updatedItemIds.length > 0) {
       for (const incidentId of updatedItemIds) {
+        let shouldAddIncidentFeed: boolean = false;
+        let feedInfoInMarkdown: string = "**Incident was updated.**";
+
+        const createdByUserId: ObjectID | undefined | null =
+          onUpdate.updateBy.props.userId;
+
         if (onUpdate.updateBy.data.title) {
           // add incident feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
-
-          await IncidentFeedService.createIncidentFeed({
-            incidentId: incidentId,
-            projectId: onUpdate.updateBy.props.tenantId as ObjectID,
-            incidentFeedEventType: IncidentFeedEventType.IncidentUpdated,
-            displayColor: Gray500,
-            feedInfoInMarkdown: `**Incident title was updated.** Here's the new title.
 
+          feedInfoInMarkdown += `\n\n**Title**: 
 ${onUpdate.updateBy.data.title || "No title provided."}
-          `,
-            userId: createdByUserId || undefined,
-          });
+`;
+          shouldAddIncidentFeed = true;
         }
 
         if (onUpdate.updateBy.data.rootCause) {
-          // add incident feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
+          if (onUpdate.updateBy.data.title) {
+            // add incident feed.
 
-          await IncidentFeedService.createIncidentFeed({
-            incidentId: incidentId,
-            projectId: onUpdate.updateBy.props.tenantId as ObjectID,
-            incidentFeedEventType: IncidentFeedEventType.IncidentUpdated,
-            displayColor: Gray500,
-            feedInfoInMarkdown: `**Incident root cause was updated.** Here's the new root cause.
-      
+            feedInfoInMarkdown += `\n\n**Root Cause**: 
 ${onUpdate.updateBy.data.rootCause || "No root cause provided."}
-        `,
-            userId: createdByUserId || undefined,
-          });
+  `;
+            shouldAddIncidentFeed = true;
+          }
         }
 
         if (onUpdate.updateBy.data.description) {
           // add incident feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
 
-          await IncidentFeedService.createIncidentFeed({
-            incidentId: incidentId,
-            projectId: onUpdate.updateBy.props.tenantId as ObjectID,
-            incidentFeedEventType: IncidentFeedEventType.IncidentUpdated,
-            displayColor: Gray500,
-            feedInfoInMarkdown: `**Incident description was updated.** Here's the new description.
-      
-${onUpdate.updateBy.data.description || "No description provided."}
-        `,
-            userId: createdByUserId || undefined,
-          });
+          feedInfoInMarkdown += `\n\n**Incident Description**: 
+          ${onUpdate.updateBy.data.description || "No description provided."}
+          `;
+          shouldAddIncidentFeed = true;
         }
 
         if (onUpdate.updateBy.data.remediationNotes) {
           // add incident feed.
-          const createdByUserId: ObjectID | undefined | null =
-            onUpdate.updateBy.props.userId;
 
+          feedInfoInMarkdown += `\n\n**Remediation Notes**: 
+${onUpdate.updateBy.data.remediationNotes || "No remediation notes provided."}
+        `;
+          shouldAddIncidentFeed = true;
+        }
+
+        if (
+          onUpdate.updateBy.data.labels &&
+          onUpdate.updateBy.data.labels.length > 0 &&
+          Array.isArray(onUpdate.updateBy.data.labels)
+        ) {
+          const labelIds: Array<ObjectID> = (
+            onUpdate.updateBy.data.labels as any
+          )
+            .map((label: Label) => {
+              if (label._id) {
+                return new ObjectID(label._id?.toString());
+              }
+
+              return null;
+            })
+            .filter((labelId: ObjectID | null) => {
+              return labelId !== null;
+            });
+
+          const labels: Array<Label> = await LabelService.findBy({
+            query: {
+              _id: QueryHelper.any(labelIds),
+            },
+            select: {
+              name: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            props: {
+              isRoot: true,
+            },
+          });
+
+          if (labels.length > 0) {
+            feedInfoInMarkdown += `\n\n**Labels**:
+
+${labels
+  .map((label: Label) => {
+    return `- ${label.name}`;
+  })
+  .join("\n")}
+`;
+
+            shouldAddIncidentFeed = true;
+          }
+        }
+
+        if (
+          onUpdate.updateBy.data.incidentSeverity &&
+          (onUpdate.updateBy.data.incidentSeverity as any)._id
+        ) {
+          const incidentSeverity: IncidentSeverity | null =
+            await IncidentSeverityService.findOneBy({
+              query: {
+                _id: new ObjectID(
+                  (
+                    onUpdate.updateBy.data.incidentSeverity as any
+                  )?._id.toString(),
+                ),
+              },
+              select: {
+                name: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (incidentSeverity) {
+            feedInfoInMarkdown += `\n\n**Incident Severity**:
+${incidentSeverity.name}
+`;
+
+            shouldAddIncidentFeed = true;
+          }
+        }
+
+        if (shouldAddIncidentFeed) {
           await IncidentFeedService.createIncidentFeed({
             incidentId: incidentId,
             projectId: onUpdate.updateBy.props.tenantId as ObjectID,
             incidentFeedEventType: IncidentFeedEventType.IncidentUpdated,
             displayColor: Gray500,
-            feedInfoInMarkdown: `**Remediation notes were updated.** Here are the new notes.
-
-${onUpdate.updateBy.data.remediationNotes || "No remediation notes provided."}
-            `,
+            feedInfoInMarkdown: feedInfoInMarkdown,
             userId: createdByUserId || undefined,
           });
         }

package/Server/Services/Index.ts

@@ -151,6 +151,8 @@ import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService";
 import AlertFeedService from "./AlertFeedService";
 import IncidentFeedService from "./IncidentFeedService";
 
+import MonitorTestService from "./MonitorTestService";
+
 const services: Array<BaseService> = [
   AcmeCertificateService,
   PromoCodeService,
@@ -314,6 +316,7 @@ const services: Array<BaseService> = [
   AlertFeedService,
 
   TableViewService,
+  MonitorTestService,
 ];
 
 export const AnalyticsServices: Array<