@oneuptime/common 11.5.10 → 11.5.12

package/Types/BaseDatabase/GreaterThan.ts

@@ -11,7 +11,14 @@ export default class GreaterThan<T extends CompareType> extends CompareBase<T> {
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.GreaterThan,
-      value: (this as GreaterThan<T>).toString(),
+      /*
+       * The RAW value is serialized (like InBetween), not toString():
+       * toString() collapses a Date to a local-timezone date-only string
+       * (asDateForDatabaseQuery), shifting Date bounds sent from the browser
+       * by up to a day. JSON.stringify emits a raw Date as its full ISO
+       * timestamp, which the server binds at full precision.
+       */
+      value: (this as GreaterThan<T>).value,
     };
   }
 

package/Types/BaseDatabase/GreaterThanOrEqual.ts

@@ -13,7 +13,14 @@ export default class GreaterThanOrEqual<
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.GreaterThanOrEqual,
-      value: (this as GreaterThanOrEqual<T>).toString(),
+      /*
+       * The RAW value is serialized (like InBetween), not toString():
+       * toString() collapses a Date to a local-timezone date-only string
+       * (asDateForDatabaseQuery), shifting Date bounds sent from the browser
+       * by up to a day. JSON.stringify emits a raw Date as its full ISO
+       * timestamp, which the server binds at full precision.
+       */
+      value: (this as GreaterThanOrEqual<T>).value,
     };
   }
 

package/Types/BaseDatabase/GreaterThanOrNull.ts

@@ -10,10 +10,18 @@ export default class GreaterThanOrNull<
     super(value);
   }
 
+  /*
+   * Serializes the RAW value (like InBetween does), not toString(): toString()
+   * collapses a Date to a date-only string in the LOCAL timezone
+   * (asDateForDatabaseQuery), so a Date bound would arrive at the server as
+   * midnight of the browser's calendar date and shift the query bound by up to
+   * a day. JSON.stringify turns a raw Date into its full ISO timestamp, which
+   * the server binds at full precision.
+   */
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.GreaterThanOrNull,
-      value: (this as GreaterThanOrNull<T>).toString(),
+      value: (this as GreaterThanOrNull<T>).value,
     };
   }
 

package/Types/BaseDatabase/LessThan.ts

@@ -11,7 +11,14 @@ export default class LessThan<T extends CompareType> extends CompareBase<T> {
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.LessThan,
-      value: (this as LessThan<T>).toString(),
+      /*
+       * The RAW value is serialized (like InBetween), not toString():
+       * toString() collapses a Date to a local-timezone date-only string
+       * (asDateForDatabaseQuery), shifting Date bounds sent from the browser
+       * by up to a day. JSON.stringify emits a raw Date as its full ISO
+       * timestamp, which the server binds at full precision.
+       */
+      value: (this as LessThan<T>).value,
     };
   }
 

package/Types/BaseDatabase/LessThanOrEqual.ts

@@ -10,10 +10,18 @@ export default class LessThanOrEqual<
     super(value);
   }
 
+  /*
+   * Serializes the RAW value (like InBetween does), not toString(): toString()
+   * collapses a Date to a date-only string in the LOCAL timezone
+   * (asDateForDatabaseQuery), so a bound of "now" would arrive at the server as
+   * midnight of the browser's calendar date and silently exclude every row from
+   * today. JSON.stringify turns a raw Date into its full ISO timestamp, which
+   * the server binds at full precision.
+   */
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.LessThanOrEqual,
-      value: (this as LessThanOrEqual<T>).toString(),
+      value: (this as LessThanOrEqual<T>).value,
     };
   }
 

package/Types/BaseDatabase/LessThanOrNull.ts

@@ -13,7 +13,14 @@ export default class LessThanOrNull<
   public override toJSON(): JSONObject {
     return {
       _type: ObjectType.LessThanOrNull,
-      value: (this as LessThanOrNull<T>).toString(),
+      /*
+       * The RAW value is serialized (like InBetween), not toString():
+       * toString() collapses a Date to a local-timezone date-only string
+       * (asDateForDatabaseQuery), shifting Date bounds sent from the browser
+       * by up to a day. JSON.stringify emits a raw Date as its full ISO
+       * timestamp, which the server binds at full precision.
+       */
+      value: (this as LessThanOrNull<T>).value,
     };
   }
 

package/Utils/StatusPage/ResourceUptime.ts

