@oneuptime/common 10.0.69 → 10.0.70

package/Models/DatabaseModels/KubernetesCluster.ts

@@ -73,6 +73,11 @@ import {
 })
 @CrudApiEndpoint(new Route("/kubernetes-cluster"))
 @SlugifyColumn("name", "slug")
+// Enforce one cluster row per (projectId, clusterIdentifier) at the DB level.
+// Without this, two pods emitting OTel telemetry for a new cluster at the
+// same time (e.g. when the agent is first installed or during a rolling
+// update) race in findOrCreateByClusterIdentifier and create duplicate rows.
+@Index(["projectId", "clusterIdentifier"], { unique: true })
 @TableMetadata({
   tableName: "KubernetesCluster",
   singularName: "Kubernetes Cluster",

package/Server/Infrastructure/Postgres/SchemaMigrations/1776865086264-MigrationName.ts

@@ -1,14 +1,17 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
 export class MigrationName1776865086264 implements MigrationInterface {
-    name = 'MigrationName1776865086264'
+  public name: string = "MigrationName1776865086264";
 
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "KubernetesResource" ADD "containerCount" integer`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "KubernetesResource" DROP COLUMN "containerCount"`);
-    }
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "KubernetesResource" ADD "containerCount" integer`,
+    );
+  }
 
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "KubernetesResource" DROP COLUMN "containerCount"`,
+    );
+  }
 }

package/Server/Infrastructure/Postgres/SchemaMigrations/1776881254913-DedupeKubernetesClustersAndAddUniqueIndex.ts

