@oneuptime/common 9.5.8 → 9.5.10

package/Server/Utils/Workspace/Slack/Actions/AlertEpisode.ts

@@ -21,7 +21,7 @@ import UserNotificationEventType from "../../../../../Types/UserNotification/Use
 import AlertState from "../../../../../Models/DatabaseModels/AlertState";
 import AlertStateService from "../../../../Services/AlertStateService";
 import logger from "../../../Logger";
-import AccessTokenService from "../../../../Services/AccessTokenService";
+
 import CaptureSpan from "../../../Telemetry/CaptureSpan";
 import WorkspaceNotificationLogService from "../../../../Services/WorkspaceNotificationLogService";
 import WorkspaceUserAuthTokenService from "../../../../Services/WorkspaceUserAuthTokenService";
@@ -305,6 +305,23 @@ export default class SlackAlertEpisodeActions {
         return option.label !== "" || option.value !== "";
       });
 
+    if (dropdownOption.length === 0) {
+      if (data.slackRequest.slackChannelId) {
+        await SlackUtil.sendEphemeralMessageToChannel({
+          messageBlocks: [
+            {
+              _type: "WorkspacePayloadMarkdown",
+              text: "No on-call policies have been configured for this project yet. Please add an on-call policy in the OneUptime Dashboard under On-Call Duty > Policies to use this feature.",
+            } as WorkspacePayloadMarkdown,
+          ],
+          authToken: data.slackRequest.projectAuthToken!,
+          channelId: data.slackRequest.slackChannelId,
+          userId: data.slackRequest.slackUserId!,
+        });
+      }
+      return;
+    }
+
     const onCallPolicyDropdown: WorkspaceDropdownBlock = {
       _type: "WorkspaceDropdownBlock",
       label: "On Call Policy",
@@ -438,18 +455,16 @@ export default class SlackAlertEpisodeActions {
 
     const stateId: ObjectID = new ObjectID(stateString);
 
-    await AlertEpisodeService.updateOneById({
-      id: episodeId,
-      data: {
-        currentAlertStateId: stateId,
+    await AlertEpisodeService.changeEpisodeState({
+      projectId: data.slackRequest.projectId!,
+      episodeId: episodeId,
+      alertStateId: stateId,
+      notifyOwners: true,
+      rootCause: "State changed via Slack.",
+      props: {
+        isRoot: true,
+        userId: data.slackRequest.userId!,
       },
-      props:
-        await AccessTokenService.getDatabaseCommonInteractionPropsByUserAndProject(
-          {
-            userId: data.slackRequest.userId!,
-            projectId: data.slackRequest.projectId!,
-          },
-        ),
     });
 
     // Log the button interaction

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

@@ -782,6 +782,23 @@ export default class SlackIncidentActions {
         return option.label !== "" || option.value !== "";
       });
 
+    if (dropdownOption.length === 0) {
+      if (data.slackRequest.slackChannelId) {
+        await SlackUtil.sendEphemeralMessageToChannel({
+          messageBlocks: [
+            {
+              _type: "WorkspacePayloadMarkdown",
+              text: "No on-call policies have been configured for this project yet. Please add an on-call policy in the OneUptime Dashboard under On-Call Duty > Policies to use this feature.",
+            } as WorkspacePayloadMarkdown,
+          ],
+          authToken: data.slackRequest.projectAuthToken!,
+          channelId: data.slackRequest.slackChannelId,
+          userId: data.slackRequest.slackUserId!,
+        });
+      }
+      return;
+    }
+
     const onCallPolicyDropdown: WorkspaceDropdownBlock = {
       _type: "WorkspaceDropdownBlock",
       label: "On Call Policy",

package/Server/Utils/Workspace/Slack/Actions/IncidentEpisode.ts

@@ -13,6 +13,7 @@ import {
   WorkspaceTextAreaBlock,
 } from "../../../../../Types/Workspace/WorkspaceMessagePayload";
 import IncidentEpisodeInternalNoteService from "../../../../Services/IncidentEpisodeInternalNoteService";
+import IncidentEpisodePublicNoteService from "../../../../Services/IncidentEpisodePublicNoteService";
 import OnCallDutyPolicy from "../../../../../Models/DatabaseModels/OnCallDutyPolicy";
 import OnCallDutyPolicyService from "../../../../Services/OnCallDutyPolicyService";
 import { LIMIT_PER_PROJECT } from "../../../../../Types/Database/LimitMax";
@@ -21,7 +22,7 @@ import UserNotificationEventType from "../../../../../Types/UserNotification/Use
 import IncidentState from "../../../../../Models/DatabaseModels/IncidentState";
 import IncidentStateService from "../../../../Services/IncidentStateService";
 import logger from "../../../Logger";
-import AccessTokenService from "../../../../Services/AccessTokenService";
+
 import CaptureSpan from "../../../Telemetry/CaptureSpan";
 import WorkspaceNotificationLogService from "../../../../Services/WorkspaceNotificationLogService";
 import WorkspaceUserAuthTokenService from "../../../../Services/WorkspaceUserAuthTokenService";
@@ -275,9 +276,7 @@ export default class SlackIncidentEpisodeActions {
     }
 
     // We send this early let slack know we're ok. We'll do the rest in the background.
-    Response.sendJsonObjectResponse(req, res, {
-      response_action: "clear",
-    });
+    Response.sendTextResponse(req, res, "");
 
     const onCallPolicies: Array<OnCallDutyPolicy> =
       await OnCallDutyPolicyService.findBy({
@@ -305,6 +304,23 @@ export default class SlackIncidentEpisodeActions {
         return option.label !== "" || option.value !== "";
       });
 
+    if (dropdownOption.length === 0) {
+      if (data.slackRequest.slackChannelId) {
+        await SlackUtil.sendEphemeralMessageToChannel({
+          messageBlocks: [
+            {
+              _type: "WorkspacePayloadMarkdown",
+              text: "No on-call policies have been configured for this project yet. Please add an on-call policy in the OneUptime Dashboard under On-Call Duty > Policies to use this feature.",
+            } as WorkspacePayloadMarkdown,
+          ],
+          authToken: data.slackRequest.projectAuthToken!,
+          channelId: data.slackRequest.slackChannelId,
+          userId: data.slackRequest.slackUserId!,
+        });
+      }
+      return;
+    }
+
     const onCallPolicyDropdown: WorkspaceDropdownBlock = {
       _type: "WorkspaceDropdownBlock",
       label: "On Call Policy",
@@ -349,9 +365,7 @@ export default class SlackIncidentEpisodeActions {
     }
 
     // We send this early let slack know we're ok. We'll do the rest in the background.
-    Response.sendJsonObjectResponse(req, res, {
-      response_action: "clear",
-    });
+    Response.sendTextResponse(req, res, "");
 
     // Incident Episodes use incident states
     const incidentStates: Array<IncidentState> =
@@ -438,18 +452,16 @@ export default class SlackIncidentEpisodeActions {
 
     const stateId: ObjectID = new ObjectID(stateString);
 
-    await IncidentEpisodeService.updateOneById({
-      id: episodeId,
-      data: {
-        currentIncidentStateId: stateId,
+    await IncidentEpisodeService.changeEpisodeState({
+      projectId: data.slackRequest.projectId!,
+      episodeId: episodeId,
+      incidentStateId: stateId,
+      notifyOwners: true,
+      rootCause: "State changed via Slack.",
+      props: {
+        isRoot: true,
+        userId: data.slackRequest.userId!,
       },
-      props:
-        await AccessTokenService.getDatabaseCommonInteractionPropsByUserAndProject(
-          {
-            userId: data.slackRequest.userId!,
-            projectId: data.slackRequest.projectId!,
-          },
-        ),
     });
 
     // Log the button interaction
@@ -610,6 +622,14 @@ export default class SlackIncidentEpisodeActions {
       );
     }
 
+    if (!data.slackRequest.viewValues["noteType"]) {
+      return Response.sendErrorResponse(
+        req,
+        res,
+        new BadDataException("Invalid Note Type"),
+      );
+    }
+
     if (!data.slackRequest.viewValues["note"]) {
       return Response.sendErrorResponse(
         req,
@@ -620,18 +640,41 @@ export default class SlackIncidentEpisodeActions {
 
     const episodeId: ObjectID = new ObjectID(actionValue);
     const note: string = data.slackRequest.viewValues["note"].toString();
+    const noteType: string =
+      data.slackRequest.viewValues["noteType"].toString();
+
+    if (noteType !== "public" && noteType !== "private") {
+      return Response.sendErrorResponse(
+        req,
+        res,
+        new BadDataException("Invalid Note Type"),
+      );
+    }
 
     // send empty response.
     Response.sendJsonObjectResponse(req, res, {
       response_action: "clear",
     });
 
-    await IncidentEpisodeInternalNoteService.addNote({
-      incidentEpisodeId: episodeId!,
-      note: note || "",
-      projectId: data.slackRequest.projectId!,
-      userId: data.slackRequest.userId!,
-    });
+    // if public note then, add a note.
+    if (noteType === "public") {
+      await IncidentEpisodePublicNoteService.addNote({
+        incidentEpisodeId: episodeId!,
+        note: note || "",
+        projectId: data.slackRequest.projectId!,
+        userId: data.slackRequest.userId!,
+      });
+    }
+
+    // if private note then, add a note.
+    if (noteType === "private") {
+      await IncidentEpisodeInternalNoteService.addNote({
+        incidentEpisodeId: episodeId!,
+        note: note || "",
+        projectId: data.slackRequest.projectId!,
+        userId: data.slackRequest.userId!,
+      });
+    }
   }
 
   @CaptureSpan()
@@ -653,9 +696,24 @@ export default class SlackIncidentEpisodeActions {
     }
 
     // We send this early let slack know we're ok. We'll do the rest in the background.
-    Response.sendJsonObjectResponse(req, res, {
-      response_action: "clear",
-    });
+    Response.sendTextResponse(req, res, "");
+
+    const notePickerDropdown: WorkspaceDropdownBlock = {
+      _type: "WorkspaceDropdownBlock",
+      label: "Note Type",
+      blockId: "noteType",
+      placeholder: "Select Note Type",
+      options: [
+        {
+          label: "Public Note (Will be posted on Status Page)",
+          value: "public",
+        },
+        {
+          label: "Private Note (Only visible to team members)",
+          value: "private",
+        },
+      ],
+    };
 
     const noteTextArea: WorkspaceTextAreaBlock = {
       _type: "WorkspaceTextAreaBlock",
@@ -672,7 +730,7 @@ export default class SlackIncidentEpisodeActions {
       cancelButtonTitle: "Cancel",
       actionId: SlackActionType.SubmitIncidentEpisodeNote,
       actionValue: actionValue,
-      blocks: [noteTextArea],
+      blocks: [notePickerDropdown, noteTextArea],
     };
 
     await SlackUtil.showModalToUser({

package/Server/Utils/Workspace/Slack/Messages/IncidentEpisode.ts

@@ -47,7 +47,7 @@ export default class SlackIncidentEpisodeMessages {
     // view data.
     const viewIncidentEpisodeButton: WorkspaceMessagePayloadButton = {
       _type: "WorkspaceMessagePayloadButton",
-      title: "View Episode",
+      title: "🔗 View Episode",
       url: await IncidentEpisodeService.getEpisodeLinkInDashboard(
         data.projectId!,
         data.incidentEpisodeId!,
@@ -61,7 +61,7 @@ export default class SlackIncidentEpisodeMessages {
     // execute on call.
     const executeOnCallButton: WorkspaceMessagePayloadButton = {
       _type: "WorkspaceMessagePayloadButton",
-      title: "Execute On Call",
+      title: "📞 Execute On Call",
       value: data.incidentEpisodeId?.toString() || "",
       actionId: SlackActionType.ViewExecuteIncidentEpisodeOnCallPolicy,
     };
@@ -71,7 +71,7 @@ export default class SlackIncidentEpisodeMessages {
     // acknowledge data.
     const acknowledgeIncidentEpisodeButton: WorkspaceMessagePayloadButton = {
       _type: "WorkspaceMessagePayloadButton",
-      title: "Acknowledge Episode",
+      title: "👀 Acknowledge Episode",
       value: data.incidentEpisodeId?.toString() || "",
       actionId: SlackActionType.AcknowledgeIncidentEpisode,
     };
@@ -81,7 +81,7 @@ export default class SlackIncidentEpisodeMessages {
     // resolve data.
     const resolveIncidentEpisodeButton: WorkspaceMessagePayloadButton = {
       _type: "WorkspaceMessagePayloadButton",
-      title: "Resolve Episode",
+      title: "✅ Resolve Episode",
       value: data.incidentEpisodeId?.toString() || "",
       actionId: SlackActionType.ResolveIncidentEpisode,
     };
@@ -91,7 +91,7 @@ export default class SlackIncidentEpisodeMessages {
     // change incident episode state.
     const changeIncidentEpisodeStateButton: WorkspaceMessagePayloadButton = {
       _type: "WorkspaceMessagePayloadButton",
-      title: "Change Episode State",
+      title: "➡️ Change Episode State",
       value: data.incidentEpisodeId?.toString() || "",
       actionId: SlackActionType.ViewChangeIncidentEpisodeState,
     };
@@ -101,7 +101,7 @@ export default class SlackIncidentEpisodeMessages {
     // add note.
     const addNoteButton: WorkspaceMessagePayloadButton = {
       _type: "WorkspaceMessagePayloadButton",
-      title: "Add Note",
+      title: "📄 Add Note",
       value: data.incidentEpisodeId?.toString() || "",
       actionId: SlackActionType.ViewAddIncidentEpisodeNote,
     };

package/Server/Utils/Workspace/Slack/Slack.ts

@@ -155,6 +155,55 @@ export default class SlackUtil extends WorkspaceBase {
     logger.debug("Modal shown to user successfully.");
   }
 
+  @CaptureSpan()
+  public static async sendEphemeralMessageToChannel(data: {
+    authToken: string;
+    channelId: string;
+    userId: string;
+    messageBlocks: Array<WorkspaceMessageBlock>;
+  }): Promise<void> {
+    const blocks: Array<JSONObject> = this.getBlocksFromWorkspaceMessagePayload(
+      {
+        messageBlocks: data.messageBlocks,
+      },
+    );
+
+    const response: HTTPErrorResponse | HTTPResponse<JSONObject> =
+      await API.post({
+        url: URL.fromString("https://slack.com/api/chat.postEphemeral"),
+        data: {
+          channel: data.channelId,
+          user: data.userId,
+          blocks: blocks,
+        },
+        headers: {
+          Authorization: `Bearer ${data.authToken}`,
+          ["Content-Type"]: "application/json",
+        },
+        options: {
+          retries: 3,
+          exponentialBackoff: true,
+        },
+      });
+
+    if (response instanceof HTTPErrorResponse) {
+      logger.error("Error response from Slack API for ephemeral message:");
+      logger.error(response);
+      throw response;
+    }
+
+    if ((response.jsonData as JSONObject)?.["ok"] !== true) {
+      logger.error("Invalid response from Slack API for ephemeral message:");
+      logger.error(response.jsonData);
+      const messageFromSlack: string = (response.jsonData as JSONObject)?.[
+        "error"
+      ] as string;
+      throw new BadRequestException("Error from Slack " + messageFromSlack);
+    }
+
+    logger.debug("Ephemeral message sent successfully.");
+  }
+
   @CaptureSpan()
   public static override async sendDirectMessageToUser(data: {
     authToken: string;
@@ -393,12 +442,14 @@ export default class SlackUtil extends WorkspaceBase {
     const workspaceChannels: Array<WorkspaceChannel> = [];
 
     for (let channelName of data.channelNames) {
-      // Normalize channel name
-      if (channelName && channelName.startsWith("#")) {
-        channelName = channelName.substring(1);
-      }
-      channelName = channelName.toLowerCase();
-      channelName = channelName.replace(/\s+/g, "-");
+      /*
+       * Normalize channel name: replace spaces with hyphens, then strip
+       * any characters not valid in Slack channel names.
+       */
+      channelName = channelName
+        .toLowerCase()
+        .replace(/\s+/g, "-")
+        .replace(/[^a-z0-9\-_]/g, "");
 
       // Check if channel exists using optimized method
       const existingChannel: WorkspaceChannel | null =
@@ -1296,12 +1347,13 @@ export default class SlackUtil extends WorkspaceBase {
     channelName: string;
     projectId: ObjectID;
   }): Promise<WorkspaceChannel> {
-    if (data.channelName && data.channelName.startsWith("#")) {
-      data.channelName = data.channelName.substring(1);
-    }
-
-    // lower case channel name
-    data.channelName = data.channelName.toLowerCase();
+    /*
+     * Sanitize channel name: Slack only allows lowercase letters, numbers,
+     * hyphens, and underscores. Remove all other characters (including #).
+     */
+    data.channelName = data.channelName
+      .toLowerCase()
+      .replace(/[^a-z0-9\-_]/g, "");
 
     logger.debug("Creating channel with data:");
     logger.debug(data);

package/Server/Utils/Workspace/WorkspaceMessages/Alert.ts

@@ -29,7 +29,8 @@ export default class AlertWorkspaceMessages {
             alertId: data.alertId,
           },
           notificationRuleEventType: NotificationRuleEventType.Alert,
-          channelNameSiffix: data.alertNumber.toString(),
+          channelNameSiffix:
+            data.alertNumberWithPrefix || data.alertNumber.toString(),
         },
       );
     } catch (err) {

package/Server/Utils/Workspace/WorkspaceMessages/AlertEpisode.ts

@@ -16,6 +16,7 @@ export default class AlertEpisodeWorkspaceMessages {
     projectId: ObjectID;
     alertEpisodeId: ObjectID;
     episodeNumber: number;
+    episodeNumberWithPrefix?: string;
   }): Promise<{
     channelsCreated: NotificationRuleWorkspaceChannel[];
   } | null> {
@@ -28,7 +29,8 @@ export default class AlertEpisodeWorkspaceMessages {
             alertEpisodeId: data.alertEpisodeId,
           },
           notificationRuleEventType: NotificationRuleEventType.AlertEpisode,
-          channelNameSiffix: data.episodeNumber.toString(),
+          channelNameSiffix:
+            data.episodeNumberWithPrefix || data.episodeNumber.toString(),
         },
       );
     } catch (err) {

package/Server/Utils/Workspace/WorkspaceMessages/Incident.ts

@@ -29,7 +29,8 @@ export default class IncidentWorkspaceMessages {
             incidentId: data.incidentId,
           },
           notificationRuleEventType: NotificationRuleEventType.Incident,
-          channelNameSiffix: data.incidentNumber.toString(),
+          channelNameSiffix:
+            data.incidentNumberWithPrefix || data.incidentNumber.toString(),
         },
       );
     } catch (err) {

package/Server/Utils/Workspace/WorkspaceMessages/IncidentEpisode.ts

@@ -16,6 +16,7 @@ export default class IncidentEpisodeWorkspaceMessages {
     projectId: ObjectID;
     incidentEpisodeId: ObjectID;
     episodeNumber: number;
+    episodeNumberWithPrefix?: string;
   }): Promise<{
     channelsCreated: NotificationRuleWorkspaceChannel[];
   } | null> {
@@ -28,7 +29,8 @@ export default class IncidentEpisodeWorkspaceMessages {
             incidentEpisodeId: data.incidentEpisodeId,
           },
           notificationRuleEventType: NotificationRuleEventType.IncidentEpisode,
-          channelNameSiffix: data.episodeNumber.toString(),
+          channelNameSiffix:
+            data.episodeNumberWithPrefix || data.episodeNumber.toString(),
         },
       );
     } catch (err) {

package/Tests/Server/Middleware/UserAuthorization.test.ts

@@ -14,6 +14,7 @@ import Response from "../../../Server/Utils/Response";
 import Dictionary from "../../../Types/Dictionary";
 import Email from "../../../Types/Email";
 import BadDataException from "../../../Types/Exception/BadDataException";
+import NotAuthenticatedException from "../../../Types/Exception/NotAuthenticatedException";
 import SsoAuthorizationException from "../../../Types/Exception/SsoAuthorizationException";
 import HashedString from "../../../Types/HashedString";
 import JSONFunctions from "../../../Types/JSONFunctions";
@@ -330,7 +331,7 @@ describe("UserMiddleware", () => {
       expect(JSONWebToken.decode).not.toHaveBeenCalled();
     });
 
-    test("should call function 'next' and return, when accessToken can not be decoded", async () => {
+    test("should call Response.sendErrorResponse with NotAuthenticatedException, when accessToken can not be decoded", async () => {
       const error: Error = new Error("Invalid access token");
 
       const spyJWTDecode: jest.SpyInstance = getJestSpyOn(
@@ -342,7 +343,14 @@ describe("UserMiddleware", () => {
 
       await UserMiddleware.getUserMiddleware(req, res, next);
 
-      expect(next).toHaveBeenCalled();
+      expect(Response.sendErrorResponse).toHaveBeenCalledWith(
+        req,
+        res,
+        new NotAuthenticatedException(
+          "AccessToken is invalid or expired. Please refresh your token.",
+        ),
+      );
+      expect(next).not.toHaveBeenCalled();
       expect(spyJWTDecode).toHaveBeenCalledWith(mockedAccessToken);
       expect(UserService.updateOneBy).not.toHaveBeenCalled();
     });

package/Types/Monitor/CriteriaFilter.ts

@@ -60,6 +60,13 @@ export enum CheckOn {
   SnmpOidExists = "SNMP OID Exists",
   SnmpResponseTime = "SNMP Response Time (in ms)",
   SnmpIsOnline = "SNMP Device Is Online",
+
+  // DNS monitors.
+  DnsResponseTime = "DNS Response Time (in ms)",
+  DnsIsOnline = "DNS Is Online",
+  DnsRecordValue = "DNS Record Value",
+  DnssecIsValid = "DNSSEC Is Valid",
+  DnsRecordExists = "DNS Record Exists",
 }
 
 export interface ServerMonitorOptions {
@@ -141,7 +148,11 @@ export class CriteriaFilterUtil {
   }): boolean {
     const { checkOn } = data;
 
-    if (checkOn === CheckOn.IsOnline || checkOn === CheckOn.SnmpIsOnline) {
+    if (
+      checkOn === CheckOn.IsOnline ||
+      checkOn === CheckOn.SnmpIsOnline ||
+      checkOn === CheckOn.DnsIsOnline
+    ) {
       return false;
     }
 
@@ -149,7 +160,11 @@ export class CriteriaFilterUtil {
       return false;
     }
 
-    if (checkOn === CheckOn.SnmpOidExists) {
+    if (
+      checkOn === CheckOn.SnmpOidExists ||
+      checkOn === CheckOn.DnssecIsValid ||
+      checkOn === CheckOn.DnsRecordExists
+    ) {
       return false;
     }
 
@@ -204,7 +219,9 @@ export class CriteriaFilterUtil {
       checkOn === CheckOn.MemoryUsagePercent ||
       checkOn === CheckOn.IsOnline ||
       checkOn === CheckOn.SnmpResponseTime ||
-      checkOn === CheckOn.SnmpIsOnline
+      checkOn === CheckOn.SnmpIsOnline ||
+      checkOn === CheckOn.DnsResponseTime ||
+      checkOn === CheckOn.DnsIsOnline
     );
   }
 }

package/Types/Monitor/DnsMonitor/DnsMonitorResponse.ts

@@ -0,0 +1,16 @@
+import DnsRecordType from "./DnsRecordType";
+
+export interface DnsRecordResponse {
+  type: DnsRecordType;
+  value: string;
+  ttl?: number | undefined;
+}
+
+export default interface DnsMonitorResponse {
+  isOnline: boolean;
+  responseTimeInMs: number;
+  failureCause: string;
+  records: Array<DnsRecordResponse>;
+  isDnssecValid?: boolean | undefined;
+  isTimeout?: boolean | undefined;
+}

package/Types/Monitor/DnsMonitor/DnsRecordType.ts

@@ -0,0 +1,14 @@
+enum DnsRecordType {
+  A = "A",
+  AAAA = "AAAA",
+  CNAME = "CNAME",
+  MX = "MX",
+  NS = "NS",
+  TXT = "TXT",
+  SOA = "SOA",
+  PTR = "PTR",
+  SRV = "SRV",
+  CAA = "CAA",
+}
+
+export default DnsRecordType;

package/Types/Monitor/MonitorCriteriaInstance.ts

@@ -394,6 +394,33 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
       return monitorCriteriaInstance;
     }
 
+    if (arg.monitorType === MonitorType.DNS) {
+      const monitorCriteriaInstance: MonitorCriteriaInstance =
+        new MonitorCriteriaInstance();
+
+      monitorCriteriaInstance.data = {
+        id: ObjectID.generate().toString(),
+        monitorStatusId: arg.monitorStatusId,
+        filterCondition: FilterCondition.All,
+        filters: [
+          {
+            checkOn: CheckOn.DnsIsOnline,
+            filterType: FilterType.True,
+            value: undefined,
+          },
+        ],
+        incidents: [],
+        alerts: [],
+        createAlerts: false,
+        changeMonitorStatus: true,
+        createIncidents: false,
+        name: `Check if ${arg.monitorName} is online`,
+        description: `This criteria checks if the ${arg.monitorName} DNS resolution is online`,
+      };
+
+      return monitorCriteriaInstance;
+    }
+
     return null;
   }
 
@@ -495,6 +522,46 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
       };
     }
 
+    if (arg.monitorType === MonitorType.DNS) {
+      monitorCriteriaInstance.data = {
+        id: ObjectID.generate().toString(),
+        monitorStatusId: arg.monitorStatusId,
+        filterCondition: FilterCondition.Any,
+        filters: [
+          {
+            checkOn: CheckOn.DnsIsOnline,
+            filterType: FilterType.False,
+            value: undefined,
+          },
+        ],
+        incidents: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} DNS resolution is currently failing.`,
+            incidentSeverityId: arg.incidentSeverityId,
+            autoResolveIncident: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        changeMonitorStatus: true,
+        createIncidents: true,
+        createAlerts: false,
+        alerts: [
+          {
+            title: `${arg.monitorName} is offline`,
+            description: `${arg.monitorName} DNS resolution is currently failing.`,
+            alertSeverityId: arg.alertSeverityId,
+            autoResolveAlert: true,
+            id: ObjectID.generate().toString(),
+            onCallPolicyIds: [],
+          },
+        ],
+        name: `Check if ${arg.monitorName} is offline`,
+        description: `This criteria checks if the ${arg.monitorName} DNS resolution is failing`,
+      };
+    }
+
     if (
       arg.monitorType === MonitorType.API ||
       arg.monitorType === MonitorType.Website