@@ -6,7 +6,7 @@ import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource";
 import Dictionary from "../../Types/Dictionary";
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
 import StatusPageGroup from "../../Models/DatabaseModels/StatusPageGroup";
-import UptimeUtil from "../Uptime/UptimeUtil";
+import UptimeUtil, { UptimeWindow } from "../Uptime/UptimeUtil";
 
 export default class StatusPageResourceUptimeUtil {
   public static getWorstMonitorStatus(data: {
@@ -137,6 +137,8 @@ export default class StatusPageResourceUptimeUtil {
     precision: UptimePrecision;
     downtimeMonitorStatuses: Array<MonitorStatus>;
     monitorsInGroup: Dictionary<Array<ObjectID>>;
+    // if supplied, uptime is measured over this window instead of "first event -> now".
+    uptimeWindow?: UptimeWindow | undefined;
   }): number | null {
     if (!data.statusPageResource.showUptimePercent) {
       return null;
@@ -156,6 +158,7 @@ export default class StatusPageResourceUptimeUtil {
       monitorStatusTimelines,
       data.precision,
       downtimeMonitorStatuses,
+      data.uptimeWindow,
     );
 
     return uptimePercent;
@@ -168,6 +171,8 @@ export default class StatusPageResourceUptimeUtil {
     downtimeMonitorStatuses: Array<MonitorStatus>;
     statusPageResources: Array<StatusPageResource>;
     monitorsInGroup: Dictionary<Array<ObjectID>>;
+    // if supplied, uptime is measured over this window instead of "first event -> now".
+    uptimeWindow?: UptimeWindow | undefined;
   }): number | null {
     if (!data.statusPageGroup.showUptimePercent) {
       return null;
@@ -193,6 +198,7 @@ export default class StatusPageResourceUptimeUtil {
           precision: data.precision,
           downtimeMonitorStatuses: data.downtimeMonitorStatuses,
           monitorsInGroup: data.monitorsInGroup,
+          uptimeWindow: data.uptimeWindow,
         });
 
       if (calculateUptimePercentOfResource !== null) {
@@ -252,6 +258,8 @@ export default class StatusPageResourceUptimeUtil {
     statusPageResources: Array<StatusPageResource>;
     resourceGroups: Array<StatusPageGroup>;
     monitorsInGroup: Dictionary<Array<ObjectID>>;
+    // if supplied, uptime is measured over this window instead of "first event -> now".
+    uptimeWindow?: UptimeWindow | undefined;
   }): number | null {
     const showUptimePercentage: boolean = Boolean(
       data.statusPageResources.find((item: StatusPageResource) => {
@@ -276,6 +284,7 @@ export default class StatusPageResourceUptimeUtil {
           downtimeMonitorStatuses: data.downtimeMonitorStatuses,
           statusPageResources: data.statusPageResources,
           monitorsInGroup: data.monitorsInGroup,
+          uptimeWindow: data.uptimeWindow,
         });
 
       if (calculateAvgUptimePercentOfStatusPageGroup !== null) {
@@ -298,6 +307,7 @@ export default class StatusPageResourceUptimeUtil {
           precision: data.precision,
           downtimeMonitorStatuses: data.downtimeMonitorStatuses,
           monitorsInGroup: data.monitorsInGroup,
+          uptimeWindow: data.uptimeWindow,
         });
 
       if (calculateUptimePercentOfResource !== null) {

package/Utils/Uptime/UptimeUtil.ts

@@ -7,15 +7,30 @@ import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus";
 import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline";
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
 
+/**
+ * The time period an uptime calculation is reported over. When this is supplied, events are
+ * clipped to it and the denominator of the uptime percentage is the window itself - clipped to
+ * now, and starting no earlier than the first recorded event (so a monitor younger than the
+ * window is measured from its first event, not diluted by time it did not exist). Without it,
+ * events run to the start of the next event (or now) and the denominator is "first event -> now",
+ * which lets an open (endsAt = null) row from months ago leak into an unrelated report.
+ */
+export interface UptimeWindow {
+  startDate: Date;
+  endDate: Date;
+}
+
 export default class UptimeUtil {
   /**
    * This function, `getMonitorEventsForId`, takes a `monitorId` as an argument and returns an array of `MonitorEvent` objects.
    * @param {ObjectID} monitorId - The ID of the monitor for which events are to be fetched.
+   * @param {UptimeWindow | undefined} window - If supplied, events are clipped to this window and events outside it are dropped.
    * @returns {Array<MonitorEvent>} - An array of `MonitorEvent` objects.
    */
   public static getMonitorEventsForId(
     monitorId: ObjectID,
     statusTimelineItems: Array<MonitorStatusTimeline>,
+    window?: UptimeWindow | undefined,
   ): Array<MonitorEvent> {
     // Initialize an empty array to store the monitor events.
 
@@ -65,15 +80,54 @@ export default class UptimeUtil {
         // check if there's next event, if there is, set the end date to the start date of the next event.
         if (i < monitorEvents.length - 1) {
           endDate = monitorEvents[i + 1]!.startsAt;
-        } else {
+        }
+
+        // if this is the last event, or the next event has no start date, then this event is still open and runs until now.
+        if (!endDate) {
           endDate = OneUptimeDate.getCurrentDate();
         }
       }
 
+      let eventStartDate: Date = startDate;
+      let eventEndDate: Date = endDate;
+
+      if (window) {
+        /*
+         * Clip the event to the reporting window. Without this an open (endsAt = null) row that
+         * started months before the window contributes its entire life to the report.
+         *
+         * The end is also capped at "now", to match the denominator in
+         * getTotalDowntimeInSeconds, which measures the window only up to the
+         * current time (min(window.endDate, now)). If the numerator were allowed
+         * to run to a future window.endDate while the denominator stopped at now,
+         * a closed row ending in the future could make downtime exceed the elapsed
+         * period and drive the raw percentage negative.
+         */
+        eventStartDate = OneUptimeDate.getGreaterDate(
+          eventStartDate,
+          window.startDate,
+        );
+        eventEndDate = OneUptimeDate.getLesserDate(
+          eventEndDate,
+          OneUptimeDate.getLesserDate(
+            window.endDate,
+            OneUptimeDate.getCurrentDate(),
+          ),
+        );
+
+        // if the event does not overlap the window at all, then drop it.
+        if (
+          OneUptimeDate.getSecondsBetweenDates(eventStartDate, eventEndDate) <=
+          0
+        ) {
+          continue;
+        }
+      }
+
       // Push a new MonitorEvent object to the eventList array with properties from the current item and calculated dates.
       eventList.push({
-        startDate: startDate,
-        endDate: endDate!,
+        startDate: eventStartDate,
+        endDate: eventEndDate,
         label: monitorEvents[i]?.monitorStatus?.name || "Operational",
         priority: monitorEvents[i]?.monitorStatus?.priority || 0,
         color: monitorEvents[i]?.monitorStatus?.color || Green,
@@ -88,8 +142,12 @@ export default class UptimeUtil {
 
   public static getNonOverlappingMonitorEvents(
     items: Array<MonitorStatusTimeline>,
+    window?: UptimeWindow | undefined,
   ): Array<Event> {
-    const monitorEventList: Array<MonitorEvent> = this.getMonitorEvents(items);
+    const monitorEventList: Array<MonitorEvent> = this.getMonitorEvents(
+      items,
+      window,
+    );
 
     const eventList: Array<Event> = [];
 
@@ -98,20 +156,6 @@ export default class UptimeUtil {
 
       const monitorEvent: MonitorEvent = monitorEventList[i]!;
 
-      if (!monitorEvent.endDate) {
-        // if this is the last event then set endDate to current date.
-
-        // otherwise set it to start date of next event.
-
-        if (i === monitorEventList.length - 1) {
-          monitorEvent.endDate = OneUptimeDate.getCurrentDate();
-        } else {
-          monitorEvent.endDate =
-            monitorEventList[i + 1]!.startDate ||
-            OneUptimeDate.getCurrentDate();
-        }
-      }
-
       if (
         eventList.length === 0 ||
         OneUptimeDate.isAfter(
@@ -188,6 +232,7 @@ export default class UptimeUtil {
 
   public static getMonitorEvents(
     items: Array<MonitorStatusTimeline>,
+    window?: UptimeWindow | undefined,
   ): Array<MonitorEvent> {
     // get all distinct monitor ids.
     const monitorIds: Array<ObjectID> = [];
@@ -219,6 +264,7 @@ export default class UptimeUtil {
       const monitorEvents: Array<MonitorEvent> = this.getMonitorEventsForId(
         monitorId,
         items,
+        window,
       );
       eventList.push(...monitorEvents);
     }
@@ -242,12 +288,14 @@ export default class UptimeUtil {
   public static getTotalDowntimeInSeconds(
     monitorStatusTimelines: Array<MonitorStatusTimeline>,
     downtimeMonitorStatuses: Array<MonitorStatus>,
+    window?: UptimeWindow | undefined,
   ): {
     totalDowntimeInSeconds: number;
     totalSecondsInTimePeriod: number;
   } {
     const monitorEvents: Array<Event> = this.getNonOverlappingMonitorEvents(
       monitorStatusTimelines,
+      window,
     );
 
     // sort these by start date,
@@ -263,33 +311,83 @@ export default class UptimeUtil {
       return 0;
     });
 
+    /*
+     * If a window is supplied then the time period is the window itself, and not "first event -> now".
+     * Two clamps apply to the window:
+     *
+     *   - The window end is clipped to now, so a window that reaches into the future does not
+     *     inflate the denominator (which is what made the reported percentage drift upwards
+     *     every day).
+     *
+     *   - The window start is clamped forward to the first event's start, so time from before
+     *     the monitor's first recorded event does not count as uptime. Events are already
+     *     clipped to the window, so this only moves the start when the monitor has NO data for
+     *     the head of the window - i.e. it is younger than the window. Without this a monitor
+     *     created a day ago and Offline ever since would report ~98.9% uptime over a 90 day
+     *     window; with it, it reports 0% - the same answer the windowless
+     *     "first event -> now" denominator always gave.
+     *
+     * When there are no events at all there is nothing to clamp to and the denominator is the
+     * full (now-clipped) window.
+     */
+    let windowSecondsInTimePeriod: number | null = null;
+
+    if (window) {
+      const windowEndDate: Date = OneUptimeDate.getLesserDate(
+        window.endDate,
+        OneUptimeDate.getCurrentDate(),
+      );
+
+      const windowStartDate: Date =
+        monitorEvents.length > 0
+          ? OneUptimeDate.getGreaterDate(
+              window.startDate,
+              monitorEvents[0]!.startDate,
+            )
+          : window.startDate;
+
+      windowSecondsInTimePeriod = OneUptimeDate.getSecondsBetweenDates(
+        windowStartDate,
+        windowEndDate,
+      );
+
+      // never let the denominator be zero or negative.
+      if (!windowSecondsInTimePeriod || windowSecondsInTimePeriod < 0) {
+        windowSecondsInTimePeriod = 1;
+      }
+    }
+
     // calculate number of seconds between start of first event to date time now.
     let totalSecondsInTimePeriod: number = 0;
 
     if (monitorEvents.length === 0) {
       return {
         totalDowntimeInSeconds: 0,
-        totalSecondsInTimePeriod: 1,
+        totalSecondsInTimePeriod: windowSecondsInTimePeriod ?? 1,
       };
     }
 
-    if (
-      OneUptimeDate.isAfter(
-        monitorEvents[0]!.startDate,
-        OneUptimeDate.getCurrentDate(),
-      )
-    ) {
-      return {
-        totalDowntimeInSeconds: 0,
-        totalSecondsInTimePeriod: 1,
-      };
-    }
+    if (windowSecondsInTimePeriod !== null) {
+      totalSecondsInTimePeriod = windowSecondsInTimePeriod;
+    } else {
+      if (
+        OneUptimeDate.isAfter(
+          monitorEvents[0]!.startDate,
+          OneUptimeDate.getCurrentDate(),
+        )
+      ) {
+        return {
+          totalDowntimeInSeconds: 0,
+          totalSecondsInTimePeriod: 1,
+        };
+      }
 
-    totalSecondsInTimePeriod =
-      OneUptimeDate.getSecondsBetweenDates(
-        monitorEvents[0]!.startDate,
-        OneUptimeDate.getCurrentDate(),
-      ) || 1;
+      totalSecondsInTimePeriod =
+        OneUptimeDate.getSecondsBetweenDates(
+          monitorEvents[0]!.startDate,
+          OneUptimeDate.getCurrentDate(),
+        ) || 1;
+    }
 
     // get order of operational state.
 
@@ -347,6 +445,7 @@ export default class UptimeUtil {
     monitorStatusTimelines: Array<MonitorStatusTimeline>,
     precision: UptimePrecision,
     downtimeMonitorStatuses: Array<MonitorStatus>,
+    window?: UptimeWindow | undefined,
   ): number {
     // calculate percentage.
 
@@ -354,6 +453,7 @@ export default class UptimeUtil {
       this.getTotalDowntimeInSeconds(
         monitorStatusTimelines,
         downtimeMonitorStatuses,
+        window,
       );
 
     if (totalSecondsInTimePeriod === 0) {
@@ -369,8 +469,14 @@ export default class UptimeUtil {
         totalSecondsInTimePeriod) *
       100;
 
+    /*
+     * clamp before rounding. roundToPrecision floors, so an out of range value would otherwise
+     * escape as is (for example -13.5 stays -13.5 and never becomes 0).
+     */
+    const clampedPercentage: number = Math.min(100, Math.max(0, percentage));
+
     return this.roundToPrecision({
-      number: percentage,
+      number: clampedPercentage,
       precision,
     });
   }

package/build/dist/Models/AnalyticsModels/NetworkFlow.js

@@ -264,8 +264,19 @@ export default class NetworkFlow extends AnalyticsBaseModel {
              * (a retentionDate column computed at ingest, like Log/Metric) is
              * the phase-2 follow-up. Keyed on server-assigned ingestedAt so a
              * device with a wrong clock cannot make rows expire early.
+             *
+             * toDateTime() is NOT redundant: ingestedAt is DateTime64(9), so
+             * `ingestedAt + INTERVAL 30 DAY` stays DateTime64(9), and a TTL
+             * expression must evaluate to Date or DateTime. ClickHouse only began
+             * accepting DateTime64 there in 25.x; on 24.x it fails the CREATE with
+             * BAD_TTL_EXPRESSION, which aborts the whole boot schema-sync (it has
+             * no per-table error handling) and takes every table registered after
+             * this one down with it. The Helm chart ships `tag: latest` but tells
+             * operators to pin for production, so older servers are supported and
+             * this must stay version-portable. Narrowing to second precision is
+             * lossless for a 30-day retention window.
              */
-            ttlExpression: "ingestedAt + INTERVAL 30 DAY DELETE",
+            ttlExpression: "toDateTime(ingestedAt) + INTERVAL 30 DAY DELETE",
             defaultSortColumn: "flowStartAt",
         });
     }

package/build/dist/Models/AnalyticsModels/NetworkFlow.js.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkFlow.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/NetworkFlow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NetworkFlow.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/NetworkFlow.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/API/StatusPageAPI.js

@@ -879,6 +879,16 @@ export default class StatusPageAPI extends BaseAPI {
                     endDateForMonitorTimeline: endDate,
                 });
                 const downtimeMonitorStatuses = statusPage.downtimeMonitorStatuses || [];
+                /*
+                 * this endpoint reports uptime over an explicit [startDate, endDate] range, so events
+                 * have to be clipped to it and the denominator has to be the range itself. Without
+                 * this an open (endsAt = null) row that started before the range contributes its
+                 * entire duration to the downtime total.
+                 */
+                const uptimeWindow = {
+                    startDate: startDate,
+                    endDate: endDate,
+                };
                 const getUptimeByStatusPageGroup = (data) => {
                     var _a, _b, _c, _d, _e;
                     const groupUptime = {
@@ -936,7 +946,7 @@ export default class StatusPageAPI extends BaseAPI {
                                     monitorsInGroup: monitorsInGroup,
                                 });
                                 if (resource.showUptimePercent) {
-                                    const uptimePercent = UptimeUtil.calculateUptimePercentage(resourceStatusTimelines, precision, downtimeMonitorStatuses);
+                                    const uptimePercent = UptimeUtil.calculateUptimePercentage(resourceStatusTimelines, precision, downtimeMonitorStatuses, uptimeWindow);
                                     resourceUptime.uptimePercent = uptimePercent;
                                 }
                                 groupUptime.statusPageResourceUptimes.push(resourceUptime);
@@ -966,7 +976,7 @@ export default class StatusPageAPI extends BaseAPI {
                                         monitorStatusTimelines: monitorStatusTimelines,
                                         monitorsInGroup: monitorsInGroup,
                                     });
-                                    const uptimePercent = UptimeUtil.calculateUptimePercentage(resourceStatusTimelines, precision, downtimeMonitorStatuses);
+                                    const uptimePercent = UptimeUtil.calculateUptimePercentage(resourceStatusTimelines, precision, downtimeMonitorStatuses, uptimeWindow);
                                     resourceUptime.uptimePercent = uptimePercent;
                                 }
                                 groupUptime.statusPageResourceUptimes.push(resourceUptime);