@oneuptime/common 10.4.13 → 10.4.14

package/Models/DatabaseModels/Alert.ts

@@ -114,6 +114,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
     delete: true,
   },
 })
+@Index(["projectId", "currentAlertStateId"]) // Active-alert counters on dashboard
 export default class Alert extends BaseModel {
   @ColumnAccessControl({
     create: [
@@ -484,6 +485,7 @@ export default class Alert extends BaseModel {
       Permission.EditAlert,
     ],
   })
+  @Index()
   @TableColumn({
     type: TableColumnType.ObjectID,
     title: "Monitor ID",

package/Models/DatabaseModels/AlertFeed.ts

@@ -91,6 +91,7 @@ export enum AlertFeedEventType {
   tableDescription:
     "Log of the entire alert state change. This is a log of all the alert state changes, public notes, more etc.",
 })
+@Index(["alertId", "postedAt"]) // Alert detail page: feed sorted by postedAt
 export default class AlertFeed extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/CallLog.ts

@@ -61,6 +61,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   tableDescription:
     "Logs of all the Call sent out to all users and subscribers for this project.",
 })
+@Index(["projectId", "createdAt"]) // Notification logs table: time-range filter per project
+@Index(["projectId", "status"]) // Notification logs table: status filter per project
 export default class CallLog extends BaseModel {
   @ColumnAccessControl({
     create: [],

package/Models/DatabaseModels/DockerHost.ts

@@ -358,6 +358,40 @@ export default class DockerHost extends BaseModel {
   })
   public otelCollectorStatus?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadDockerHost,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditDockerHost,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Agent Version",
+    description:
+      "Version of the OneUptime Docker agent reporting telemetry, as self-reported via the oneuptime.agent.version resource attribute",
+    example: "1.0.0",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public agentVersion?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/EmailLog.ts

@@ -62,6 +62,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   tableDescription:
     "Logs of all the Email sent out to all users and subscribers for this project.",
 })
+@Index(["projectId", "createdAt"]) // Notification logs table: time-range filter per project
+@Index(["projectId", "status"]) // Notification logs table: status filter per project
 export default class EmailLog extends BaseModel {
   @ColumnAccessControl({
     create: [],

package/Models/DatabaseModels/Host.ts

@@ -360,6 +360,40 @@ export default class Host extends BaseModel {
   })
   public otelCollectorStatus?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadHost,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditHost,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Agent Version",
+    description:
+      "Version of the OneUptime agent reporting telemetry on this host, as self-reported via the oneuptime.agent.version resource attribute",
+    example: "1.0.0",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public agentVersion?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/Incident.ts

@@ -118,6 +118,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
     delete: true,
   },
 })
+@Index(["projectId", "currentIncidentStateId"]) // Active-incident counters on dashboard
 export default class Incident extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/IncidentFeed.ts

@@ -91,6 +91,7 @@ export enum IncidentFeedEventType {
   tableDescription:
     "Log of the entire incident state change. This is a log of all the incident state changes, public notes, more etc.",
 })
+@Index(["incidentId", "postedAt"]) // Incident detail page: feed sorted by postedAt
 export default class IncidentFeed extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/KubernetesCluster.ts

@@ -410,6 +410,40 @@ export default class KubernetesCluster extends BaseModel {
   })
   public otelCollectorStatus?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadKubernetesCluster,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditKubernetesCluster,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Agent Version",
+    description:
+      "Version of the OneUptime Kubernetes agent reporting telemetry, as self-reported via the oneuptime.agent.version resource attribute",
+    example: "1.0.0",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public agentVersion?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/MonitorFeed.ts

@@ -80,6 +80,7 @@ export enum MonitorFeedEventType {
   tableDescription:
     "Log of the entire monitor state change. This is a log of all the monitor state changes, public notes, more etc.",
 })
