@oneuptime/common 11.7.2 → 11.7.4

package/Models/AnalyticsModels/KubernetesCostAllocation.ts

@@ -348,6 +348,12 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
           title: "CPU Core Usage Average",
           description: "Average CPU cores actually used over the window.",
         },
+        {
+          key: "cpuCoreLimitAverage",
+          title: "CPU Core Limit Average",
+          description:
+            "Average CPU core limit over the window. 0 when no limit is set — which is also what a row ingested before this column reads back.",
+        },
         {
           key: "cpuCost",
           title: "CPU Cost",
@@ -378,6 +384,18 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
           title: "RAM Bytes Usage Average",
           description: "Average RAM bytes actually used over the window.",
         },
+        {
+          key: "ramBytesLimitAverage",
+          title: "RAM Bytes Limit Average",
+          description:
+            "Average RAM byte limit over the window. 0 when no limit is set — which is also what a row ingested before this column reads back.",
+        },
+        {
+          key: "ramBytesUsageMax",
+          title: "RAM Bytes Usage Max",
+          description:
+            "Peak RAM bytes used during the window, from Prometheus rather than the cost engine — the engine only reports averages, and an hourly mean hides the burst that OOMKills a container. 0 when the agent has no Prometheus configured, when the scrape had no data, or on rows ingested before this column; treat 0 as 'unknown', never as a real peak.",
+        },
         {
           key: "ramCost",
           title: "RAM Cost",
@@ -472,6 +490,49 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
       },
     });
 
+    /*
+     * Delivery bookkeeping, not workload data. A window wider than the
+     * agent's batch size arrives as several independent ingest jobs, so the
+     * ingest service needs to tell "another chunk of the delivery I am
+     * already ingesting" (accept) from "a window a previous delivery already
+     * ingested" (drop, or a restarted agent double-counts spend). shipmentId
+     * is the agent's content hash of the window — identical across restarts,
+     * different when the engine's answer for that window changed.
+     *
+     * Empty / 0 on rows written before these columns existed and on rows
+     * from agents older than the shipment contract; the ingest service falls
+     * back to the whole-window guard for those.
+     */
+    const shipmentIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "shipmentId",
+      title: "Shipment ID",
+      description:
+        "Content hash identifying the agent delivery this row arrived in. Used to deduplicate re-shipped windows; empty for rows ingested before the shipment contract.",
+      required: true,
+      defaultValue: "",
+      type: TableColumnType.Text,
+      accessControl: {
+        read: readPermissions,
+        create: createPermissions,
+        update: [],
+      },
+    });
+
+    const shipmentChunkColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "shipmentChunk",
+      title: "Shipment Chunk",
+      description:
+        "Index of the request within its shipment that carried this row. 0 for single-request shipments and for rows ingested before the shipment contract.",
+      required: true,
+      defaultValue: 0,
+      type: TableColumnType.Number,
+      accessControl: {
+        read: readPermissions,
+        create: createPermissions,
+        update: [],
+      },
+    });
+
     const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "retentionDate",
       codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
@@ -517,6 +578,8 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
         labelKeysColumn,
         ...measureColumns,
         currencyColumn,
+        shipmentIdColumn,
+        shipmentChunkColumn,
         retentionDateColumn,
       ],
       sortKeys: [
@@ -688,6 +751,14 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
     this.setColumnValue("cpuCoreUsageAverage", v);
   }
 
+  public get cpuCoreLimitAverage(): number | undefined {
+    return this.getColumnValue("cpuCoreLimitAverage") as number | undefined;
+  }
+
+  public set cpuCoreLimitAverage(v: number | undefined) {
+    this.setColumnValue("cpuCoreLimitAverage", v);
+  }
+
   public get cpuCost(): number | undefined {
     return this.getColumnValue("cpuCost") as number | undefined;
   }
@@ -736,6 +807,22 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
     this.setColumnValue("ramBytesUsageAverage", v);
   }
 
+  public get ramBytesLimitAverage(): number | undefined {
+    return this.getColumnValue("ramBytesLimitAverage") as number | undefined;
+  }
+
+  public set ramBytesLimitAverage(v: number | undefined) {
+    this.setColumnValue("ramBytesLimitAverage", v);
+  }
+
+  public get ramBytesUsageMax(): number | undefined {
+    return this.getColumnValue("ramBytesUsageMax") as number | undefined;
+  }
+
+  public set ramBytesUsageMax(v: number | undefined) {
+    this.setColumnValue("ramBytesUsageMax", v);
+  }
+
   public get ramCost(): number | undefined {
     return this.getColumnValue("ramCost") as number | undefined;
   }
@@ -832,6 +919,22 @@ export default class KubernetesCostAllocation extends AnalyticsBaseModel {
     this.setColumnValue("currency", v);
   }
 
+  public get shipmentId(): string | undefined {
+    return this.getColumnValue("shipmentId") as string | undefined;
+  }
+
+  public set shipmentId(v: string | undefined) {
+    this.setColumnValue("shipmentId", v);
+  }
+
+  public get shipmentChunk(): number | undefined {
+    return this.getColumnValue("shipmentChunk") as number | undefined;
+  }
+
+  public set shipmentChunk(v: number | undefined) {
+    this.setColumnValue("shipmentChunk", v);
+  }
+
   public get retentionDate(): Date | undefined {
     return this.getColumnValue("retentionDate") as Date | undefined;
   }

package/Models/DatabaseModels/AlertEpisodeStateTimeline.ts

@@ -401,6 +401,7 @@ export default class AlertEpisodeStateTimeline extends BaseModel {
     {
       eager: false,
       nullable: true,
+      onDelete: "CASCADE",
       orphanedRowAction: "nullify",
     },
   )

