@oneuptime/common 9.5.8 → 9.5.10

package/Types/Monitor/MonitorStep.ts

@@ -29,6 +29,9 @@ import MonitorStepExceptionMonitor, {
 import MonitorStepSnmpMonitor, {
   MonitorStepSnmpMonitorUtil,
 } from "./MonitorStepSnmpMonitor";
+import MonitorStepDnsMonitor, {
+  MonitorStepDnsMonitorUtil,
+} from "./MonitorStepDnsMonitor";
 import Zod, { ZodSchema } from "../../Utils/Schema/Zod";
 
 export interface MonitorStepType {
@@ -72,6 +75,9 @@ export interface MonitorStepType {
 
   // SNMP monitor
   snmpMonitor?: MonitorStepSnmpMonitor | undefined;
+
+  // DNS monitor
+  dnsMonitor?: MonitorStepDnsMonitor | undefined;
 }
 
 export default class MonitorStep extends DatabaseProperty {
@@ -98,6 +104,7 @@ export default class MonitorStep extends DatabaseProperty {
       metricMonitor: undefined,
       exceptionMonitor: undefined,
       snmpMonitor: undefined,
+      dnsMonitor: undefined,
     };
   }
 
@@ -129,6 +136,7 @@ export default class MonitorStep extends DatabaseProperty {
       metricMonitor: undefined,
       exceptionMonitor: undefined,
       snmpMonitor: undefined,
+      dnsMonitor: undefined,
     };
 
     return monitorStep;
@@ -224,6 +232,11 @@ export default class MonitorStep extends DatabaseProperty {
     return this;
   }
 
+  public setDnsMonitor(dnsMonitor: MonitorStepDnsMonitor): MonitorStep {
+    this.data!.dnsMonitor = dnsMonitor;
+    return this;
+  }
+
   public setCustomCode(customCode: string): MonitorStep {
     this.data!.customCode = customCode;
     return this;
@@ -332,6 +345,16 @@ export default class MonitorStep extends DatabaseProperty {
       }
     }
 
+    if (monitorType === MonitorType.DNS) {
+      if (!value.data.dnsMonitor) {
+        return "DNS configuration is required";
+      }
+
+      if (!value.data.dnsMonitor.queryName) {
+        return "DNS query name (domain) is required";
+      }
+    }
+
     return null;
   }
 
@@ -377,6 +400,9 @@ export default class MonitorStep extends DatabaseProperty {
           snmpMonitor: this.data.snmpMonitor
             ? MonitorStepSnmpMonitorUtil.toJSON(this.data.snmpMonitor)
             : undefined,
+          dnsMonitor: this.data.dnsMonitor
+            ? MonitorStepDnsMonitorUtil.toJSON(this.data.dnsMonitor)
+            : undefined,
         },
       });
     }
@@ -482,6 +508,9 @@ export default class MonitorStep extends DatabaseProperty {
       snmpMonitor: json["snmpMonitor"]
         ? (json["snmpMonitor"] as JSONObject)
         : undefined,
+      dnsMonitor: json["dnsMonitor"]
+        ? (json["dnsMonitor"] as JSONObject)
+        : undefined,
     }) as any;
 
     return monitorStep;
@@ -507,6 +536,7 @@ export default class MonitorStep extends DatabaseProperty {
         traceMonitor: Zod.any().optional(),
         metricMonitor: Zod.any().optional(),
         snmpMonitor: Zod.any().optional(),
+        dnsMonitor: Zod.any().optional(),
       }).openapi({
         type: "object",
         example: {

package/Types/Monitor/MonitorStepDnsMonitor.ts

@@ -0,0 +1,46 @@
+import { JSONObject } from "../JSON";
+import DnsRecordType from "./DnsMonitor/DnsRecordType";
+
+export default interface MonitorStepDnsMonitor {
+  queryName: string;
+  recordType: DnsRecordType;
+  hostname?: string | undefined; // DNS server (e.g. "8.8.8.8"), empty = system default
+  port: number;
+  timeout: number;
+  retries: number;
+}
+
+export class MonitorStepDnsMonitorUtil {
+  public static getDefault(): MonitorStepDnsMonitor {
+    return {
+      queryName: "",
+      recordType: DnsRecordType.A,
+      hostname: "",
+      port: 53,
+      timeout: 5000,
+      retries: 3,
+    };
+  }
+
+  public static fromJSON(json: JSONObject): MonitorStepDnsMonitor {
+    return {
+      queryName: (json["queryName"] as string) || "",
+      recordType: (json["recordType"] as DnsRecordType) || DnsRecordType.A,
+      hostname: (json["hostname"] as string) || undefined,
+      port: (json["port"] as number) || 53,
+      timeout: (json["timeout"] as number) || 5000,
+      retries: (json["retries"] as number) || 3,
+    };
+  }
+
+  public static toJSON(monitor: MonitorStepDnsMonitor): JSONObject {
+    return {
+      queryName: monitor.queryName,
+      recordType: monitor.recordType,
+      hostname: monitor.hostname,
+      port: monitor.port,
+      timeout: monitor.timeout,
+      retries: monitor.retries,
+    };
+  }
+}

package/Types/Monitor/MonitorType.ts

@@ -26,6 +26,9 @@ enum MonitorType {
 
   // Network device monitoring
   SNMP = "SNMP",
+
+  // DNS monitoring
+  DNS = "DNS",
 }
 
 export default MonitorType;
@@ -179,6 +182,13 @@ export class MonitorTypeHelper {
           "This monitor type lets you monitor network devices like switches, routers, and firewalls via SNMP.",
         icon: IconProp.Signal,
       },
+      {
+        monitorType: MonitorType.DNS,
+        title: "DNS",
+        description:
+          "This monitor type lets you monitor DNS resolution for your domains, verify record values, and check DNSSEC validity.",
+        icon: IconProp.GlobeAlt,
+      },
     ];
 
     return monitorTypeProps;
@@ -224,7 +234,8 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.SSLCertificate ||
       monitorType === MonitorType.SyntheticMonitor ||
       monitorType === MonitorType.CustomJavaScriptCode ||
-      monitorType === MonitorType.SNMP;
+      monitorType === MonitorType.SNMP ||
+      monitorType === MonitorType.DNS;
     return isProbeableMonitor;
   }
 
@@ -246,6 +257,7 @@ export class MonitorTypeHelper {
       MonitorType.Traces,
       MonitorType.Exceptions,
       MonitorType.SNMP,
+      MonitorType.DNS,
     ];
   }
 
@@ -278,7 +290,8 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.SSLCertificate ||
       monitorType === MonitorType.SyntheticMonitor ||
       monitorType === MonitorType.CustomJavaScriptCode ||
-      monitorType === MonitorType.SNMP
+      monitorType === MonitorType.SNMP ||
+      monitorType === MonitorType.DNS
     ) {
       return true;
     }