@oneuptime/common 9.4.7 → 9.4.8

package/Types/Permission.ts

@@ -701,6 +701,53 @@ enum Permission {
   DeleteWorkspaceNotificationRule = "DeleteWorkspaceNotificationRule",
   EditWorkspaceNotificationRule = "EditWorkspaceNotificationRule",
   ReadWorkspaceNotificationRule = "ReadWorkspaceNotificationRule",
+
+  // Alert Episode Permissions
+  CreateAlertEpisode = "CreateAlertEpisode",
+  DeleteAlertEpisode = "DeleteAlertEpisode",
+  EditAlertEpisode = "EditAlertEpisode",
+  ReadAlertEpisode = "ReadAlertEpisode",
+
+  // Alert Episode Member Permissions
+  CreateAlertEpisodeMember = "CreateAlertEpisodeMember",
+  DeleteAlertEpisodeMember = "DeleteAlertEpisodeMember",
+  EditAlertEpisodeMember = "EditAlertEpisodeMember",
+  ReadAlertEpisodeMember = "ReadAlertEpisodeMember",
+
+  // Alert Grouping Rule Permissions
+  CreateAlertGroupingRule = "CreateAlertGroupingRule",
+  DeleteAlertGroupingRule = "DeleteAlertGroupingRule",
+  EditAlertGroupingRule = "EditAlertGroupingRule",
+  ReadAlertGroupingRule = "ReadAlertGroupingRule",
+
+  // Alert Episode State Timeline Permissions
+  CreateAlertEpisodeStateTimeline = "CreateAlertEpisodeStateTimeline",
+  DeleteAlertEpisodeStateTimeline = "DeleteAlertEpisodeStateTimeline",
+  EditAlertEpisodeStateTimeline = "EditAlertEpisodeStateTimeline",
+  ReadAlertEpisodeStateTimeline = "ReadAlertEpisodeStateTimeline",
+
+  // Alert Episode Owner User Permissions
+  CreateAlertEpisodeOwnerUser = "CreateAlertEpisodeOwnerUser",
+  DeleteAlertEpisodeOwnerUser = "DeleteAlertEpisodeOwnerUser",
+  EditAlertEpisodeOwnerUser = "EditAlertEpisodeOwnerUser",
+  ReadAlertEpisodeOwnerUser = "ReadAlertEpisodeOwnerUser",
+
+  // Alert Episode Owner Team Permissions
+  CreateAlertEpisodeOwnerTeam = "CreateAlertEpisodeOwnerTeam",
+  DeleteAlertEpisodeOwnerTeam = "DeleteAlertEpisodeOwnerTeam",
+  EditAlertEpisodeOwnerTeam = "EditAlertEpisodeOwnerTeam",
+  ReadAlertEpisodeOwnerTeam = "ReadAlertEpisodeOwnerTeam",
+
+  // Alert Episode Internal Note Permissions
+  CreateAlertEpisodeInternalNote = "CreateAlertEpisodeInternalNote",
+  DeleteAlertEpisodeInternalNote = "DeleteAlertEpisodeInternalNote",
+  EditAlertEpisodeInternalNote = "EditAlertEpisodeInternalNote",
+  ReadAlertEpisodeInternalNote = "ReadAlertEpisodeInternalNote",
+
+  // Alert Episode Feed Permissions
+  CreateAlertEpisodeFeed = "CreateAlertEpisodeFeed",
+  EditAlertEpisodeFeed = "EditAlertEpisodeFeed",
+  ReadAlertEpisodeFeed = "ReadAlertEpisodeFeed",
 }
 
 export class PermissionHelper {
@@ -5017,6 +5064,268 @@ export class PermissionHelper {
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },
+
+      // Alert Episode Permissions
+      {
+        permission: Permission.CreateAlertEpisode,
+        title: "Create Alert Episode",
+        description:
+          "This permission can create Alert Episodes in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: true,
+      },
+      {
+        permission: Permission.DeleteAlertEpisode,
+        title: "Delete Alert Episode",
+        description:
+          "This permission can delete Alert Episodes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: true,
+      },
+      {
+        permission: Permission.EditAlertEpisode,
+        title: "Edit Alert Episode",
+        description: "This permission can edit Alert Episodes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: true,
+      },
+      {
+        permission: Permission.ReadAlertEpisode,
+        title: "Read Alert Episode",
+        description: "This permission can read Alert Episodes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: true,
+      },
+
+      // Alert Episode Member Permissions
+      {
+        permission: Permission.CreateAlertEpisodeMember,
+        title: "Create Alert Episode Member",
+        description:
+          "This permission can add alerts to Alert Episodes in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteAlertEpisodeMember,
+        title: "Delete Alert Episode Member",
+        description:
+          "This permission can remove alerts from Alert Episodes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertEpisodeMember,
+        title: "Edit Alert Episode Member",
+        description:
+          "This permission can edit Alert Episode Members of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertEpisodeMember,
+        title: "Read Alert Episode Member",
+        description:
+          "This permission can read Alert Episode Members of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
+      // Alert Grouping Rule Permissions
+      {
+        permission: Permission.CreateAlertGroupingRule,
+        title: "Create Alert Grouping Rule",
+        description:
+          "This permission can create Alert Grouping Rules in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteAlertGroupingRule,
+        title: "Delete Alert Grouping Rule",
+        description:
+          "This permission can delete Alert Grouping Rules of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertGroupingRule,
+        title: "Edit Alert Grouping Rule",
+        description:
+          "This permission can edit Alert Grouping Rules of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertGroupingRule,
+        title: "Read Alert Grouping Rule",
+        description:
+          "This permission can read Alert Grouping Rules of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
+      // Alert Episode State Timeline Permissions
+      {
+        permission: Permission.CreateAlertEpisodeStateTimeline,
+        title: "Create Alert Episode State Timeline",
+        description:
+          "This permission can create Alert Episode state history in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteAlertEpisodeStateTimeline,
+        title: "Delete Alert Episode State Timeline",
+        description:
+          "This permission can delete Alert Episode state history of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertEpisodeStateTimeline,
+        title: "Edit Alert Episode State Timeline",
+        description:
+          "This permission can edit Alert Episode state history of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertEpisodeStateTimeline,
+        title: "Read Alert Episode State Timeline",
+        description:
+          "This permission can read Alert Episode state history of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
+      // Alert Episode Owner User Permissions
+      {
+        permission: Permission.CreateAlertEpisodeOwnerUser,
+        title: "Create Alert Episode User Owner",
+        description:
+          "This permission can add user owners to Alert Episodes in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteAlertEpisodeOwnerUser,
+        title: "Delete Alert Episode User Owner",
+        description:
+          "This permission can remove user owners from Alert Episodes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertEpisodeOwnerUser,
+        title: "Edit Alert Episode User Owner",
+        description:
+          "This permission can edit Alert Episode user owners of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertEpisodeOwnerUser,
+        title: "Read Alert Episode User Owner",
+        description:
+          "This permission can read Alert Episode user owners of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
+      // Alert Episode Owner Team Permissions
+      {
+        permission: Permission.CreateAlertEpisodeOwnerTeam,
+        title: "Create Alert Episode Team Owner",
+        description:
+          "This permission can add team owners to Alert Episodes in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteAlertEpisodeOwnerTeam,
+        title: "Delete Alert Episode Team Owner",
+        description:
+          "This permission can remove team owners from Alert Episodes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertEpisodeOwnerTeam,
+        title: "Edit Alert Episode Team Owner",
+        description:
+          "This permission can edit Alert Episode team owners of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertEpisodeOwnerTeam,
+        title: "Read Alert Episode Team Owner",
+        description:
+          "This permission can read Alert Episode team owners of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
+      // Alert Episode Internal Note Permissions
+      {
+        permission: Permission.CreateAlertEpisodeInternalNote,
+        title: "Create Alert Episode Internal Note",
+        description:
+          "This permission can create Alert Episode internal notes in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteAlertEpisodeInternalNote,
+        title: "Delete Alert Episode Internal Note",
+        description:
+          "This permission can delete Alert Episode internal notes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertEpisodeInternalNote,
+        title: "Edit Alert Episode Internal Note",
+        description:
+          "This permission can edit Alert Episode internal notes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertEpisodeInternalNote,
+        title: "Read Alert Episode Internal Note",
+        description:
+          "This permission can read Alert Episode internal notes of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
+      // Alert Episode Feed Permissions
+      {
+        permission: Permission.CreateAlertEpisodeFeed,
+        title: "Create Alert Episode Feed",
+        description:
+          "This permission can create Alert Episode feed items in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditAlertEpisodeFeed,
+        title: "Edit Alert Episode Feed",
+        description:
+          "This permission can edit Alert Episode feed items of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadAlertEpisodeFeed,
+        title: "Read Alert Episode Feed",
+        description:
+          "This permission can read Alert Episode feed items of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
     ];
 
     return permissions;

package/Types/UserNotification/UserNotificationEventType.ts

@@ -1,6 +1,7 @@
 enum UserNotificationEventType {
   IncidentCreated = "Incident Created",
   AlertCreated = "Alert Created",
+  AlertEpisodeCreated = "Alert Episode Created",
 }
 
 export default UserNotificationEventType;

package/Types/WhatsApp/WhatsAppTemplates.ts

@@ -11,6 +11,10 @@ type TemplateIdsMap = {
   readonly AlertNotePostedOwnerNotification: "oneuptime_alert_note_posted_owner_notification";
   readonly AlertStateChangedOwnerNotification: "oneuptime_alert_state_changed_owner_notification";
   readonly AlertOwnerAddedNotification: "oneuptime_alert_owner_added_notification";
+  readonly AlertEpisodeCreatedOwnerNotification: "oneuptime_alert_episode_created_owner_notification";
+  readonly AlertEpisodeNotePostedOwnerNotification: "oneuptime_alert_episode_note_posted_owner_notification";
+  readonly AlertEpisodeStateChangedOwnerNotification: "oneuptime_alert_episode_state_changed_owner_notification";
+  readonly AlertEpisodeOwnerAddedNotification: "oneuptime_alert_episode_owner_added_notification";
   readonly MonitorOwnerAddedNotification: "oneuptime_monitor_owner_added_notification";
   readonly MonitorCreatedOwnerNotification: "oneuptime_monitor_created_owner_notification";
   readonly MonitorStatusChangedOwnerNotification: "oneuptime_monitor_status_changed_owner_notification";
@@ -52,6 +56,14 @@ const templateIds: TemplateIdsMap = {
   AlertStateChangedOwnerNotification:
     "oneuptime_alert_state_changed_owner_notification",
   AlertOwnerAddedNotification: "oneuptime_alert_owner_added_notification",
+  AlertEpisodeCreatedOwnerNotification:
+    "oneuptime_alert_episode_created_owner_notification",
+  AlertEpisodeNotePostedOwnerNotification:
+    "oneuptime_alert_episode_note_posted_owner_notification",
+  AlertEpisodeStateChangedOwnerNotification:
+    "oneuptime_alert_episode_state_changed_owner_notification",
+  AlertEpisodeOwnerAddedNotification:
+    "oneuptime_alert_episode_owner_added_notification",
   MonitorOwnerAddedNotification: "oneuptime_monitor_owner_added_notification",
   MonitorCreatedOwnerNotification:
     "oneuptime_monitor_created_owner_notification",
@@ -118,6 +130,10 @@ export const WhatsAppTemplateMessages: WhatsAppTemplateMessagesDefinition = {
   [WhatsAppTemplateIds.AlertNotePostedOwnerNotification]: `A new note was posted on alert #{{alert_number}} ({{alert_title}}). Review the alert using {{alert_link}} on the OneUptime dashboard for updates.`,
   [WhatsAppTemplateIds.AlertStateChangedOwnerNotification]: `Alert #{{alert_number}} ({{alert_title}}) state changed to {{alert_state}}. Track the alert status using {{alert_link}} on the OneUptime dashboard to stay informed.`,
   [WhatsAppTemplateIds.AlertOwnerAddedNotification]: `You have been added as an owner of alert #{{alert_number}} ({{alert_title}}). Manage the alert using {{alert_link}} on the OneUptime dashboard to take action.`,
+  [WhatsAppTemplateIds.AlertEpisodeCreatedOwnerNotification]: `Alert Episode #{{episode_number}} ({{episode_title}}) has been created for project {{project_name}}. View alert episode details using {{episode_link}} on the OneUptime dashboard.`,
+  [WhatsAppTemplateIds.AlertEpisodeNotePostedOwnerNotification]: `A new note was posted on alert episode #{{episode_number}} ({{episode_title}}). Review the alert episode using {{episode_link}} on the OneUptime dashboard for updates.`,
+  [WhatsAppTemplateIds.AlertEpisodeStateChangedOwnerNotification]: `Alert Episode #{{episode_number}} ({{episode_title}}) state changed to {{episode_state}}. Track the alert episode status using {{episode_link}} on the OneUptime dashboard.`,
+  [WhatsAppTemplateIds.AlertEpisodeOwnerAddedNotification]: `You have been added as an owner of alert episode #{{episode_number}} ({{episode_title}}). Manage the alert episode using {{episode_link}} on the OneUptime dashboard.`,
   [WhatsAppTemplateIds.MonitorOwnerAddedNotification]: `You have been added as an owner of monitor {{monitor_name}}. Manage the monitor using {{monitor_link}} on the OneUptime dashboard to keep things running.`,
   [WhatsAppTemplateIds.MonitorCreatedOwnerNotification]: `Monitor {{monitor_name}} has been created. Check monitor {{monitor_link}} on the OneUptime dashboard `,
   [WhatsAppTemplateIds.MonitorStatusChangedOwnerNotification]: `Monitor {{monitor_name}} status changed to {{monitor_status}}. Check the monitor status using {{monitor_link}} on the OneUptime dashboard to stay informed.`,
@@ -154,6 +170,10 @@ export const WhatsAppTemplateLanguage: Record<WhatsAppTemplateId, string> = {
   [WhatsAppTemplateIds.AlertNotePostedOwnerNotification]: "en",
   [WhatsAppTemplateIds.AlertStateChangedOwnerNotification]: "en",
   [WhatsAppTemplateIds.AlertOwnerAddedNotification]: "en",
+  [WhatsAppTemplateIds.AlertEpisodeCreatedOwnerNotification]: "en",
+  [WhatsAppTemplateIds.AlertEpisodeNotePostedOwnerNotification]: "en",
+  [WhatsAppTemplateIds.AlertEpisodeStateChangedOwnerNotification]: "en",
+  [WhatsAppTemplateIds.AlertEpisodeOwnerAddedNotification]: "en",
   [WhatsAppTemplateIds.MonitorOwnerAddedNotification]: "en",
   [WhatsAppTemplateIds.MonitorCreatedOwnerNotification]: "en",
   [WhatsAppTemplateIds.MonitorStatusChangedOwnerNotification]: "en",

package/Types/Workspace/NotificationRules/EventType.ts

@@ -2,6 +2,7 @@ enum NotificationRuleEventType {
   Incident = "Incident",
   Monitor = "Monitor",
   Alert = "Alert",
+  AlertEpisode = "Alert Episode",
   ScheduledMaintenance = "Scheduled Maintenance",
   OnCallDutyPolicy = "On-Call Duty Policy",
 }

package/Types/Workspace/NotificationRules/NotificationRuleCondition.ts

@@ -25,6 +25,11 @@ export enum NotificationRuleConditionCheckOn {
   AlertDescription = "Alert Description",
   AlertSeverity = "Alert Severity",
   AlertState = "Alert State",
+  AlertEpisodeTitle = "Alert Episode Title",
+  AlertEpisodeDescription = "Alert Episode Description",
+  AlertEpisodeSeverity = "Alert Episode Severity",
+  AlertEpisodeState = "Alert Episode State",
+  AlertEpisodeLabels = "Alert Episode Labels",
   ScheduledMaintenanceTitle = "Scheduled Maintenance Title",
   ScheduledMaintenanceDescription = "Scheduled Maintenance Description",
   ScheduledMaintenanceState = "Scheduled Maintenance State",
@@ -94,6 +99,7 @@ export class NotificationRuleConditionUtil {
     if (
       eventType === NotificationRuleEventType.Incident ||
       eventType === NotificationRuleEventType.Alert ||
+      eventType === NotificationRuleEventType.AlertEpisode ||
       eventType === NotificationRuleEventType.ScheduledMaintenance
     ) {
       // either create slack channel or select existing one should be active.
@@ -154,13 +160,16 @@ export class NotificationRuleConditionUtil {
       case NotificationRuleConditionCheckOn.MonitorType:
       case NotificationRuleConditionCheckOn.IncidentState:
       case NotificationRuleConditionCheckOn.AlertState:
+      case NotificationRuleConditionCheckOn.AlertEpisodeState:
       case NotificationRuleConditionCheckOn.MonitorStatus:
       case NotificationRuleConditionCheckOn.ScheduledMaintenanceState:
       case NotificationRuleConditionCheckOn.IncidentSeverity:
       case NotificationRuleConditionCheckOn.AlertSeverity:
+      case NotificationRuleConditionCheckOn.AlertEpisodeSeverity:
       case NotificationRuleConditionCheckOn.MonitorLabels:
       case NotificationRuleConditionCheckOn.IncidentLabels:
       case NotificationRuleConditionCheckOn.AlertLabels:
+      case NotificationRuleConditionCheckOn.AlertEpisodeLabels:
       case NotificationRuleConditionCheckOn.ScheduledMaintenanceLabels:
       case NotificationRuleConditionCheckOn.Monitors:
         return true;
@@ -180,7 +189,10 @@ export class NotificationRuleConditionUtil {
     monitors: Array<Monitor>;
     checkOn: NotificationRuleConditionCheckOn;
   }): Array<DropdownOption> {
-    if (data.checkOn === NotificationRuleConditionCheckOn.AlertSeverity) {
+    if (
+      data.checkOn === NotificationRuleConditionCheckOn.AlertSeverity ||
+      data.checkOn === NotificationRuleConditionCheckOn.AlertEpisodeSeverity
+    ) {
       return data.alertSeverities.map((severity: AlertSeverity) => {
         return {
           value: severity.id!.toString(),
@@ -234,6 +246,7 @@ export class NotificationRuleConditionUtil {
       data.checkOn === NotificationRuleConditionCheckOn.MonitorLabels ||
       data.checkOn === NotificationRuleConditionCheckOn.IncidentLabels ||
       data.checkOn === NotificationRuleConditionCheckOn.AlertLabels ||
+      data.checkOn === NotificationRuleConditionCheckOn.AlertEpisodeLabels ||
       data.checkOn ===
         NotificationRuleConditionCheckOn.ScheduledMaintenanceLabels
     ) {
@@ -254,8 +267,11 @@ export class NotificationRuleConditionUtil {
       });
     }
 
-    // alert states
-    if (data.checkOn === NotificationRuleConditionCheckOn.AlertState) {
+    // alert states (also used for alert episodes)
+    if (
+      data.checkOn === NotificationRuleConditionCheckOn.AlertState ||
+      data.checkOn === NotificationRuleConditionCheckOn.AlertEpisodeState
+    ) {
       return data.alertStates.map((state: AlertState) => {
         return {
           value: state.id!.toString(),
@@ -298,6 +314,14 @@ export class NotificationRuleConditionUtil {
 
           NotificationRuleConditionCheckOn.Monitors,
         ];
+      case NotificationRuleEventType.AlertEpisode:
+        return [
+          NotificationRuleConditionCheckOn.AlertEpisodeTitle,
+          NotificationRuleConditionCheckOn.AlertEpisodeDescription,
+          NotificationRuleConditionCheckOn.AlertEpisodeSeverity,
+          NotificationRuleConditionCheckOn.AlertEpisodeState,
+          NotificationRuleConditionCheckOn.AlertEpisodeLabels,
+        ];
       case NotificationRuleEventType.Monitor:
         return [
           NotificationRuleConditionCheckOn.MonitorName,
@@ -329,6 +353,8 @@ export class NotificationRuleConditionUtil {
       case NotificationRuleConditionCheckOn.IncidentDescription:
       case NotificationRuleConditionCheckOn.AlertTitle:
       case NotificationRuleConditionCheckOn.AlertDescription:
+      case NotificationRuleConditionCheckOn.AlertEpisodeTitle:
+      case NotificationRuleConditionCheckOn.AlertEpisodeDescription:
       case NotificationRuleConditionCheckOn.ScheduledMaintenanceTitle:
       case NotificationRuleConditionCheckOn.ScheduledMaintenanceDescription:
         return [
@@ -341,15 +367,18 @@ export class NotificationRuleConditionUtil {
         ];
       case NotificationRuleConditionCheckOn.IncidentSeverity:
       case NotificationRuleConditionCheckOn.AlertSeverity:
+      case NotificationRuleConditionCheckOn.AlertEpisodeSeverity:
         return [ConditionType.ContainsAny, ConditionType.NotContains];
       case NotificationRuleConditionCheckOn.IncidentState:
       case NotificationRuleConditionCheckOn.AlertState:
+      case NotificationRuleConditionCheckOn.AlertEpisodeState:
       case NotificationRuleConditionCheckOn.MonitorStatus:
       case NotificationRuleConditionCheckOn.ScheduledMaintenanceState:
         return [ConditionType.ContainsAny, ConditionType.NotContains];
       case NotificationRuleConditionCheckOn.MonitorType:
         return [ConditionType.ContainsAny, ConditionType.NotContains];
       case NotificationRuleConditionCheckOn.AlertLabels:
+      case NotificationRuleConditionCheckOn.AlertEpisodeLabels:
       case NotificationRuleConditionCheckOn.IncidentLabels:
       case NotificationRuleConditionCheckOn.MonitorLabels:
       case NotificationRuleConditionCheckOn.ScheduledMaintenanceLabels:

package/UI/Components/Accordion/Accordion.tsx

@@ -60,15 +60,30 @@ const Accordion: FunctionComponent<ComponentProps> = (
     className = "-ml-5 -mr-5 p-5 mt-1";
   }
 
+  const accordionId: string = `accordion-content-${React.useId()}`;
+
+  const handleKeyDown: (event: React.KeyboardEvent) => void = (
+    event: React.KeyboardEvent,
+  ): void => {
+    if (event.key === "Enter" || event.key === " ") {
+      event.preventDefault();
+      setIsOpen(!isOpen);
+    }
+  };
+
   return (
     <div className={className}>
       <div>
         <div
           className={`flex justify-between cursor-pointer`}
-          role="alert"
+          role="button"
+          tabIndex={0}
+          aria-expanded={isOpen}
+          aria-controls={accordionId}
           onClick={() => {
             setIsOpen(!isOpen);
           }}
+          onKeyDown={handleKeyDown}
         >
           <div className="flex">
             {props.title && (
@@ -109,7 +124,10 @@ const Accordion: FunctionComponent<ComponentProps> = (
           {!isOpen && <div className="">{props.rightElement}</div>}
         </div>
         {isOpen && (
-          <div className={`space-y-5 ${props.title ? "mt-4" : ""}`}>
+          <div
+            id={accordionId}
+            className={`space-y-5 ${props.title ? "mt-4" : ""}`}
+          >
             {props.children}
           </div>
         )}

package/UI/Components/Alerts/Alert.tsx

@@ -82,6 +82,7 @@ const Alert: FunctionComponent<ComponentProps> = (
       data-testid={props.dataTestId}
       onClick={props.onClick}
       role="alert"
+      aria-live="polite"
       style={props.color ? { backgroundColor: props.color.toString() } : {}}
     >
       <div className="alert-content flex">

package/UI/Components/Button/Button.tsx

@@ -51,6 +51,18 @@ export interface ComponentProps {
   dataTestId?: string;
   className?: string | undefined;
   tooltip?: string | undefined;
+  ariaLabel?: string | undefined;
+  ariaExpanded?: boolean | undefined;
+  ariaHaspopup?:
+    | "menu"
+    | "listbox"
+    | "dialog"
+    | "tree"
+    | "grid"
+    | "true"
+    | "false"
+    | undefined;
+  ariaControls?: string | undefined;
 }
 
 const Button: FunctionComponent<ComponentProps> = ({
@@ -69,6 +81,10 @@ const Button: FunctionComponent<ComponentProps> = ({
   dataTestId,
   className,
   tooltip,
+  ariaLabel,
+  ariaExpanded,
+  ariaHaspopup,
+  ariaControls,
 }: ComponentProps): ReactElement => {
   useEffect(() => {
     // componentDidMount
@@ -233,6 +249,14 @@ const Button: FunctionComponent<ComponentProps> = ({
     buttonStyleCssClass += ` ` + className;
   }
 
+  // For icon-only buttons, use title as aria-label for accessibility
+  const computedAriaLabel: string | undefined =
+    ariaLabel ||
+    (buttonStyle === ButtonStyleType.ICON ||
+    buttonStyle === ButtonStyleType.ICON_LIGHT
+      ? title || tooltip
+      : undefined);
+
   const getButton: GetReactElementFunction = (): ReactElement => {
     return (
       <button
@@ -247,6 +271,11 @@ const Button: FunctionComponent<ComponentProps> = ({
         type={type}
         disabled={disabled || isLoading}
         className={buttonStyleCssClass}
+        aria-label={computedAriaLabel}
+        aria-disabled={disabled || isLoading}
+        aria-expanded={ariaExpanded}
+        aria-haspopup={ariaHaspopup}
+        aria-controls={ariaControls}
       >
         {isLoading && buttonStyle !== ButtonStyleType.ICON && (
           <Icon icon={IconProp.Spinner} className={loadingIconClassName} />

package/UI/Components/CardSelect/CardSelect.tsx

@@ -23,7 +23,11 @@ const CardSelect: FunctionComponent<ComponentProps> = (
 ): ReactElement => {
   return (
     <div data-testid={props.dataTestId}>
-      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
+      <div
+        role="radiogroup"
+        aria-label="Select an option"
+        className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3"
+      >
         {props.options.map((option: CardSelectOption, index: number) => {
           const isSelected: boolean = props.value === option.value;
 

package/UI/Components/Checkbox/Checkbox.tsx

@@ -67,8 +67,10 @@ const CheckboxElement: FunctionComponent<CategoryProps> = (
             onFocus={props.onFocus}
             onBlur={props.onBlur}
             data-testid={props.dataTestId}
-            aria-describedby="comments-description"
-            name="comments"
+            aria-describedby={
+              props.description ? "checkbox-description" : undefined
+            }
+            aria-invalid={props.error ? "true" : undefined}
             type="checkbox"
             className={`accent-indigo-600 h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600 ${
               props.className || ""
@@ -78,7 +80,9 @@ const CheckboxElement: FunctionComponent<CategoryProps> = (
         <div className="ml-3 text-sm leading-6">
           <label className="font-medium text-gray-900">{props.title}</label>
           {props.description && (
-            <div className="text-gray-500">{props.description}</div>
+            <div id="checkbox-description" className="text-gray-500">
+              {props.description}
+            </div>
           )}
         </div>
       </div>

package/UI/Components/ColorCircle/ColorCircle.tsx

@@ -17,6 +17,8 @@ const ColorCircle: FunctionComponent<ComponentProps> = (
         style={{
           backgroundColor: props.color.toString(),
         }}
+        role="img"
+        aria-label={props.tooltip}
       ></div>
     </Tooltip>
   );