+@Index(["monitorId", "postedAt"]) // Monitor detail page: feed sorted by postedAt
 export default class MonitorFeed extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/MonitorProbe.ts

@@ -27,6 +27,7 @@ export type MonitorStepProbeResponse = Dictionary<ProbeMonitorResponse>;
 @TenantColumn("projectId")
 @Index(["monitorId", "probeId"]) // Composite index for efficient monitor-probe relationship queries
 @Index(["monitorId", "projectId"]) // Alternative index for monitor queries within project
+@Index(["probeId", "isEnabled", "nextPingAt"]) // Scheduler hot path: pick due probes per probeId
 @TableAccessControl({
   create: [
     Permission.ProjectOwner,

package/Models/DatabaseModels/OnCallDutyPolicyTimeLog.ts

@@ -483,6 +483,7 @@ export default class OnCallDutyPolicyTimeLog extends BaseModel {
     ],
     update: [],
   })
+  @Index()
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
@@ -497,6 +498,7 @@ export default class OnCallDutyPolicyTimeLog extends BaseModel {
   })
   public userId?: ObjectID = undefined;
 
+  @Index()
   @TableColumn({
     title: "Start At",
     type: TableColumnType.Date,
@@ -530,6 +532,7 @@ export default class OnCallDutyPolicyTimeLog extends BaseModel {
   })
   public startsAt?: Date = undefined;
 
+  @Index()
   @TableColumn({
     title: "Ends At",
     type: TableColumnType.Date,

package/Models/DatabaseModels/SmsLog.ts

@@ -61,6 +61,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   tableDescription:
     "Logs of all the SMS sent out to all users and subscribers for this project.",
 })
+@Index(["projectId", "createdAt"]) // Notification logs table: time-range filter per project
+@Index(["projectId", "status"]) // Notification logs table: status filter per project
 export default class SmsLog extends BaseModel {
   @ColumnAccessControl({
     create: [],

package/Models/DatabaseModels/StatusPageSubscriber.ts

@@ -94,6 +94,8 @@ import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType";
 @Entity({
   name: "StatusPageSubscriber",
 })
+@Index(["statusPageId", "subscriberEmail"]) // Dedupe lookup on email subscribe
+@Index(["statusPageId", "subscriberPhone"]) // Dedupe lookup on phone subscribe
 export default class StatusPageSubscriber extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/TelemetryException.ts

@@ -62,6 +62,7 @@ import Service from "./Service";
 @Entity({
   name: "TelemetryException",
 })
+@Index(["projectId", "isResolved", "isArchived"]) // Exceptions dashboard counts/filters
 export default class TelemetryException extends DatabaseBaseModel {
   @ColumnAccessControl({
     create: [
@@ -1096,6 +1097,7 @@ export default class TelemetryException extends DatabaseBaseModel {
       Permission.EditTelemetryException,
     ],
   })
+  @Index()
   @TableColumn({
     title: "Occurances",
     description: "Number of times this exception has occurred",

package/Models/DatabaseModels/UserOnCallLog.ts

@@ -536,6 +536,7 @@ export default class UserOnCallLog extends BaseModel {
     read: [Permission.CurrentUser],
     update: [],
   })
+  @Index()
   @TableColumn({
     required: true,
     type: TableColumnType.ShortText,

package/Models/DatabaseModels/WorkflowLog.ts

@@ -60,6 +60,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   icon: IconProp.Logs,
   tableDescription: "Logs of the workflows executed",
 })
+@Index(["workflowStatus", "createdAt"]) // Worker sweep for scheduled/timed-out runs
 export default class WorkflowLog extends BaseModel {
   @ColumnAccessControl({
     create: [],

package/Server/API/ProjectAPI.ts

@@ -5,6 +5,7 @@ import ProjectService, {
 } from "../Services/ProjectService";
 import ResellerService from "../Services/ResellerService";
 import TeamMemberService from "../Services/TeamMemberService";
+import QueryHelper from "../Types/Database/QueryHelper";
 import Select from "../Types/Database/Select";
 import {
   ExpressRequest,
@@ -223,25 +224,61 @@ export default class ProjectAPI extends BaseAPI<Project, ProjectServiceType> {
             }
           }
 
-          // get reseller for each project.
+          /*
+           * Batch-fetch resellers for every project in one query instead of
+           * one findOneById per project.
+           */
+          const resellerIds: Array<ObjectID> = [];
+          const seenResellerIds: Set<string> = new Set<string>();
           for (const project of projects) {
-            if (project.resellerId) {
-              const reseller: Reseller | null =
-                await ResellerService.findOneById({
-                  id: project.resellerId,
-                  select: {
-                    enableTelemetryFeatures: true,
-                  },
-                  props: {
-                    isRoot: true,
-                  },
-                });
+            if (
+              project.resellerId &&
+              !seenResellerIds.has(project.resellerId.toString())
+            ) {
+              seenResellerIds.add(project.resellerId.toString());
+              resellerIds.push(project.resellerId);
+            }
+          }
 
-              if (!reseller) {
-                continue;
+          if (resellerIds.length > 0) {
+            const resellers: Array<Reseller> = await ResellerService.findBy({
+              query: {
+                _id: QueryHelper.any(
+                  resellerIds.map((id: ObjectID) => {
+                    return id.toString();
+                  }),
+                ),
+              },
+              select: {
+                _id: true,
+                enableTelemetryFeatures: true,
+              },
+              limit: LIMIT_PER_PROJECT,
+              skip: 0,
+              props: {
+                isRoot: true,
+              },
+            });
+
+            const resellersById: Map<string, Reseller> = new Map<
+              string,
+              Reseller
+            >();
+            for (const reseller of resellers) {
+              if (reseller._id) {
+                resellersById.set(reseller._id.toString(), reseller);
               }
+            }
 
-              project.reseller = reseller;
+            for (const project of projects) {
+              if (project.resellerId) {
+                const reseller: Reseller | undefined = resellersById.get(
+                  project.resellerId.toString(),
+                );
+                if (reseller) {
+                  project.reseller = reseller;
+                }
+              }
             }
           }
 

package/Server/EnvironmentConfig.ts

@@ -145,6 +145,75 @@ export const ShouldDatabaseSslEnable: boolean = Boolean(
   DatabaseSslCa || (DatabaseSslCert && DatabaseSslKey),
 );
 
+/*
+ * Postgres pool size per API/Worker node. TypeORM's default is 10 which
+ * starves the API under any meaningful load — pick a number that, when
+ * multiplied by the number of running Node processes, stays under the
+ * Postgres server's `max_connections` (default 100 on a stock cluster).
+ */
+export const MaxPostgresConnections: number = parseInt(
+  process.env["DATABASE_MAX_OPEN_CONNECTIONS"] || "50",
+  10,
+);
+
+/*
+ * Postgres-side statement timeout (ms). Caps the wall-clock time of any
+ * single SQL statement. Without this, a single runaway query can pin a
+ * connection forever and starve the pool.
+ */
+export const PostgresStatementTimeoutMs: number = parseInt(
+  process.env["DATABASE_STATEMENT_TIMEOUT_MS"] || "30000",
+  10,
+);
+
+/*
+ * Node-postgres client-side query timeout (ms). Belt-and-braces for the
+ * server-side statement_timeout — fires even if the connection has gone
+ * silent or the server-side timeout doesn't kick in.
+ */
+export const PostgresQueryTimeoutMs: number = parseInt(
+  process.env["DATABASE_QUERY_TIMEOUT_MS"] || "30000",
+  10,
+);
+
+/*
+ * Postgres-side idle-in-transaction timeout (ms). Kills connections that
+ * are stuck holding row locks inside a BEGIN without committing.
+ */
+export const PostgresIdleInTransactionTimeoutMs: number = parseInt(
+  process.env["DATABASE_IDLE_IN_TRANSACTION_TIMEOUT_MS"] || "60000",
+  10,
+);
+
+/*
+ * pg-pool acquire timeout (ms). How long a query waits for a free
+ * connection before failing. Without this, requests pile up invisibly
+ * when the pool is exhausted.
+ */
+export const PostgresConnectionAcquireTimeoutMs: number = parseInt(
+  process.env["DATABASE_CONNECTION_TIMEOUT_MS"] || "5000",
+  10,
+);
+
+/*
+ * pg-pool idle connection timeout (ms). Closes connections that have
+ * been sitting unused for this long, freeing server-side slots.
+ */
+export const PostgresIdleTimeoutMs: number = parseInt(
+  process.env["DATABASE_IDLE_TIMEOUT_MS"] || "30000",
+  10,
+);
+
+/*
+ * TypeORM slow-query log threshold (ms). Any query exceeding this is
+ * logged so we can find offenders in production without per-query
+ * tracing. Set to 0 to disable.
+ */
+export const PostgresSlowQueryLogThresholdMs: number = parseInt(
+  process.env["DATABASE_SLOW_QUERY_LOG_THRESHOLD_MS"] || "1000",
+  10,
+);
+
 export const EncryptionSecret: ObjectID = new ObjectID(
   process.env["ENCRYPTION_SECRET"] || "secret",
 );

package/Server/Infrastructure/Postgres/DataSourceOptions.ts

@@ -8,6 +8,13 @@ import {
   DatabaseSslCert,
   DatabaseSslKey,
   DatabaseUsername,
+  MaxPostgresConnections,
+  PostgresConnectionAcquireTimeoutMs,
+  PostgresIdleInTransactionTimeoutMs,
+  PostgresIdleTimeoutMs,
+  PostgresQueryTimeoutMs,
+  PostgresSlowQueryLogThresholdMs,
+  PostgresStatementTimeoutMs,
   ShouldDatabaseSslEnable,
 } from "../../../Server/EnvironmentConfig";
 import Migrations from "./SchemaMigrations/Index";
@@ -35,7 +42,25 @@ const dataSourceOptions: DataSourceOptions = {
         cert: DatabaseSslCert,
       }
     : false,
-  // logging: 'all',
+  /*
+   * Anything in `extra` is forwarded to the underlying node-postgres pool
+   * and client. Pool sizing + timeouts live here because TypeORM's defaults
+   * (10 connections, no timeouts) are too small for any non-trivial load.
+   */
+  extra: {
+    max: MaxPostgresConnections,
+    idleTimeoutMillis: PostgresIdleTimeoutMs,
+    connectionTimeoutMillis: PostgresConnectionAcquireTimeoutMs,
+    statement_timeout: PostgresStatementTimeoutMs,
+    query_timeout: PostgresQueryTimeoutMs,
+    idle_in_transaction_session_timeout: PostgresIdleInTransactionTimeoutMs,
+  },
+  /*
+   * Log any query slower than the configured threshold so we can find
+   * offenders in production. TypeORM emits these via the configured
+   * logger; the default `advanced-console` logger writes to stdout.
+   */
+  maxQueryExecutionTime: PostgresSlowQueryLogThresholdMs,
   synchronize: false,
 };
 

package/Server/Infrastructure/Postgres/SchemaMigrations/1779392865146-AddAgentVersionToKubernetesDockerHost.ts

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddAgentVersionToKubernetesDockerHost1779392865146
+  implements MigrationInterface
+{
+  name = "AddAgentVersionToKubernetesDockerHost1779392865146";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "KubernetesCluster" ADD "agentVersion" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD "agentVersion" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Host" ADD "agentVersion" character varying(100)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "Host" DROP COLUMN "agentVersion"`);
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP COLUMN "agentVersion"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "KubernetesCluster" DROP COLUMN "agentVersion"`,
+    );
+  }
+}