@oneuptime/common 9.4.12 → 9.4.13

package/Server/Services/IncidentGroupingRuleService.ts

@@ -0,0 +1,14 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/IncidentGroupingRule";
+import { IsBillingEnabled } from "../EnvironmentConfig";
+
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+    if (IsBillingEnabled) {
+      this.hardDeleteItemsOlderThanInDays("createdAt", 3 * 365); // 3 years
+    }
+  }
+}
+
+export default new Service();

package/Server/Services/IncidentService.ts

@@ -49,6 +49,7 @@ import Semaphore, {
 } from "../../Server/Infrastructure/Semaphore";
 import IncidentFeedService from "./IncidentFeedService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
+import IncidentGroupingEngineService from "./IncidentGroupingEngineService";
 import { Blue500, Gray500, Red500 } from "../../Types/BrandColors";
 import Label from "../../Models/DatabaseModels/Label";
 import LabelService from "./LabelService";
@@ -841,6 +842,16 @@ export class Service extends DatabaseService<Model> {
           return Promise.resolve();
         }
       })
+      .then(async () => {
+        // Process incident for grouping into episodes
+        try {
+          await IncidentGroupingEngineService.processIncident(createdItem);
+        } catch (error) {
+          logger.error(
+            `Incident grouping failed in IncidentService.onCreateSuccess: ${error}`,
+          );
+        }
+      })
       .catch((error: Error) => {
         logger.error(
           `Critical error in IncidentService sequential operations: ${error}`,

package/Server/Services/Index.ts

@@ -167,6 +167,15 @@ import AlertEpisodeMemberService from "./AlertEpisodeMemberService";
 import AlertEpisodeOwnerTeamService from "./AlertEpisodeOwnerTeamService";
 import AlertEpisodeOwnerUserService from "./AlertEpisodeOwnerUserService";
 import AlertEpisodeStateTimelineService from "./AlertEpisodeStateTimelineService";
+
+// IncidentEpisode Services
+import IncidentEpisodeService from "./IncidentEpisodeService";
+import IncidentEpisodeFeedService from "./IncidentEpisodeFeedService";
+import IncidentEpisodeInternalNoteService from "./IncidentEpisodeInternalNoteService";
+import IncidentEpisodeMemberService from "./IncidentEpisodeMemberService";
+import IncidentEpisodeOwnerTeamService from "./IncidentEpisodeOwnerTeamService";
+import IncidentEpisodeOwnerUserService from "./IncidentEpisodeOwnerUserService";
+import IncidentEpisodeStateTimelineService from "./IncidentEpisodeStateTimelineService";
 import AlertGroupingRuleService from "./AlertGroupingRuleService";
 
 import TableViewService from "./TableViewService";
@@ -370,6 +379,15 @@ const services: Array<BaseService> = [
   AlertEpisodeOwnerTeamService,
   AlertEpisodeOwnerUserService,
   AlertEpisodeStateTimelineService,
+
+  // IncidentEpisode Services
+  IncidentEpisodeService,
+  IncidentEpisodeFeedService,
+  IncidentEpisodeInternalNoteService,
+  IncidentEpisodeMemberService,
+  IncidentEpisodeOwnerTeamService,
+  IncidentEpisodeOwnerUserService,
+  IncidentEpisodeStateTimelineService,
   AlertGroupingRuleService,
 
   TableViewService,

package/Server/Services/MailService.ts

@@ -24,6 +24,7 @@ export class MailService extends BaseService {
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
+      incidentEpisodeId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;

package/Server/Services/MonitorService.ts

@@ -118,6 +118,15 @@ export class Service extends DatabaseService<Model> {
             monitorDestination = `${monitorDestination}:${port}`;
           }
         }
+
+        // For SNMP monitors, use the hostname from snmpMonitor config
+        if (monitorType === MonitorType.SNMP && firstStep?.data?.snmpMonitor) {
+          monitorDestination = firstStep.data.snmpMonitor.hostname || "";
+          const port: number = firstStep.data.snmpMonitor.port || 161;
+          if (monitorDestination && port) {
+            monitorDestination = `${monitorDestination}:${port}`;
+          }
+        }
       }
     }
 

package/Server/Services/OnCallDutyPolicyEscalationRuleService.ts

@@ -111,6 +111,7 @@ export class Service extends DatabaseService<Model> {
       triggeredByIncidentId?: ObjectID | undefined;
       triggeredByAlertId?: ObjectID | undefined;
       triggeredByAlertEpisodeId?: ObjectID | undefined;
+      triggeredByIncidentEpisodeId?: ObjectID | undefined;
       userNotificationEventType: UserNotificationEventType;
       onCallPolicyExecutionLogId: ObjectID;
       onCallPolicyId: ObjectID;
@@ -178,6 +179,11 @@ export class Service extends DatabaseService<Model> {
           log.triggeredByAlertEpisodeId = options.triggeredByAlertEpisodeId;
         }
 
+        if (options.triggeredByIncidentEpisodeId) {
+          log.triggeredByIncidentEpisodeId =
+            options.triggeredByIncidentEpisodeId;
+        }
+
         return log;
       };
 
@@ -211,6 +217,16 @@ export class Service extends DatabaseService<Model> {
       );
     }
 
+    if (
+      UserNotificationEventType.IncidentEpisodeCreated ===
+        options.userNotificationEventType &&
+      !options.triggeredByIncidentEpisodeId
+    ) {
+      throw new BadDataException(
+        "triggeredByIncidentEpisodeId is required when userNotificationEventType is IncidentEpisodeCreated",
+      );
+    }
+
     const usersInRule: Array<OnCallDutyPolicyEscalationRuleUser> =
       await OnCallDutyPolicyEscalationRuleUserService.findBy({
         query: {
@@ -324,6 +340,8 @@ export class Service extends DatabaseService<Model> {
             triggeredByAlertId: options.triggeredByAlertId || undefined,
             triggeredByAlertEpisodeId:
               options.triggeredByAlertEpisodeId || undefined,
+            triggeredByIncidentEpisodeId:
+              options.triggeredByIncidentEpisodeId || undefined,
             onCallPolicyExecutionLogId: options.onCallPolicyExecutionLogId,
             onCallPolicyId: options.onCallPolicyId,
             onCallPolicyEscalationRuleId: ruleId,

package/Server/Services/OnCallDutyPolicyExecutionLogService.ts

@@ -19,10 +19,13 @@ import AlertFeedService from "./AlertFeedService";
 import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
 import AlertEpisodeFeedService from "./AlertEpisodeFeedService";
 import { AlertEpisodeFeedEventType } from "../../Models/DatabaseModels/AlertEpisodeFeed";
+import IncidentEpisodeFeedService from "./IncidentEpisodeFeedService";
+import { IncidentEpisodeFeedEventType } from "../../Models/DatabaseModels/IncidentEpisodeFeed";
 import BadDataException from "../../Types/Exception/BadDataException";
 import IncidentService from "./IncidentService";
 import AlertService from "./AlertService";
 import AlertEpisodeService from "./AlertEpisodeService";
+import IncidentEpisodeService from "./IncidentEpisodeService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -61,7 +64,8 @@ export class Service extends DatabaseService<Model> {
     if (
       createdItem.triggeredByIncidentId ||
       createdItem.triggeredByAlertId ||
-      createdItem.triggeredByAlertEpisodeId
+      createdItem.triggeredByAlertEpisodeId ||
+      createdItem.triggeredByIncidentEpisodeId
     ) {
       const onCallPolicy: OnCallDutyPolicy | null =
         await OnCallDutyPolicyService.findOneById({
@@ -105,6 +109,14 @@ export class Service extends DatabaseService<Model> {
           incidentOrAlertLink = `[Alert Episode ${episodeNumber}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(createdItem.projectId!, createdItem.triggeredByAlertEpisodeId)).toString()})`;
         }
 
+        if (createdItem.triggeredByIncidentEpisodeId) {
+          const episodeNumber: number | null =
+            await IncidentEpisodeService.getEpisodeNumber({
+              episodeId: createdItem.triggeredByIncidentEpisodeId,
+            });
+          incidentOrAlertLink = `[Incident Episode ${episodeNumber}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(createdItem.projectId!, createdItem.triggeredByIncidentEpisodeId)).toString()})`;
+        }
+
         const feedInfoInMarkdown: string = `**📞 On Call Policy Started Executing:** On Call Policy **${onCallPolicy.name}** started executing for ${incidentOrAlertLink}. Users on call on this policy will now be notified.`;
 
         if (
@@ -147,6 +159,21 @@ export class Service extends DatabaseService<Model> {
             feedInfoInMarkdown: feedInfoInMarkdown,
           });
         }
+
+        if (
+          onCallPolicy &&
+          onCallPolicy.id &&
+          createdItem.triggeredByIncidentEpisodeId
+        ) {
+          await IncidentEpisodeFeedService.createIncidentEpisodeFeedItem({
+            incidentEpisodeId: createdItem.triggeredByIncidentEpisodeId,
+            projectId: createdItem.projectId!,
+            incidentEpisodeFeedEventType:
+              IncidentEpisodeFeedEventType.OnCallPolicy,
+            displayColor: Yellow500,
+            feedInfoInMarkdown: feedInfoInMarkdown,
+          });
+        }
       }
     }
 
@@ -193,6 +220,11 @@ export class Service extends DatabaseService<Model> {
           UserNotificationEventType.AlertEpisodeCreated;
       }
 
+      if (createdItem.triggeredByIncidentEpisodeId) {
+        userNotificationEventType =
+          UserNotificationEventType.IncidentEpisodeCreated;
+      }
+
       if (!userNotificationEventType) {
         throw new BadDataException("Invalid userNotificationEventType");
       }
@@ -204,6 +236,8 @@ export class Service extends DatabaseService<Model> {
           triggeredByIncidentId: createdItem.triggeredByIncidentId,
           triggeredByAlertId: createdItem.triggeredByAlertId,
           triggeredByAlertEpisodeId: createdItem.triggeredByAlertEpisodeId,
+          triggeredByIncidentEpisodeId:
+            createdItem.triggeredByIncidentEpisodeId,
           userNotificationEventType: userNotificationEventType,
           onCallPolicyExecutionLogId: createdItem.id!,
           onCallPolicyId: createdItem.onCallDutyPolicyId!,
@@ -292,6 +326,7 @@ export class Service extends DatabaseService<Model> {
             triggeredByIncidentId: true,
             triggeredByAlertId: true,
             triggeredByAlertEpisodeId: true,
+            triggeredByIncidentEpisodeId: true,
           },
           props: {
             isRoot: true,
@@ -303,7 +338,8 @@ export class Service extends DatabaseService<Model> {
         onCalldutyPolicyExecutionLog &&
         (onCalldutyPolicyExecutionLog.triggeredByIncidentId ||
           onCalldutyPolicyExecutionLog.triggeredByAlertId ||
-          onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId)
+          onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId ||
+          onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId)
       ) {
         const onCallPolicy: OnCallDutyPolicy | null =
           await OnCallDutyPolicyService.findOneById({
@@ -354,6 +390,15 @@ export class Service extends DatabaseService<Model> {
             incidentOrAlertLink = `[Alert Episode ${episodeNumber}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId)).toString()})`;
           }
 
+          if (onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId) {
+            const episodeNumber: number | null =
+              await IncidentEpisodeService.getEpisodeNumber({
+                episodeId:
+                  onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId,
+              });
+            incidentOrAlertLink = `[Incident Episode ${episodeNumber}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId)).toString()})`;
+          }
+
           const feedInfoInMarkdown: string = `**${this.getEmojiByStatus(onCalldutyPolicyExecutionLog.status)} On Call Policy Status Updated for ${incidentOrAlertLink}:**
 
  On-call policy **[${onCallPolicy.name?.toString()}](${(await OnCallDutyPolicyService.getOnCallDutyPolicyLinkInDashboard(onCallPolicy.projectId!, onCallPolicy.id!)).toString()})** status updated to **${onCalldutyPolicyExecutionLog.status}**`;
@@ -406,6 +451,23 @@ export class Service extends DatabaseService<Model> {
               feedInfoInMarkdown: feedInfoInMarkdown,
             });
           }
+
+          if (onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId) {
+            await IncidentEpisodeFeedService.createIncidentEpisodeFeedItem({
+              incidentEpisodeId:
+                onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId,
+              projectId: onCalldutyPolicyExecutionLog.projectId!,
+              incidentEpisodeFeedEventType:
+                IncidentEpisodeFeedEventType.OnCallPolicy,
+              displayColor: onCalldutyPolicyExecutionLog.status
+                ? this.getDisplayColorByStatus(
+                    onCalldutyPolicyExecutionLog.status,
+                  )
+                : Blue500,
+              moreInformationInMarkdown: moreInformationInMarkdown,
+              feedInfoInMarkdown: feedInfoInMarkdown,
+            });
+          }
         }
       }
     }

package/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts

@@ -13,9 +13,12 @@ import AlertFeedService from "./AlertFeedService";
 import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
 import AlertEpisodeFeedService from "./AlertEpisodeFeedService";
 import { AlertEpisodeFeedEventType } from "../../Models/DatabaseModels/AlertEpisodeFeed";
+import IncidentEpisodeFeedService from "./IncidentEpisodeFeedService";
+import { IncidentEpisodeFeedEventType } from "../../Models/DatabaseModels/IncidentEpisodeFeed";
 import OnCallDutyPolicyService from "./OnCallDutyPolicyService";
 import AlertService from "./AlertService";
 import AlertEpisodeService from "./AlertEpisodeService";
+import IncidentEpisodeService from "./IncidentEpisodeService";
 import IncidentService from "./IncidentService";
 import UserService from "./UserService";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -130,7 +133,8 @@ export class Service extends DatabaseService<Model> {
     if (
       !onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId &&
       !onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId &&
-      !onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId
+      !onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId &&
+      !onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId
     ) {
       return;
     }
@@ -186,6 +190,15 @@ export class Service extends DatabaseService<Model> {
           incidentOrAlertLink = `[Alert Episode ${episodeNumber}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId)).toString()})`;
         }
 
+        if (onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId) {
+          const episodeNumber: number | null =
+            await IncidentEpisodeService.getEpisodeNumber({
+              episodeId:
+                onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId,
+            });
+          incidentOrAlertLink = `[Incident Episode ${episodeNumber}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId)).toString()})`;
+        }
+
         let feedInfoInMarkdown: string = `**${this.getEmojiBasedOnStatus(status)} ${incidentOrAlertLink} On-Call Alert ${status} to ${await UserService.getUserMarkdownString(
           {
             userId: onCallDutyPolicyExecutionLogTimeline.alertSentToUserId!,
@@ -250,6 +263,18 @@ The on-call policy **[${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.na
           });
         }
 
+        if (onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId) {
+          await IncidentEpisodeFeedService.createIncidentEpisodeFeedItem({
+            incidentEpisodeId:
+              onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId,
+            projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
+            incidentEpisodeFeedEventType:
+              IncidentEpisodeFeedEventType.OnCallNotification,
+            displayColor: displayColor,
+            feedInfoInMarkdown: feedInfoInMarkdown,
+          });
+        }
+
         logger.debug("Incident Feed created");
       }
     }

package/Server/Services/OnCallDutyPolicyService.ts

@@ -264,6 +264,7 @@ ${onCallPolicy.description || "No description provided."}
       triggeredByIncidentId?: ObjectID | undefined;
       triggeredByAlertId?: ObjectID | undefined;
       triggeredByAlertEpisodeId?: ObjectID | undefined;
+      triggeredByIncidentEpisodeId?: ObjectID | undefined;
       userNotificationEventType: UserNotificationEventType;
     },
   ): Promise<void> {
@@ -299,6 +300,16 @@ ${onCallPolicy.description || "No description provided."}
       );
     }
 
+    if (
+      UserNotificationEventType.IncidentEpisodeCreated ===
+        options.userNotificationEventType &&
+      !options.triggeredByIncidentEpisodeId
+    ) {
+      throw new BadDataException(
+        "triggeredByIncidentEpisodeId is required when userNotificationEventType is IncidentEpisodeCreated",
+      );
+    }
+
     const policy: OnCallDutyPolicy | null = await this.findOneById({
       id: policyId,
       select: {
@@ -338,6 +349,10 @@ ${onCallPolicy.description || "No description provided."}
       log.triggeredByAlertEpisodeId = options.triggeredByAlertEpisodeId;
     }
 
+    if (options.triggeredByIncidentEpisodeId) {
+      log.triggeredByIncidentEpisodeId = options.triggeredByIncidentEpisodeId;
+    }
+
     await OnCallDutyPolicyExecutionLogService.create({
       data: log,
       props: {

package/Server/Services/SmsService.ts

@@ -29,6 +29,7 @@ export class SmsService extends BaseService {
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
+      incidentEpisodeId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;

package/Server/Services/UserNotificationRuleService.ts

@@ -56,6 +56,8 @@ import AlertEpisode from "../../Models/DatabaseModels/AlertEpisode";
 import AlertEpisodeService from "./AlertEpisodeService";
 import AlertEpisodeMember from "../../Models/DatabaseModels/AlertEpisodeMember";
 import AlertEpisodeMemberService from "./AlertEpisodeMemberService";
+import IncidentEpisode from "../../Models/DatabaseModels/IncidentEpisode";
+import IncidentEpisodeService from "./IncidentEpisodeService";
 import WorkspaceNotificationRule from "../../Models/DatabaseModels/WorkspaceNotificationRule";
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
 import PushNotificationService from "./PushNotificationService";
@@ -79,6 +81,7 @@ export class Service extends DatabaseService<Model> {
       triggeredByIncidentId?: ObjectID | undefined;
       triggeredByAlertId?: ObjectID | undefined;
       triggeredByAlertEpisodeId?: ObjectID | undefined;
+      triggeredByIncidentEpisodeId?: ObjectID | undefined;
       userNotificationEventType: UserNotificationEventType;
       onCallPolicyExecutionLogId?: ObjectID | undefined;
       onCallPolicyId: ObjectID | undefined;
@@ -212,6 +215,11 @@ export class Service extends DatabaseService<Model> {
         options.triggeredByAlertEpisodeId;
     }
 
+    if (options.triggeredByIncidentEpisodeId) {
+      logTimelineItem.triggeredByIncidentEpisodeId =
+        options.triggeredByIncidentEpisodeId;
+    }
+
     if (options.onCallDutyPolicyExecutionLogTimelineId) {
       logTimelineItem.onCallDutyPolicyExecutionLogTimelineId =
         options.onCallDutyPolicyExecutionLogTimelineId;
@@ -312,9 +320,41 @@ export class Service extends DatabaseService<Model> {
       });
     }
 
-    if (!incident && !alert && !alertEpisode) {
+    let incidentEpisode: IncidentEpisode | null = null;
+
+    if (
+      options.userNotificationEventType ===
+        UserNotificationEventType.IncidentEpisodeCreated &&
+      options.triggeredByIncidentEpisodeId
+    ) {
+      incidentEpisode = await IncidentEpisodeService.findOneById({
+        id: options.triggeredByIncidentEpisodeId!,
+        props: {
+          isRoot: true,
+        },
+        select: {
+          _id: true,
+          title: true,
+          description: true,
+          projectId: true,
+          project: {
+            name: true,
+          },
+          currentIncidentState: {
+            name: true,
+          },
+          incidentSeverity: {
+            name: true,
+          },
+          episodeNumber: true,
+          rootCause: true,
+        },
+      });
+    }
+
+    if (!incident && !alert && !alertEpisode && !incidentEpisode) {
       throw new BadDataException(
-        "Incident, Alert, or Alert Episode not found.",
+        "Incident, Alert, Alert Episode, or Incident Episode not found.",
       );
     }
 
@@ -1969,6 +2009,7 @@ export class Service extends DatabaseService<Model> {
       triggeredByIncidentId?: ObjectID | undefined;
       triggeredByAlertId?: ObjectID | undefined;
       triggeredByAlertEpisodeId?: ObjectID | undefined;
+      triggeredByIncidentEpisodeId?: ObjectID | undefined;
       userNotificationEventType: UserNotificationEventType;
       onCallPolicyExecutionLogId?: ObjectID | undefined;
       onCallPolicyId: ObjectID | undefined;
@@ -1998,6 +2039,11 @@ export class Service extends DatabaseService<Model> {
         options.triggeredByAlertEpisodeId;
     }
 
+    if (options.triggeredByIncidentEpisodeId) {
+      userOnCallLog.triggeredByIncidentEpisodeId =
+        options.triggeredByIncidentEpisodeId;
+    }
+
     userOnCallLog.userNotificationEventType = options.userNotificationEventType;
 
     if (options.onCallPolicyExecutionLogId) {

package/Server/Services/UserNotificationSettingService.ts

@@ -50,6 +50,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     incidentId?: ObjectID | undefined;
     alertId?: ObjectID | undefined;
     alertEpisodeId?: ObjectID | undefined;
+    incidentEpisodeId?: ObjectID | undefined;
     scheduledMaintenanceId?: ObjectID | undefined;
     statusPageId?: ObjectID | undefined;
     statusPageAnnouncementId?: ObjectID | undefined;
@@ -115,6 +116,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
               incidentId: data.incidentId,
               alertId: data.alertId,
               alertEpisodeId: data.alertEpisodeId,
+              incidentEpisodeId: data.incidentEpisodeId,
               scheduledMaintenanceId: data.scheduledMaintenanceId,
               statusPageId: data.statusPageId,
               statusPageAnnouncementId: data.statusPageAnnouncementId,
@@ -161,6 +163,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
               incidentId: data.incidentId,
               alertId: data.alertId,
               alertEpisodeId: data.alertEpisodeId,
+              incidentEpisodeId: data.incidentEpisodeId,
               scheduledMaintenanceId: data.scheduledMaintenanceId,
               statusPageId: data.statusPageId,
               statusPageAnnouncementId: data.statusPageAnnouncementId,
@@ -214,6 +217,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
               incidentId: data.incidentId,
               alertId: data.alertId,
               alertEpisodeId: data.alertEpisodeId,
+              incidentEpisodeId: data.incidentEpisodeId,
               scheduledMaintenanceId: data.scheduledMaintenanceId,
               statusPageId: data.statusPageId,
               statusPageAnnouncementId: data.statusPageAnnouncementId,
@@ -259,6 +263,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
               incidentId: data.incidentId,
               alertId: data.alertId,
               alertEpisodeId: data.alertEpisodeId,
+              incidentEpisodeId: data.incidentEpisodeId,
               scheduledMaintenanceId: data.scheduledMaintenanceId,
               statusPageId: data.statusPageId,
               statusPageAnnouncementId: data.statusPageAnnouncementId,
@@ -346,6 +351,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     await this.addOnCallNotificationSettings(userId, projectId);
     await this.addAlertNotificationSettings(userId, projectId);
     await this.addAlertEpisodeNotificationSettings(userId, projectId);
+    await this.addIncidentEpisodeNotificationSettings(userId, projectId);
   }
 
   private async addProbeOwnerNotificationSettings(
@@ -474,6 +480,23 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     );
   }
 
+  private async addIncidentEpisodeNotificationSettings(
+    userId: ObjectID,
+    projectId: ObjectID,
+  ): Promise<void> {
+    await this.addNotificationSettingIfNotExists(
+      userId,
+      projectId,
+      NotificationSettingEventType.SEND_INCIDENT_EPISODE_CREATED_OWNER_NOTIFICATION,
+    );
+
+    await this.addNotificationSettingIfNotExists(
+      userId,
+      projectId,
+      NotificationSettingEventType.SEND_INCIDENT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION,
+    );
+  }
+
   private async addNotificationSettingIfNotExists(
     userId: ObjectID,
     projectId: ObjectID,

package/Server/Services/UserOnCallLogService.ts

@@ -21,6 +21,8 @@ import Alert from "../../Models/DatabaseModels/Alert";
 import AlertService from "./AlertService";
 import AlertEpisode from "../../Models/DatabaseModels/AlertEpisode";
 import AlertEpisodeService from "./AlertEpisodeService";
+import IncidentEpisode from "../../Models/DatabaseModels/IncidentEpisode";
+import IncidentEpisodeService from "./IncidentEpisodeService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -206,6 +208,34 @@ export class Service extends DatabaseService<Model> {
       });
     }
 
+    // get rule count for incident episodes.
+    let incidentEpisode: IncidentEpisode | null = null;
+    if (createdItem.triggeredByIncidentEpisodeId) {
+      incidentEpisode = await IncidentEpisodeService.findOneById({
+        id: createdItem.triggeredByIncidentEpisodeId,
+        props: {
+          isRoot: true,
+        },
+        select: {
+          incidentSeverityId: true,
+        },
+      });
+
+      ruleCount = await UserNotificationRuleService.countBy({
+        query: {
+          userId: createdItem.userId!,
+          projectId: createdItem.projectId!,
+          ruleType: notificationRuleType,
+          incidentSeverityId: incidentEpisode?.incidentSeverityId as ObjectID,
+        },
+        skip: 0,
+        limit: LIMIT_PER_PROJECT,
+        props: {
+          isRoot: true,
+        },
+      });
+    }
+
     if (ruleCount.toNumber() === 0) {
       // update this item to be processed.
       await this.updateOneById({
@@ -239,6 +269,7 @@ export class Service extends DatabaseService<Model> {
     /*
      * find immediate notification rule and alert the user.
      * Determine the alertSeverityId - can come from alert or alertEpisode
+     * Determine the incidentSeverityId - can come from incident or incidentEpisode
      */
     const alertSeverityIdForQuery: ObjectID | undefined =
       alert && alert.alertSeverityId
@@ -247,6 +278,13 @@ export class Service extends DatabaseService<Model> {
           ? (alertEpisode.alertSeverityId as ObjectID)
           : undefined;
 
+    const incidentSeverityIdForQuery: ObjectID | undefined =
+      incident && incident.incidentSeverityId
+        ? (incident.incidentSeverityId as ObjectID)
+        : incidentEpisode && incidentEpisode.incidentSeverityId
+          ? (incidentEpisode.incidentSeverityId as ObjectID)
+          : undefined;
+
     const immediateNotificationRule: Array<UserNotificationRule> =
       await UserNotificationRuleService.findBy({
         query: {
@@ -254,10 +292,7 @@ export class Service extends DatabaseService<Model> {
           projectId: createdItem.projectId!,
           notifyAfterMinutes: 0,
           ruleType: notificationRuleType,
-          incidentSeverityId:
-            incident && incident.incidentSeverityId
-              ? (incident?.incidentSeverityId as ObjectID)
-              : undefined,
+          incidentSeverityId: incidentSeverityIdForQuery,
           alertSeverityId: alertSeverityIdForQuery,
         },
         select: {
@@ -279,6 +314,8 @@ export class Service extends DatabaseService<Model> {
           triggeredByIncidentId: createdItem.triggeredByIncidentId,
           triggeredByAlertId: createdItem.triggeredByAlertId,
           triggeredByAlertEpisodeId: createdItem.triggeredByAlertEpisodeId,
+          triggeredByIncidentEpisodeId:
+            createdItem.triggeredByIncidentEpisodeId,
           userNotificationEventType: createdItem.userNotificationEventType!,
           onCallPolicyExecutionLogId:
             createdItem.onCallDutyPolicyExecutionLogId,

package/Server/Services/WhatsAppService.ts

@@ -27,6 +27,7 @@ export class WhatsAppService extends BaseService {
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
+      incidentEpisodeId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;