@oneuptime/common 11.6.0 → 11.6.2

package/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -77,6 +77,15 @@ export default class AnalyticsBaseModel extends CommonModel {
     materializedViews?: Array<MaterializedView> | undefined;
     enableMCP?: boolean | undefined;
     ttlExpression?: string | undefined; // e.g. "retentionDate DELETE"
+    /*
+     * Generic event/entity tables carry `_id` and `createdAt`. Derived
+     * AggregatingMergeTree targets do not represent independently-addressable
+     * rows: their identity is exactly their aggregation key, and an arbitrary
+     * creation timestamp has no stable meaning after merges. Those models set
+     * this false so ClickHouse can enforce that every non-key column is an
+     * aggregate measure. Defaults true for backward compatibility.
+     */
+    includeBaseColumns?: boolean | undefined;
     /*
      * Column that `findBy` falls back to when the caller doesn't
      * specify a `sort`. Defaults to `createdAt` (matching the legacy
@@ -100,31 +109,39 @@ export default class AnalyticsBaseModel extends CommonModel {
       this.tableEngine = data.tableEngine;
     }
 
-    columns.push(
-      new AnalyticsTableColumn({
-        key: "_id",
-        title: "ID",
-        description: "ID of this object",
-        required: true,
-        type: TableColumnType.ObjectID,
-        /*
-         * Ids are UUIDv7 (time-ordered — see ObjectID.generateTimeOrdered),
-         * so consecutive rows share their 48-bit timestamp prefix and ZSTD
-         * compresses them well; random v4 ids were incompressible.
-         */
-        codec: { codec: "ZSTD", level: 1 },
-      }),
-    );
+    if (data.includeBaseColumns !== false) {
+      columns.push(
+        new AnalyticsTableColumn({
+          key: "_id",
+          title: "ID",
+          description: "ID of this object",
+          required: true,
+          type: TableColumnType.ObjectID,
+          /*
+           * Ids are UUIDv7 (time-ordered — see ObjectID.generateTimeOrdered),
+           * so consecutive rows share their 48-bit timestamp prefix and ZSTD
+           * compresses them well; random v4 ids were incompressible.
+           */
+          codec: { codec: "ZSTD", level: 1 },
+        }),
+      );
 
-    columns.push(
-      new AnalyticsTableColumn({
-        key: "createdAt",
-        title: "Created",
-        description: "Date and Time when the object was created.",
-        required: true,
-        type: TableColumnType.Date,
-      }),
-    );
+      columns.push(
+        new AnalyticsTableColumn({
+          key: "createdAt",
+          title: "Created",
+          description: "Date and Time when the object was created.",
+          required: true,
+          type: TableColumnType.Date,
+        }),
+      );
+    }
+
+    if (data.includeBaseColumns === false && !data.defaultSortColumn) {
+      throw new BadDataException(
+        "defaultSortColumn is required when includeBaseColumns is false because createdAt is not part of the table schema",
+      );
+    }
 
     if (!data.primaryKeys || data.primaryKeys.length === 0) {
       throw new BadDataException("Primary keys are required");

package/Models/AnalyticsModels/Index.ts

@@ -7,10 +7,12 @@ import MetricItemAggMV1mByService from "./MetricItemAggMV1mByService";
 import MetricItemAggMV1mByK8sCluster from "./MetricItemAggMV1mByK8sCluster";
 import MetricItemAggMV1mByContainer from "./MetricItemAggMV1mByContainer";
 import MetricBaselineHourly from "./MetricBaselineHourly";
+import SloHistory from "./SloHistory";
 import Span from "./Span";
 import ExceptionInstance from "./ExceptionInstance";
 import MonitorLog from "./MonitorLog";
 import NetworkFlow from "./NetworkFlow";
+import KubernetesCostAllocation from "./KubernetesCostAllocation";
 import Profile from "./Profile";
 import ProfileSample from "./ProfileSample";
 import AuditLog from "./AuditLog";
@@ -39,9 +41,11 @@ const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
   MetricItemAggMV1mByK8sCluster,
   MetricItemAggMV1mByContainer,
   MetricBaselineHourly,
+  SloHistory,
   ExceptionInstance,
   MonitorLog,
   NetworkFlow,
+  KubernetesCostAllocation,
   Profile,
   ProfileSample,
   AuditLog,