@oneuptime/common 10.4.11 → 10.4.13

package/Types/Monitor/MonitorStepDnssecMonitor.ts

@@ -0,0 +1,59 @@
+import { JSONObject } from "../JSON";
+
+export default interface MonitorStepDnssecMonitor {
+  domainName: string;
+  resolvers: Array<string>;
+  checkNameserverConsistency: boolean;
+  signatureExpiryWarningDays: number;
+  timeout: number;
+  retries: number;
+}
+
+export class MonitorStepDnssecMonitorUtil {
+  public static getDefault(): MonitorStepDnssecMonitor {
+    return {
+      domainName: "",
+      resolvers: ["1.1.1.1", "8.8.8.8", "9.9.9.9"],
+      checkNameserverConsistency: true,
+      signatureExpiryWarningDays: 7,
+      timeout: 10000,
+      retries: 3,
+    };
+  }
+
+  public static fromJSON(json: JSONObject): MonitorStepDnssecMonitor {
+    const defaults: MonitorStepDnssecMonitor =
+      MonitorStepDnssecMonitorUtil.getDefault();
+
+    const resolvers: Array<string> = Array.isArray(json["resolvers"])
+      ? (json["resolvers"] as Array<string>).filter((value: unknown) => {
+          return typeof value === "string" && value.length > 0;
+        })
+      : defaults.resolvers;
+
+    return {
+      domainName: (json["domainName"] as string) || "",
+      resolvers: resolvers.length > 0 ? resolvers : defaults.resolvers,
+      checkNameserverConsistency:
+        typeof json["checkNameserverConsistency"] === "boolean"
+          ? (json["checkNameserverConsistency"] as boolean)
+          : defaults.checkNameserverConsistency,
+      signatureExpiryWarningDays:
+        (json["signatureExpiryWarningDays"] as number) ||
+        defaults.signatureExpiryWarningDays,
+      timeout: (json["timeout"] as number) || defaults.timeout,
+      retries: (json["retries"] as number) || defaults.retries,
+    };
+  }
+
+  public static toJSON(monitor: MonitorStepDnssecMonitor): JSONObject {
+    return {
+      domainName: monitor.domainName,
+      resolvers: monitor.resolvers,
+      checkNameserverConsistency: monitor.checkNameserverConsistency,
+      signatureExpiryWarningDays: monitor.signatureExpiryWarningDays,
+      timeout: monitor.timeout,
+      retries: monitor.retries,
+    };
+  }
+}

package/Types/Monitor/MonitorType.ts

@@ -32,6 +32,9 @@ enum MonitorType {
   // DNS monitoring
   DNS = "DNS",
 
+  // DNSSEC validation monitoring
+  DNSSEC = "DNSSEC",
+
   // Domain registration monitoring
   Domain = "Domain",
 
@@ -64,12 +67,15 @@ export class MonitorTypeHelper {
           MonitorType.Ping,
           MonitorType.IP,
           MonitorType.Port,
-          MonitorType.DNS,
           MonitorType.SSLCertificate,
           MonitorType.Domain,
           MonitorType.ExternalStatusPage,
         ],
       },