package/Models/DatabaseModels/AlertStateTimeline.ts

@@ -414,6 +414,7 @@ export default class AlertStateTimeline extends BaseModel {
     {
       eager: false,
       nullable: true,
+      onDelete: "CASCADE",
       orphanedRowAction: "nullify",
     },
   )

package/Models/DatabaseModels/IncidentEpisodeStateTimeline.ts

@@ -403,6 +403,7 @@ export default class IncidentEpisodeStateTimeline extends BaseModel {
     {
       eager: false,
       nullable: true,
+      onDelete: "CASCADE",
       orphanedRowAction: "nullify",
     },
   )

package/Models/DatabaseModels/IncidentStateTimeline.ts

@@ -417,6 +417,7 @@ export default class IncidentStateTimeline extends BaseModel {
     {
       eager: false,
       nullable: true,
+      onDelete: "CASCADE",
       orphanedRowAction: "nullify",
     },
   )

package/Models/DatabaseModels/Index.ts

@@ -204,6 +204,9 @@ import EnterpriseLicenseInstance from "./EnterpriseLicenseInstance";
 import OpenSourceDeployment from "./OpenSourceDeployment";
 import Reseller from "./Reseller";
 import ResellerPlan from "./ResellerPlan";
+
+import RecommendationDismissal from "./RecommendationDismissal";
+
 // ScheduledMaintenances
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import ScheduledMaintenanceCustomField from "./ScheduledMaintenanceCustomField";
@@ -684,6 +687,8 @@ const AllModelTypes: Array<{
   Reseller,
   ResellerPlan,
 
+  RecommendationDismissal,
+
   PromoCode,
   EnterpriseLicense,
   EnterpriseLicenseInstance,

package/Models/DatabaseModels/LogDropFilter.ts

@@ -398,6 +398,95 @@ export default class LogDropFilter extends BaseModel {
   })
   public sortOrder?: number = undefined;
 
+  /*
+   * Ingest-owned counters. A drop filter used to discard logs with no
+   * record anywhere — no log line, no metric, no counter — so neither the
+   * customer nor support could tell a filter from a broken pipeline. These
+   * two columns are the customer-visible half of that fix (the operator
+   * half is the `oneuptime.telemetry.ingest.dropped.count` metric).
+   *
+   * Written only by the ingest path, via a throttled atomic UPDATE that
+   * batches many dropped records into one statement — never once per log.
+   * See App/FeatureSet/Telemetry/Utils/DropFilterDropRecorder.ts.
+   */
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.TelemetryAdmin,
+      Permission.TelemetryMember,
+      Permission.TelemetryViewer,
+      Permission.ReadProjectLogDropFilter,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Dropped Count",
+    required: false,
+    type: TableColumnType.BigPositiveNumber,
+    canReadOnRelationQuery: true,
+    description:
+      "Total number of logs this filter has discarded since it was created.",
+    defaultValue: 0,
+  })
+  @Column({
+    type: ColumnType.BigPositiveNumber,
+    nullable: false,
+    default: 0,
+    transformer: {
+      to: (value: number | null | undefined): string | null => {
+        if (value === null || value === undefined) {
+          return null;
+        }
+        return Math.trunc(value).toString();
+      },
+      /*
+       * Postgres bigint comes back from the driver as a string. The UI
+       * renders this as a number, so normalize here rather than making
+       * every reader remember.
+       */
+      from: (value: string | null | undefined): number | null => {
+        if (value === null || value === undefined) {
+          return null;
+        }
+        const parsed: number = parseInt(value, 10);
+        return isNaN(parsed) ? null : parsed;
+      },
+    },
+  })
+  public droppedCount?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.TelemetryAdmin,
+      Permission.TelemetryMember,
+      Permission.TelemetryViewer,
+      Permission.ReadProjectLogDropFilter,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    title: "Last Dropped At",
+    required: false,
+    type: TableColumnType.Date,
+    canReadOnRelationQuery: true,
+    description:
+      "When this filter most recently discarded a log. Null means it has never matched anything.",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public lastDroppedAt?: Date = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/NetworkDeviceDiscoveryScan.ts

@@ -77,7 +77,7 @@ export interface DiscoveredNetworkDevice {
   pluralName: "Network Device Discovery Scans",
   icon: IconProp.Search,
   tableDescription:
-    "Subnet discovery scans that sweep a CIDR range via SNMP from a probe and report devices found, so they can be imported as Network Devices.",
+    "Network discovery scans that sweep an address space — a CIDR subnet or an octet range — via SNMP from a probe and report devices found, so they can be imported as Network Devices.",
 })
 @Entity({
   name: "NetworkDeviceDiscoveryScan",
@@ -260,12 +260,22 @@ export default class NetworkDeviceDiscoveryScan extends BaseModel {
     ],
     update: [],
   })
+  /*
+   * The address space this scan sweeps. Two notations are accepted (see
+   * Common/Utils/NetworkDiscovery/ScanTargetUtil): CIDR, and octet ranges
+   * where any octet may be an inclusive low-high range.
+   *
+   * The column keeps the name `cidr` it was created with: it is part of the
+   * public API surface and the probe payload, and renaming it would break both
+   * for a purely cosmetic gain.
+   */
   @TableColumn({
     required: true,
     type: TableColumnType.ShortText,
     canReadOnRelationQuery: true,
-    title: "CIDR",
-    description: "Subnet to scan in CIDR notation, e.g. 192.168.1.0/24",
+    title: "Scan Target",
+    description:
+      "Address space to scan, either in CIDR notation (192.168.1.0/24) or octet-range notation where any octet may be an inclusive low-high range (10.16-22.0-255.51-66)",
     example: "192.168.1.0/24",
   })
   @Column({