@@ -0,0 +1,134 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Before this migration, KubernetesCluster had an app-level
+ * @UniqueColumnBy("projectId") check and a non-unique index on
+ * clusterIdentifier, but no DB-level uniqueness. Under concurrent telemetry
+ * from multiple agent pods (happens every time the agent is installed or
+ * rolls out), findOrCreateByClusterIdentifier would race between its find
+ * and its create, and the DB accepted both inserts — producing duplicate
+ * rows with identical (projectId, clusterIdentifier).
+ *
+ * This migration:
+ *   1. Reparents all FKs that reference duplicate clusters — KubernetesResource,
+ *      KubernetesClusterOwnerUser, KubernetesClusterOwnerTeam — onto the
+ *      oldest surviving row in each duplicate group.
+ *   2. Deletes the duplicate (non-survivor) rows.
+ *   3. Creates a DB-level unique index on (projectId, clusterIdentifier) so
+ *      future races are rejected by the DB — the service's existing
+ *      catch-and-refetch in findOrCreateByClusterIdentifier then returns the
+ *      winning row instead of producing a duplicate.
+ *
+ * The auto-generator also picked up unrelated OnCallDutyPolicyScheduleLayer
+ * default-value drift. That's dev-environment drift, not the bug we're fixing;
+ * stripped from this migration.
+ */
+export class DedupeKubernetesClustersAndAddUniqueIndex1776881254913
+  implements MigrationInterface
+{
+  public name: string = "DedupeKubernetesClustersAndAddUniqueIndex1776881254913";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // 1: reparent KubernetesResource FKs from duplicates -> survivor.
+    await queryRunner.query(`
+      WITH survivors AS (
+        SELECT DISTINCT ON ("projectId", "clusterIdentifier")
+          _id AS survivor_id,
+          "projectId",
+          "clusterIdentifier"
+        FROM "KubernetesCluster"
+        ORDER BY "projectId", "clusterIdentifier", "createdAt" ASC, _id ASC
+      ),
+      losers AS (
+        SELECT kc._id AS loser_id, s.survivor_id
+        FROM "KubernetesCluster" kc
+        JOIN survivors s
+          ON s."projectId" = kc."projectId"
+         AND s."clusterIdentifier" = kc."clusterIdentifier"
+        WHERE kc._id <> s.survivor_id
+      )
+      UPDATE "KubernetesResource" kr
+      SET "kubernetesClusterId" = l.survivor_id
+      FROM losers l
+      WHERE kr."kubernetesClusterId" = l.loser_id;
+    `);
+
+    // 2: reparent KubernetesClusterOwnerUser FKs.
+    await queryRunner.query(`
+      WITH survivors AS (
+        SELECT DISTINCT ON ("projectId", "clusterIdentifier")
+          _id AS survivor_id,
+          "projectId",
+          "clusterIdentifier"
+        FROM "KubernetesCluster"
+        ORDER BY "projectId", "clusterIdentifier", "createdAt" ASC, _id ASC
+      ),
+      losers AS (
+        SELECT kc._id AS loser_id, s.survivor_id
+        FROM "KubernetesCluster" kc
+        JOIN survivors s
+          ON s."projectId" = kc."projectId"
+         AND s."clusterIdentifier" = kc."clusterIdentifier"
+        WHERE kc._id <> s.survivor_id
+      )
+      UPDATE "KubernetesClusterOwnerUser" o
+      SET "kubernetesClusterId" = l.survivor_id
+      FROM losers l
+      WHERE o."kubernetesClusterId" = l.loser_id;
+    `);
+
+    // 3: reparent KubernetesClusterOwnerTeam FKs.
+    await queryRunner.query(`
+      WITH survivors AS (
+        SELECT DISTINCT ON ("projectId", "clusterIdentifier")
+          _id AS survivor_id,
+          "projectId",
+          "clusterIdentifier"
+        FROM "KubernetesCluster"
+        ORDER BY "projectId", "clusterIdentifier", "createdAt" ASC, _id ASC
+      ),
+      losers AS (
+        SELECT kc._id AS loser_id, s.survivor_id
+        FROM "KubernetesCluster" kc
+        JOIN survivors s
+          ON s."projectId" = kc."projectId"
+         AND s."clusterIdentifier" = kc."clusterIdentifier"
+        WHERE kc._id <> s.survivor_id
+      )
+      UPDATE "KubernetesClusterOwnerTeam" o
+      SET "kubernetesClusterId" = l.survivor_id
+      FROM losers l
+      WHERE o."kubernetesClusterId" = l.loser_id;
+    `);
+
+    // 4: delete duplicate rows now that nothing references them.
+    await queryRunner.query(`
+      WITH survivors AS (
+        SELECT DISTINCT ON ("projectId", "clusterIdentifier")
+          _id AS survivor_id,
+          "projectId",
+          "clusterIdentifier"
+        FROM "KubernetesCluster"
+        ORDER BY "projectId", "clusterIdentifier", "createdAt" ASC, _id ASC
+      )
+      DELETE FROM "KubernetesCluster" kc
+      USING survivors s
+      WHERE s."projectId" = kc."projectId"
+        AND s."clusterIdentifier" = kc."clusterIdentifier"
+        AND kc._id <> s.survivor_id;
+    `);
+
+    // 5: add the DB-level composite unique index.
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_9756988b48848f4f7532a2af0d" ON "KubernetesCluster" ("projectId", "clusterIdentifier") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_9756988b48848f4f7532a2af0d"`,
+    );
+    // Duplicate rows dropped in up() are lost — a down-migration cannot
+    // resurrect them (and reinstating duplicates is not desirable anyway).
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -288,6 +288,7 @@ import { MigrationName1776544084793 } from "./1776544084793-MigrationName";
 import { MigrationName1776761171349 } from "./1776761171349-MigrationName";
 import { MigrationName1776801030808 } from "./1776801030808-MigrationName";
 import { MigrationName1776865086264 } from "./1776865086264-MigrationName";
+import { DedupeKubernetesClustersAndAddUniqueIndex1776881254913 } from "./1776881254913-DedupeKubernetesClustersAndAddUniqueIndex";
 export default [
   InitialMigration,
   MigrationName1717678334852,
@@ -579,4 +580,5 @@ export default [
   MigrationName1776761171349,
   MigrationName1776801030808,
   MigrationName1776865086264,
+  DedupeKubernetesClustersAndAddUniqueIndex1776881254913,
 ];

package/Server/Services/DatabaseService.ts

@@ -69,6 +69,7 @@ import { FindWhere } from "../../Types/BaseDatabase/Query";
 import Realtime from "../Utils/Realtime";
 import ModelEventType from "../../Types/Realtime/ModelEventType";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import type AuditLogServiceType from "./AuditLogService";
 
 class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
   public modelType!: { new (): TBaseModel };
@@ -782,14 +783,9 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
          * which extend DatabaseService). A top-level import leaves
          * DatabaseService undefined at class-extension time for subclasses.
          */
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const auditLogService: {
-          recordCreate: (data: {
-            model: TBaseModel;
-            createdItem: TBaseModel;
-            props: DatabaseCommonInteractionProps;
-          }) => Promise<void>;
-        } = require("./AuditLogService").default;
+        const auditLogService: typeof AuditLogServiceType =
+          // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+          require("./AuditLogService").default;
         await auditLogService.recordCreate({
           model: this.getModel(),
           createdItem: createBy.data,
@@ -1237,15 +1233,9 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
       }
 
       if (this.getModel().enableAuditLogOn?.delete && items.length > 0) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const auditLogService: {
-          recordDelete: (args: {
-            model: TBaseModel;
-            deletedItem: TBaseModel;
-            itemId: ObjectID;
-            props: DatabaseCommonInteractionProps;
-          }) => Promise<void>;
-        } = require("./AuditLogService").default;
+        const auditLogService: typeof AuditLogServiceType =
+          // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+          require("./AuditLogService").default;
         for (const item of items) {
           if (item.id) {
             await auditLogService.recordDelete({
@@ -1667,16 +1657,9 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
           !this.hasSameValues({ item, updatedItem }) &&
           item.id
         ) {
-          // eslint-disable-next-line @typescript-eslint/no-var-requires
-          const auditLogService: {
-            recordUpdate: (args: {
-              model: TBaseModel;
-              before: TBaseModel;
-              updatedFields: JSONObject;
-              itemId: ObjectID;
-              props: DatabaseCommonInteractionProps;
-            }) => Promise<void>;
-          } = require("./AuditLogService").default;
+          const auditLogService: typeof AuditLogServiceType =
+            // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+            require("./AuditLogService").default;
           await auditLogService.recordUpdate({
             model: this.getModel(),
             before: item,

package/Server/Services/KubernetesResourceService.ts

@@ -113,7 +113,10 @@ function buildDegradedPod(row: {
   const scanForReason: (
     list: Array<Record<string, unknown>>,
     targetState: string,
-  ) => { reason: string; message: string } | null = (list, targetState) => {
+  ) => { reason: string; message: string } | null = (
+    list: Array<Record<string, unknown>>,
+    targetState: string,
+  ) => {
     for (const cs of list) {
       if (cs["state"] !== targetState) {
         continue;
@@ -144,8 +147,10 @@ function buildDegradedPod(row: {
     reason = hit.reason;
     message = hit.message;
   } else {
-    // Fall back to the pod-level reason/message fields set by the scheduler
-    // (e.g. "Unschedulable" with "0/3 nodes are available: ...").
+    /*
+     * Fall back to the pod-level reason/message fields set by the scheduler
+     * (e.g. "Unschedulable" with "0/3 nodes are available: ...").
+     */
     const topReason: unknown = status["reason"];
     const topMessage: unknown = status["message"];
     if (typeof topReason === "string") {
@@ -211,7 +216,9 @@ function buildDegradedNode(row: {
 
   const findCondition: (
     predicate: (c: Record<string, unknown>) => boolean,
-  ) => Record<string, unknown> | null = (predicate) => {
+  ) => Record<string, unknown> | null = (
+    predicate: (c: Record<string, unknown>) => boolean,
+  ) => {
     for (const c of conditions) {
       if (predicate(c)) {
         return c;
@@ -591,12 +598,28 @@ export class Service extends DatabaseService<Model> {
     const containerCount: number =
       parseInt(containerRows[0]?.total || "0", 10) || 0;
 
-    const degradedPods: Array<DegradedPod> = degradedPodRows.map((row) => {
-      return buildDegradedPod(row);
-    });
-    const degradedNodes: Array<DegradedNode> = degradedNodeRows.map((row) => {
-      return buildDegradedNode(row);
-    });
+    const degradedPods: Array<DegradedPod> = degradedPodRows.map(
+      (row: {
+        name: string;
+        namespaceKey: string;
+        phase: string | null;
+        status: unknown;
+      }) => {
+        return buildDegradedPod(row);
+      },
+    );
+    const degradedNodes: Array<DegradedNode> = degradedNodeRows.map(
+      (row: {
+        name: string;
+        isReady: boolean | null;
+        hasMemoryPressure: boolean | null;
+        hasDiskPressure: boolean | null;
+        hasPidPressure: boolean | null;
+        status: unknown;
+      }) => {
+        return buildDegradedNode(row);
+      },
+    );
 
     return {
       countsByKind,

package/Server/Types/Database/QueryHelper.ts

@@ -138,6 +138,48 @@ export default class QueryHelper {
     );
   }
 
+  @CaptureSpan()
+  public static notContains(name: string): FindWhereProperty<any> {
+    name = name.toLowerCase().trim();
+    const rid: string = Text.generateRandomText(10);
+    return Raw(
+      (alias: string) => {
+        return `(CAST(${alias} AS TEXT) NOT ILIKE :${rid} OR ${alias} IS NULL)`;
+      },
+      {
+        [rid]: `%${name}%`,
+      },
+    );
+  }
+
+  @CaptureSpan()
+  public static startsWith(name: string): FindWhereProperty<any> {
+    name = name.toLowerCase().trim();
+    const rid: string = Text.generateRandomText(10);
+    return Raw(
+      (alias: string) => {
+        return `(CAST(${alias} AS TEXT) ILIKE :${rid})`;
+      },
+      {
+        [rid]: `${name}%`,
+      },
+    );
+  }
+
+  @CaptureSpan()
+  public static endsWith(name: string): FindWhereProperty<any> {
+    name = name.toLowerCase().trim();
+    const rid: string = Text.generateRandomText(10);
+    return Raw(
+      (alias: string) => {
+        return `(CAST(${alias} AS TEXT) ILIKE :${rid})`;
+      },
+      {
+        [rid]: `%${name}`,
+      },
+    );
+  }
+
   @CaptureSpan()
   public static all(values: Array<string | ObjectID>): FindWhereProperty<any> {
     values = values.map((value: string | ObjectID) => {
@@ -168,6 +210,91 @@ export default class QueryHelper {
     return this.in(values); // any and in are the same
   }
 
+  /**
+   * Returns a filter that matches owner rows that are linked to *none* of the
+   * provided related entity ids through a many-to-many join table. The
+   * returned FindOperator is intended to be applied to the primary id column
+   * of the owner entity.
+   */
+  @CaptureSpan()
+  public static noneEntitiesInManyToMany(data: {
+    values: Array<string | ObjectID>;
+    joinTableName: string;
+    ownerColumnName: string;
+    relationColumnName: string;
+  }): FindWhereProperty<any> {
+    const values: Array<string> = data.values.map(
+      (value: string | ObjectID) => {
+        return value.toString();
+      },
+    );
+
+    if (!values || values.length === 0) {
+      return Raw(() => {
+        return `TRUE = TRUE`;
+      }, {});
+    }
+
+    const valuesRid: string = Text.generateRandomText(10);
+
+    const joinTable: string = data.joinTableName.replace(/"/g, '""');
+    const ownerCol: string = data.ownerColumnName.replace(/"/g, '""');
+    const relationCol: string = data.relationColumnName.replace(/"/g, '""');
+
+    return Raw(
+      (alias: string) => {
+        return `(${alias} NOT IN (SELECT "${joinTable}"."${ownerCol}" FROM "${joinTable}" WHERE "${joinTable}"."${relationCol}" IN (:...${valuesRid})))`;
+      },
+      {
+        [valuesRid]: values,
+      },
+    );
+  }
+
+  /**
+   * Returns a filter that matches owner rows that are linked to *all* of the
+   * provided related entity ids through a many-to-many join table. The
+   * returned FindOperator is intended to be applied to the primary id column
+   * of the owner entity.
+   */
+  @CaptureSpan()
+  public static allEntitiesInManyToMany(data: {
+    values: Array<string | ObjectID>;
+    joinTableName: string;
+    ownerColumnName: string;
+    relationColumnName: string;
+  }): FindWhereProperty<any> {
+    const values: Array<string> = data.values.map(
+      (value: string | ObjectID) => {
+        return value.toString();
+      },
+    );
+
+    if (!values || values.length === 0) {
+      return Raw(() => {
+        return `TRUE = FALSE`;
+      }, {});
+    }
+
+    const valuesRid: string = Text.generateRandomText(10);
+    const countRid: string = Text.generateRandomText(10);
+
+    // Escape identifiers so they can safely be embedded in the SQL string.
+    const joinTable: string = data.joinTableName.replace(/"/g, '""');
+    const ownerCol: string = data.ownerColumnName.replace(/"/g, '""');
+    const relationCol: string = data.relationColumnName.replace(/"/g, '""');
+
+    return Raw(
+      (alias: string) => {
+        return `(${alias} IN (SELECT "${joinTable}"."${ownerCol}" FROM "${joinTable}" WHERE "${joinTable}"."${relationCol}" IN (:...${valuesRid}) GROUP BY "${joinTable}"."${ownerCol}" HAVING COUNT(DISTINCT "${joinTable}"."${relationCol}") >= :${countRid}))`;
+      },
+      {
+        [valuesRid]: values,
+        [countRid]: values.length,
+      },
+    );
+  }
+
   private static in(
     values: Array<string | ObjectID | number>,
   ): FindWhereProperty<any> {