+      {
+        label: "DNS Monitoring",
+        monitorTypes: [MonitorType.DNS, MonitorType.DNSSEC],
+      },
       {
         label: "Synthetic Monitoring",
         monitorTypes: [
@@ -83,7 +89,7 @@ export class MonitorTypeHelper {
       },
       {
         label: "Infrastructure",
-        monitorTypes: [MonitorType.Server, MonitorType.SNMP],
+        monitorTypes: [MonitorType.SNMP],
       },
       {
         label: "Kubernetes",
@@ -273,6 +279,13 @@ export class MonitorTypeHelper {
           "This monitor type lets you monitor DNS resolution for your domains, verify record values, and check DNSSEC validity.",
         icon: IconProp.GlobeAlt,
       },
+      {
+        monitorType: MonitorType.DNSSEC,
+        title: "DNSSEC",
+        description:
+          "This monitor type performs full DNSSEC validation — DNSKEY, DS at the parent zone, RRSIG validity windows, AD-flag/SERVFAIL behavior across public resolvers, and primary/secondary nameserver consistency.",
+        icon: IconProp.Key,
+      },
       {
         monitorType: MonitorType.Domain,
         title: "Domain",
@@ -334,6 +347,7 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.CustomJavaScriptCode ||
       monitorType === MonitorType.SNMP ||
       monitorType === MonitorType.DNS ||
+      monitorType === MonitorType.DNSSEC ||
       monitorType === MonitorType.Domain ||
       monitorType === MonitorType.ExternalStatusPage;
     return isProbeableMonitor;
@@ -359,6 +373,7 @@ export class MonitorTypeHelper {
       MonitorType.Profiles,
       MonitorType.SNMP,
       MonitorType.DNS,
+      MonitorType.DNSSEC,
       MonitorType.Domain,
       MonitorType.ExternalStatusPage,
       MonitorType.Kubernetes,
@@ -397,6 +412,7 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.CustomJavaScriptCode ||
       monitorType === MonitorType.SNMP ||
       monitorType === MonitorType.DNS ||
+      monitorType === MonitorType.DNSSEC ||
       monitorType === MonitorType.Domain ||
       monitorType === MonitorType.ExternalStatusPage
     ) {

package/Types/OnCallDutyPolicy/UserOverrideUtil.ts

@@ -27,22 +27,49 @@ export const OVERRIDE_META_KEY: string = "_override";
 
 export default class UserOverrideUtil {
   /**
-   * Returns true when this override should be applied on top of the schedule
-   * events. Global overrides always apply; policy-scoped overrides apply to
-   * any schedule, since a schedule's calendar shows coverage information for
-   * every user who could potentially be paged through it.
+   * Decides whether an override should affect resolution for a given policy
+   * context. Global overrides (no policy id) always apply. Policy-scoped
+   * overrides only apply when their policy matches the caller's policy.
+   * When the caller has no policy context, only global overrides apply.
    */
-  public static isOverrideApplicable(_override: UserOverrideRecord): boolean {
-    return true;
+  public static isOverrideApplicable(
+    override: UserOverrideRecord,
+    currentOnCallDutyPolicyId?: string | null | undefined,
+  ): boolean {
+    if (!override.onCallDutyPolicyId) {
+      return true;
+    }
+
+    if (!currentOnCallDutyPolicyId) {
+      return false;
+    }
+
+    return override.onCallDutyPolicyId === currentOnCallDutyPolicyId;
   }
 
   public static applyOverridesToEvents(data: {
     events: Array<CalendarEvent>;
     overrides: Array<UserOverrideRecord>;
+    currentOnCallDutyPolicyId?: string | null | undefined;
   }): Array<CalendarEvent> {
-    const applicable: Array<UserOverrideRecord> = data.overrides.filter(
-      UserOverrideUtil.isOverrideApplicable,
-    );
+    const applicable: Array<UserOverrideRecord> = data.overrides
+      .filter((o: UserOverrideRecord) => {
+        return UserOverrideUtil.isOverrideApplicable(
+          o,
+          data.currentOnCallDutyPolicyId,
+        );
+      })
+      /*
+       * Apply policy-specific overrides before globals so that when both
+       * target the same user/window, the policy-specific substitution wins.
+       * splitEventByOverride only matches on the original user id, so the
+       * first override that consumes a segment claims it.
+       */
+      .sort((a: UserOverrideRecord, b: UserOverrideRecord) => {
+        const aPolicyScoped: number = a.onCallDutyPolicyId ? 0 : 1;
+        const bPolicyScoped: number = b.onCallDutyPolicyId ? 0 : 1;
+        return aPolicyScoped - bPolicyScoped;
+      });
 
     if (applicable.length === 0) {
       return data.events;

package/Types/Probe/ProbeMonitorResponse.ts

@@ -9,6 +9,7 @@ import SyntheticMonitorResponse from "../Monitor/SyntheticMonitors/SyntheticMoni
 import SnmpMonitorResponse from "../Monitor/SnmpMonitor/SnmpMonitorResponse";
 import DnsMonitorResponse from "../Monitor/DnsMonitor/DnsMonitorResponse";
 import DomainMonitorResponse from "../Monitor/DomainMonitor/DomainMonitorResponse";
+import DnssecMonitorResponse from "../Monitor/DnssecMonitor/DnssecMonitorResponse";
 import ExternalStatusPageMonitorResponse from "../Monitor/ExternalStatusPageMonitor/ExternalStatusPageMonitorResponse";
 import MonitorEvaluationSummary from "../Monitor/MonitorEvaluationSummary";
 import ObjectID from "../ObjectID";
@@ -35,6 +36,7 @@ export default interface ProbeMonitorResponse {
   snmpResponse?: SnmpMonitorResponse | undefined;
   dnsResponse?: DnsMonitorResponse | undefined;
   domainResponse?: DomainMonitorResponse | undefined;
+  dnssecResponse?: DnssecMonitorResponse | undefined;
   externalStatusPageResponse?: ExternalStatusPageMonitorResponse | undefined;
   monitoredAt: Date;
   isTimeout?: boolean | undefined;

package/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.ts

@@ -405,6 +405,57 @@ export default class TemplateVariablesCatalog {
           ],
         };
 
+      case MonitorType.DNSSEC:
+        return {
+          title: "DNSSEC",
+          variables: [
+            {
+              key: "isOnline",
+              description: "True if the DNSSEC check completed.",
+            },
+            { key: "domainName", description: "Zone queried." },
+            {
+              key: "isZoneSigned",
+              description: "True if any DNSKEY records exist for the zone.",
+            },
+            {
+              key: "isParentDsPresent",
+              description: "True if DS records exist at the parent zone.",
+            },
+            {
+              key: "isChainValid",
+              description:
+                "True if DNSKEY, DS, RRSIG, and resolver AD-flag all check out.",
+            },
+            {
+              key: "resolverConsensusAd",
+              description:
+                "True if every configured resolver returned the AD flag.",
+            },
+            {
+              key: "isNameserverConsistent",
+              description:
+                "True if every authoritative nameserver returned the same SOA serial.",
+            },
+            {
+              key: "earliestSignatureExpiration",
+              description: "Earliest RRSIG expiration timestamp (ISO).",
+            },
+            {
+              key: "daysUntilSignatureExpiry",
+              description: "Days until the earliest RRSIG expires.",
+            },
+            { key: "dnskeyCount", description: "Number of DNSKEY records." },
+            {
+              key: "dsRecordCount",
+              description: "Number of DS records at the parent.",
+            },
+            { key: "rrsigCount", description: "Number of RRSIG records seen." },
+            { key: "responseTimeInMs", description: "Total check duration." },
+            { key: "failureCause", description: "Failure reason." },
+          ],
+        };
+
       case MonitorType.ExternalStatusPage:
         return {
           title: "External Status Page",

package/Utils/Dashboard/Components/DashboardTableComponent.ts

@@ -1,5 +1,9 @@
-import DashboardTableComponent from "../../../Types/Dashboard/DashboardComponents/DashboardTableComponent";
+import DashboardTableComponent, {
+  TableColumnKind,
+  TableReduce,
+} from "../../../Types/Dashboard/DashboardComponents/DashboardTableComponent";
 import { ObjectType } from "../../../Types/JSON";
+import MetricsAggregationType from "../../../Types/Metrics/MetricsAggregationType";
 import ObjectID from "../../../Types/ObjectID";
 import DashboardBaseComponentUtil from "./DashboardBaseComponent";
 import {
@@ -9,15 +13,16 @@ import {
 } from "../../../Types/Dashboard/DashboardComponents/ComponentArgument";
 import DashboardComponentType from "../../../Types/Dashboard/DashboardComponentType";
 
-const DataSourceSection: ComponentArgumentSection = {
-  name: "Data Source",
-  description: "Configure which metrics to display in the table",
+const DataSection: ComponentArgumentSection = {
+  name: "Data",
+  description:
+    "Pick how rows are grouped, then add columns for metrics and formulas",
   order: 1,
 };
 
 const DisplaySection: ComponentArgumentSection = {
   name: "Display Options",
-  description: "Customize the table appearance",
+  description: "Customize how the table renders",
   order: 2,
   defaultCollapsed: true,
 };
@@ -35,13 +40,22 @@ export default class DashboardTableComponentUtil extends DashboardBaseComponentU
       minHeightInDashboardUnits: 3,
       minWidthInDashboardUnits: 4,
       arguments: {
-        metricQueryConfig: {
-          metricQueryData: {
-            filterData: {},
-            groupBy: undefined,
+        groupByAttributes: [],
+        columns: [
+          {
+            id: ObjectID.generate().toString(),
+            variable: "a",
+            header: "Value",
+            kind: TableColumnKind.Metric,
+            showAsColumn: true,
+            metricName: undefined,
+            aggregation: MetricsAggregationType.Avg,
+            decimals: 2,
           },
-        },
-        maxRows: 20,
+        ],
+        maxRows: 25,
+        reduce: TableReduce.Last,
+        decimals: 2,
       },
     };
   }
@@ -54,12 +68,23 @@ export default class DashboardTableComponentUtil extends DashboardBaseComponentU
     > = [];
 
     componentArguments.push({
-      name: "Metric Query",
-      description: "Select the metrics to display in the table",
+      name: "Group By Attributes",
+      description:
+        "Each unique combination of these attribute values becomes one row. Customize the column header for each picked attribute below. Leave empty for a time-bucketed table.",
+      required: false,
+      type: ComponentInputType.TableGroupBy,
+      id: "groupByAttributes",
+      section: DataSection,
+    });
+
+    componentArguments.push({
+      name: "Metrics & Columns",
+      description:
+        "Define metrics (data sources) and formulas. Each is auto-assigned a variable letter (a, b, c…) — formulas reference these. Toggle 'Show as column' off for metrics that should only feed formulas without appearing in the table.",
       required: true,
-      type: ComponentInputType.MetricsQueryConfig,
-      id: "metricQueryConfig",
-      section: DataSourceSection,
+      type: ComponentInputType.TableColumns,
+      id: "columns",
+      section: DataSection,
     });
 
     componentArguments.push({
@@ -71,13 +96,51 @@ export default class DashboardTableComponentUtil extends DashboardBaseComponentU
       section: DisplaySection,
     });
 
+    componentArguments.push({
+      name: "Description",
+      description: "Subtitle shown below the title",
+      required: false,
+      type: ComponentInputType.LongText,
+      id: "tableDescription",
+      section: DisplaySection,
+    });
+
+    componentArguments.push({
+      name: "Reduce across time",
+      description:
+        "When Group By is set, how to collapse the time series into one value per row",
+      required: false,
+      type: ComponentInputType.Dropdown,
+      id: "reduce",
+      placeholder: TableReduce.Last,
+      section: DisplaySection,
+      dropdownOptions: [
+        { label: "Last value", value: TableReduce.Last },
+        { label: "Average", value: TableReduce.Avg },
+        { label: "Sum", value: TableReduce.Sum },
+        { label: "Min", value: TableReduce.Min },
+        { label: "Max", value: TableReduce.Max },
+      ],
+    });
+
+    componentArguments.push({
+      name: "Decimals",
+      description:
+        "Default decimals for value columns (overridable per column)",
+      required: false,
+      type: ComponentInputType.Number,
+      id: "decimals",
+      placeholder: "2",
+      section: DisplaySection,
+    });
+
     componentArguments.push({
       name: "Max Rows",
       description: "Maximum number of rows to show",
       required: false,
       type: ComponentInputType.Number,
       id: "maxRows",
-      placeholder: "20",
+      placeholder: "25",
       section: DisplaySection,
     });
 

package/Utils/Dashboard/Components/Index.ts

@@ -11,7 +11,6 @@ import DashboardDockerNetworkListComponentUtil from "./DashboardDockerNetworkLis
 import DashboardDockerVolumeListComponentUtil from "./DashboardDockerVolumeListComponent";
 import DashboardGaugeComponentUtil from "./DashboardGaugeComponent";
 import DashboardHostListComponentUtil from "./DashboardHostListComponent";
-import DashboardHostMetricChartComponentUtil from "./DashboardHostMetricChartComponent";
 import DashboardIncidentListComponentUtil from "./DashboardIncidentListComponent";
 import DashboardKubernetesCronJobListComponentUtil from "./DashboardKubernetesCronJobListComponent";
 import DashboardKubernetesDaemonSetListComponentUtil from "./DashboardKubernetesDaemonSetListComponent";
@@ -187,12 +186,6 @@ export default class DashboardComponentsUtil {
       >;
     }
 
-    if (dashboardComponentType === DashboardComponentType.HostMetricChart) {
-      return DashboardHostMetricChartComponentUtil.getComponentConfigArguments() as Array<
-        ComponentArgument<DashboardBaseComponent>
-      >;
-    }
-
     throw new BadDataException(
       `Unknown dashboard component type: ${dashboardComponentType}`,
     );

package/Utils/Monitor/MonitorMetricType.ts

@@ -171,6 +171,7 @@ class MonitorMetricTypeUtil {
       monitorType === MonitorType.Port ||
       monitorType === MonitorType.SNMP ||
       monitorType === MonitorType.DNS ||
+      monitorType === MonitorType.DNSSEC ||
       monitorType === MonitorType.Domain ||
       monitorType === MonitorType.ExternalStatusPage
     ) {