@oneuptime/common 12.0.33 → 12.0.34

package/Models/AnalyticsModels/RumSession.ts

@@ -129,6 +129,25 @@ const COUNTER_COLUMNS: Array<{
     title: "Page Count",
     description: "Distinct route changes observed in this session",
   },
+  /*
+   * Engagement counters. Optional on the wire (an older recorder omits
+   * them, the ingest reads absence as 0), summed per chunk by the
+   * finalizer exactly like the frustration counters above. clickCount is
+   * what the list's "41 clicks" cell and the player's activity heat read
+   * without decoding a chunk.
+   */
+  {
+    key: "clickCount",
+    title: "Click Count",
+    description:
+      "Labelled clicks (oneuptime.click events) across all chunks; capped per chunk by the recorder",
+  },
+  {
+    key: "customEventCount",
+    title: "Custom Event Count",
+    description:
+      "Host-page track() events (oneuptime.custom) across all chunks; capped per chunk by the recorder",
+  },
 ];
 
 /* Low-cardinality device / policy descriptors, all Set-indexed. */
@@ -415,6 +434,29 @@ export default class RumSession extends AnalyticsBaseModel {
           "Observed client-minus-server clock skew, positive when the device runs ahead",
         type: TableColumnType.LongNumber,
       },
+      /*
+       * Engagement aggregates written by the finalizer, both bounded by
+       * SESSION_REPLAY_MAX_SESSION_MS so Int64 (BigNumber) is ample; they
+       * default to 0 because a provisional header has not been measured
+       * yet and the list must not read a null. 0 is also the honest "none"
+       * for firstErrorOffsetMs: a session without errors has no first
+       * error, and the UI only offers "Watch from first error" when
+       * errorCount > 0.
+       */
+      {
+        key: "firstErrorOffsetMs",
+        title: "First Error Offset (ms)",
+        description:
+          "Timeline offset of the first chunk that carried an error, so the list can open playback just before it; 0 when the session has no errors",
+        type: TableColumnType.BigNumber,
+      },
+      {
+        key: "activeMs",
+        title: "Active (ms)",
+        description:
+          "Sum of chunk spans that carried user activity (eventCount >= SESSION_REPLAY_ACTIVE_CHUNK_MIN_EVENTS); durationMs minus this is idle time",
+        type: TableColumnType.BigNumber,
+      },
     ].map(
       (def: {
         key: string;
@@ -435,13 +477,33 @@ export default class RumSession extends AnalyticsBaseModel {
         const isWiderThan64Bits: boolean =
           def.type === TableColumnType.LongNumber;
 
+        /*
+         * BigNumber (Int64) is within T64's range, but the repo-wide codec
+         * test treats every 64-bit-and-wider type as off limits for T64 so
+         * a later widening cannot silently reintroduce the boot failure
+         * above. Plain ZSTD for both.
+         */
+        const isPlainZstd: boolean =
+          isWiderThan64Bits || def.type === TableColumnType.BigNumber;
+
+        /*
+         * The engagement aggregates were added after the table shipped and
+         * are back-filled by ADD COLUMN, so they carry an explicit 0
+         * default: rows written before the column existed read 0 (not
+         * measured is rendered by the API from isFinalized, never from
+         * these), and a provisional header that omits them inserts cleanly.
+         */
+        const isEngagementAggregate: boolean =
+          def.key === "firstErrorOffsetMs" || def.key === "activeMs";
+
         return new AnalyticsTableColumn({
           key: def.key,
           title: def.title,
           description: def.description,
           required: true,
+          ...(isEngagementAggregate && { defaultValue: 0 }),
           type: def.type,
-          codec: isWiderThan64Bits
+          codec: isPlainZstd
             ? { codec: "ZSTD", level: 1 }
             : [{ codec: "T64" }, { codec: "ZSTD", level: 1 }],
           accessControl: sessionAccessControl,
@@ -455,11 +517,21 @@ export default class RumSession extends AnalyticsBaseModel {
         title: string;
         description: string;
       }): AnalyticsTableColumn => {
+        /*
+         * The engagement counters were added by ADD COLUMN after the table
+         * shipped; an explicit 0 default makes every pre-existing row and
+         * every older-recorder header read as "no clicks counted" rather
+         * than failing the insert.
+         */
+        const isEngagementCounter: boolean =
+          def.key === "clickCount" || def.key === "customEventCount";
+
         return new AnalyticsTableColumn({
           key: def.key,
           title: def.title,
           description: def.description,
           required: true,
+          ...(isEngagementCounter && { defaultValue: 0 }),
           type: TableColumnType.Number,
           codec: [{ codec: "T64" }, { codec: "ZSTD", level: 1 }],
           accessControl: sessionAccessControl,
@@ -651,6 +723,48 @@ export default class RumSession extends AnalyticsBaseModel {
         accessControl: identityAccessControl,
       });
 
+    /*
+     * Traits the host page attached through identify(ref, traits): plan,
+     * role, tenant. They describe the PERSON, so they sit under the same
+     * narrow identity ACL as identifiedUserLabel and are only written when
+     * the application has user-identity capture on - a separate column
+     * rather than entries in `attributes` precisely so the wider session
+     * ACL can never read them. Capped at SESSION_REPLAY_MAX_TRAIT_KEYS
+     * entries on both sides of the wire. No mapKeysColumn: the only reader
+     * is the bespoke argMax endpoint, which never filters on trait keys.
+     */
+    const identifiedUserTraitsColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "identifiedUserTraits",
+        title: "Identified User Traits",
+        description:
+          "Traits supplied by identify(); only populated when user-identity capture is on, and readable under the same narrower ACL as identifiedUserLabel.",
+        required: true,
+        defaultValue: {},
+        type: TableColumnType.MapStringString,
+        codec: { codec: "ZSTD", level: 3 },
+        accessControl: identityAccessControl,
+      });
+
+    /*
+     * Per-session tags from setTags()/addTag(): build id, experiment arm,
+     * customer tier. They describe the SESSION, not the person, so they
+     * live under the ordinary session ACL and back the list's
+     * tag:key=value search (a HAVING predicate over argMax, hence no skip
+     * index and no mapKeysColumn). Capped at SESSION_REPLAY_MAX_TAG_KEYS.
+     */
+    const tagsColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "tags",
+      title: "Tags",
+      description:
+        "Session tags supplied by the host page through setTags()/addTag(); searchable from the session list",
+      required: true,
+      defaultValue: {},
+      type: TableColumnType.MapStringString,
+      codec: { codec: "ZSTD", level: 3 },
+      accessControl: sessionAccessControl,
+    });
+
     /*
      * Reverse-direction correlation. Populated by the finalizer from a
      * single GROUP BY, never incrementally — an incremental array append
@@ -900,6 +1014,8 @@ export default class RumSession extends AnalyticsBaseModel {
         countryCodeColumn,
         identifiedUserKeyColumn,
         identifiedUserLabelColumn,
+        identifiedUserTraitsColumn,
+        tagsColumn,
         ...correlationArrayColumns,
         fidelityNoticesColumn,
         fullSnapshotChunkIndexesColumn,

package/Models/AnalyticsModels/RumSessionChunk.ts

@@ -438,12 +438,25 @@ export default class RumSessionChunk extends AnalyticsBaseModel {
       "errorClickCount",
       "refreshRageCount",
       "routeCount",
+      /*
+       * Engagement counters, added after the table shipped. Optional on
+       * the wire (SessionReplaySignalCounts) and read as 0 when absent, so
+       * they carry an explicit 0 default here: a row from an older
+       * recorder and a row that predates the column both mean "no clicks
+       * counted", and the manifest reports them only when measured.
+       */
+      "clickCount",
+      "customEventCount",
     ].map((key: string): AnalyticsTableColumn => {
+      const isEngagementCounter: boolean =
+        key === "clickCount" || key === "customEventCount";
+
       return new AnalyticsTableColumn({
         key: key,
         title: key,
         description: `Per-chunk ${key}, summed into the session header by the finalizer`,
         required: true,
+        ...(isEngagementCounter && { defaultValue: 0 }),
         type: TableColumnType.Number,
         codec: [{ codec: "T64" }, { codec: "ZSTD", level: 1 }],
         accessControl: chunkAccessControl,

package/Models/DatabaseModels/AlertCustomField.ts

@@ -3,6 +3,7 @@ import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+import CustomFieldMappingSourceResource from "../../Types/CustomField/CustomFieldMappingSourceResource";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -273,7 +274,7 @@ export default class AlertCustomField extends BaseModel {
   })
   @TableColumn({
     required: false,
-    type: TableColumnType.LongText,
+    type: TableColumnType.VeryLongText,
     title: "Dropdown Options",
     description:
       "Options and optional colors for dropdown fields. Plain one-per-line values remain supported.",
@@ -281,11 +282,84 @@ export default class AlertCustomField extends BaseModel {
   })
   @Column({
     nullable: true,
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
+    type: ColumnType.VeryLongText,
   })
   public dropdownOptions?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateAlertCustomField,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.AlertAdmin,
+      Permission.AlertMember,
+      Permission.AlertViewer,
+      Permission.ReadAlertCustomField,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditAlertCustomField,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Map Value From",
+    description:
+      "Related resource this field copies its value from. Empty means values are entered by hand.",
+    example: "Monitor",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public mapFromResourceType?: CustomFieldMappingSourceResource = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateAlertCustomField,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.AlertAdmin,
+      Permission.AlertMember,
+      Permission.AlertViewer,
+      Permission.ReadAlertCustomField,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditAlertCustomField,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Map Value From Field",
+    description:
+      "Name of the custom field on the related resource this field copies its value from.",
+    example: "Vendor",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public mapFromCustomFieldName?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/ApiKeyPermission.ts

@@ -42,7 +42,6 @@ import {
   create: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
-    Permission.CreateProjectApiKey,
     Permission.EditProjectApiKeyPermissions,
   ],
   read: [
@@ -60,7 +59,6 @@ import {
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.EditProjectApiKeyPermissions,
-    Permission.EditProjectApiKey,
   ],
 })
 @EnableWorkflow({
@@ -86,7 +84,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -126,7 +123,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -155,7 +151,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -191,7 +186,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -218,11 +212,7 @@ export default class APIKeyPermission extends BaseModel {
   public projectId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
-    ],
+    create: [Permission.ProjectOwner, Permission.ProjectAdmin],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -254,11 +244,7 @@ export default class APIKeyPermission extends BaseModel {
   public createdByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
-    ],
+    create: [Permission.ProjectOwner, Permission.ProjectAdmin],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -281,11 +267,7 @@ export default class APIKeyPermission extends BaseModel {
   public createdByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
-    ],
+    create: [Permission.ProjectOwner, Permission.ProjectAdmin],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -340,7 +322,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -352,7 +333,6 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.EditProjectApiKeyPermissions,
-      Permission.EditProjectApiKey,
     ],
   })
   @TableColumn({
@@ -375,7 +355,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -387,7 +366,6 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.EditProjectApiKeyPermissions,
-      Permission.EditProjectApiKey,
     ],
   })
   @TableColumn({
@@ -421,7 +399,6 @@ export default class APIKeyPermission extends BaseModel {
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
-      Permission.CreateProjectApiKey,
       Permission.EditProjectApiKeyPermissions,
     ],
     read: [
@@ -433,7 +410,6 @@ export default class APIKeyPermission extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.EditProjectApiKeyPermissions,
-      Permission.EditProjectApiKey,
     ],
   })
   @TableColumn({

package/Models/DatabaseModels/IncidentCustomField.ts

@@ -3,6 +3,7 @@ import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+import CustomFieldMappingSourceResource from "../../Types/CustomField/CustomFieldMappingSourceResource";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -273,7 +274,7 @@ export default class IncidentCustomField extends BaseModel {
   })
   @TableColumn({
     required: false,
-    type: TableColumnType.LongText,
+    type: TableColumnType.VeryLongText,
     title: "Dropdown Options",
     description:
       "Options and optional colors for dropdown fields. Plain one-per-line values remain supported.",
@@ -281,11 +282,84 @@ export default class IncidentCustomField extends BaseModel {
   })
   @Column({
     nullable: true,
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
+    type: ColumnType.VeryLongText,
   })
   public dropdownOptions?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateIncidentCustomField,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.IncidentAdmin,
+      Permission.IncidentMember,
+      Permission.IncidentViewer,
+      Permission.ReadIncidentCustomField,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditIncidentCustomField,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Map Value From",
+    description:
+      "Related resource this field copies its value from. Empty means values are entered by hand.",
+    example: "Monitor",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public mapFromResourceType?: CustomFieldMappingSourceResource = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateIncidentCustomField,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.IncidentAdmin,
+      Permission.IncidentMember,
+      Permission.IncidentViewer,
+      Permission.ReadIncidentCustomField,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditIncidentCustomField,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Map Value From Field",
+    description:
+      "Name of the custom field on the related resource this field copies its value from.",
+    example: "Vendor",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public mapFromCustomFieldName?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/InventoryItemCustomField.ts

@@ -3,6 +3,7 @@ import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+import CustomFieldMappingSourceResource from "../../Types/CustomField/CustomFieldMappingSourceResource";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -282,7 +283,7 @@ export default class InventoryItemCustomField extends BaseModel {
   })
   @TableColumn({
     required: false,
-    type: TableColumnType.LongText,
+    type: TableColumnType.VeryLongText,
     title: "Dropdown Options",
     description:
       "Options and optional colors for dropdown fields. Plain one-per-line values remain supported.",
@@ -290,11 +291,84 @@ export default class InventoryItemCustomField extends BaseModel {
   })
   @Column({
     nullable: true,
-    type: ColumnType.LongText,
-    length: ColumnLength.LongText,
+    type: ColumnType.VeryLongText,
   })
   public dropdownOptions?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateTelemetryService,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.TelemetryAdmin,
+      Permission.TelemetryMember,
+      Permission.TelemetryViewer,
+      Permission.ReadTelemetryService,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditTelemetryService,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Map Value From",
+    description:
+      "Related resource this field copies its value from. Empty means values are entered by hand.",
+    example: "Monitor",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public mapFromResourceType?: CustomFieldMappingSourceResource = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateTelemetryService,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.TelemetryAdmin,
+      Permission.TelemetryMember,
+      Permission.TelemetryViewer,
+      Permission.ReadTelemetryService,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditTelemetryService,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Map Value From Field",
+    description:
+      "Name of the custom field on the related resource this field copies its value from.",
+    example: "Vendor",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public mapFromCustomFieldName?: string = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,