@oneuptime/common 10.0.55 → 10.0.57

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

@@ -0,0 +1,133 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1775766676723 implements MigrationInterface {
+  public name = "MigrationName1775766676723";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_docker_host_projectId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_docker_host_createdByUserId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_docker_host_deletedByUserId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" DROP CONSTRAINT "FK_docker_host_label_dockerHostId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" DROP CONSTRAINT "FK_docker_host_label_labelId"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."IDX_docker_host_projectId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_docker_host_hostIdentifier"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."IDX_docker_host_slug"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_docker_host_label_dockerHostId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_docker_host_label_labelId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_ae65515f6441c05aa0ed907ddf" ON "DockerHost" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_52de5686db690e506374cd7378" ON "DockerHost" ("hostIdentifier") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_ac05a97602df6aab28ceac1c8d" ON "DockerHostLabel" ("dockerHostId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_e19382fe2b139766b7d0176882" ON "DockerHostLabel" ("labelId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD CONSTRAINT "FK_ae65515f6441c05aa0ed907ddf0" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD CONSTRAINT "FK_a9466fa226aeffe460e9134655a" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD CONSTRAINT "FK_3f59ee567503d580023fd9195be" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" ADD CONSTRAINT "FK_ac05a97602df6aab28ceac1c8d3" FOREIGN KEY ("dockerHostId") REFERENCES "DockerHost"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" ADD CONSTRAINT "FK_e19382fe2b139766b7d01768824" FOREIGN KEY ("labelId") REFERENCES "Label"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" DROP CONSTRAINT "FK_e19382fe2b139766b7d01768824"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" DROP CONSTRAINT "FK_ac05a97602df6aab28ceac1c8d3"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_3f59ee567503d580023fd9195be"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_a9466fa226aeffe460e9134655a"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_ae65515f6441c05aa0ed907ddf0"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_e19382fe2b139766b7d0176882"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_ac05a97602df6aab28ceac1c8d"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_52de5686db690e506374cd7378"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_ae65515f6441c05aa0ed907ddf"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_label_labelId" ON "DockerHostLabel" ("labelId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_label_dockerHostId" ON "DockerHostLabel" ("dockerHostId") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_docker_host_slug" ON "DockerHost" ("slug") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_hostIdentifier" ON "DockerHost" ("hostIdentifier") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_projectId" ON "DockerHost" ("projectId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" ADD CONSTRAINT "FK_docker_host_label_labelId" FOREIGN KEY ("labelId") REFERENCES "Label"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" ADD CONSTRAINT "FK_docker_host_label_dockerHostId" FOREIGN KEY ("dockerHostId") REFERENCES "DockerHost"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD CONSTRAINT "FK_docker_host_deletedByUserId" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD CONSTRAINT "FK_docker_host_createdByUserId" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" ADD CONSTRAINT "FK_docker_host_projectId" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1775900000000-AddGlobalSmtpOAuth.ts

@@ -0,0 +1,51 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddGlobalSmtpOAuth1775900000000 implements MigrationInterface {
+  public name = "AddGlobalSmtpOAuth1775900000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    /*
+     * Add OAuth 2.0 columns to GlobalConfig table so global SMTP can be
+     * authenticated with providers like Microsoft 365 or Google Workspace.
+     */
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpAuthType" character varying(100) DEFAULT 'Username and Password'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpClientId" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpClientSecret" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpTokenUrl" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpScope" character varying(500)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpOAuthProviderType" character varying(100)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpOAuthProviderType"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpScope"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpTokenUrl"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpClientSecret"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpClientId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpAuthType"`,
+    );
+  }
+}

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

@@ -268,6 +268,7 @@ import { MigrationName1773402621107 } from "./1773402621107-MigrationName";
 import { MigrationName1773676206197 } from "./1773676206197-MigrationName";
 import { MigrationName1774000000000 } from "./1774000000000-MigrationName";
 import { MigrationName1774000000001 } from "./1774000000001-MigrationName";
+import { MigrationName1774000000002 } from "./1774000000002-MigrationName";
 import { MigrationName1774355321449 } from "./1774355321449-MigrationName";
 import { MigrationName1774357353502 } from "./1774357353502-MigrationName";
 import { MigrationName1774524742177 } from "./1774524742177-MigrationName";
@@ -277,6 +278,8 @@ import { MigrationName1774559064919 } from "./1774559064919-MigrationName";
 import { MigrationName1774559064920 } from "./1774559064920-MigrationName";
 import { MigrationName1774559064921 } from "./1774559064921-MigrationName";
 import { MigrationName1775735059360 } from "./1775735059360-MigrationName";
+import { MigrationName1775766676723 } from "./1775766676723-MigrationName";
+import { AddGlobalSmtpOAuth1775900000000 } from "./1775900000000-AddGlobalSmtpOAuth";
 
 export default [
   InitialMigration,
@@ -549,6 +552,7 @@ export default [
   MigrationName1773676206197,
   MigrationName1774000000000,
   MigrationName1774000000001,
+  MigrationName1774000000002,
   MigrationName1774355321449,
   MigrationName1774357353502,
   MigrationName1774524742177,
@@ -558,4 +562,6 @@ export default [
   MigrationName1774559064920,
   MigrationName1774559064921,
   MigrationName1775735059360,
+  MigrationName1775766676723,
+  AddGlobalSmtpOAuth1775900000000,
 ];

package/Server/Services/DockerHostService.ts

@@ -0,0 +1,173 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/DockerHost";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import ObjectID from "../../Types/ObjectID";
+import QueryHelper from "../Types/Database/QueryHelper";
+import OneUptimeDate from "../../Types/Date";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import GlobalCache from "../Infrastructure/GlobalCache";
+
+const LAST_SEEN_CACHE_NAMESPACE: string = "docker-host-last-seen";
+const LAST_SEEN_THROTTLE_SECONDS: number = 60;
+
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+  }
+
+  @CaptureSpan()
+  public async findOrCreateByHostIdentifier(data: {
+    projectId: ObjectID;
+    hostIdentifier: string;
+  }): Promise<Model> {
+    // Try to find existing host
+    const existingHost: Model | null = await this.findOneBy({
+      query: {
+        projectId: data.projectId,
+        hostIdentifier: data.hostIdentifier,
+      },
+      select: {
+        _id: true,
+        projectId: true,
+        hostIdentifier: true,
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (existingHost) {
+      return existingHost;
+    }
+
+    try {
+      // Create new host
+      const newHost: Model = new Model();
+      newHost.projectId = data.projectId;
+      newHost.name = data.hostIdentifier;
+      newHost.hostIdentifier = data.hostIdentifier;
+      newHost.otelCollectorStatus = "connected";
+      newHost.lastSeenAt = OneUptimeDate.getCurrentDate();
+
+      const createdHost: Model = await this.create({
+        data: newHost,
+        props: {
+          isRoot: true,
+        },
+      });
+
+      return createdHost;
+    } catch {
+      /*
+       * Race condition: another request created the host concurrently.
+       * Re-fetch the existing host.
+       */
+      const reFetchedHost: Model | null = await this.findOneBy({
+        query: {
+          projectId: data.projectId,
+          hostIdentifier: data.hostIdentifier,
+        },
+        select: {
+          _id: true,
+          projectId: true,
+          hostIdentifier: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (reFetchedHost) {
+        return reFetchedHost;
+      }
+
+      throw new Error(
+        "Failed to create or find Docker host: " + data.hostIdentifier,
+      );
+    }
+  }
+
+  @CaptureSpan()
+  public async updateLastSeen(
+    hostId: ObjectID,
+    extra?: {
+      osType?: string | undefined;
+      osVersion?: string | undefined;
+    },
+  ): Promise<void> {
+    const cacheKey: string = hostId.toString();
+
+    const cached: string | null = await GlobalCache.getString(
+      LAST_SEEN_CACHE_NAMESPACE,
+      cacheKey,
+    );
+
+    if (cached) {
+      return; // another pod already updated recently
+    }
+
+    await GlobalCache.setString(LAST_SEEN_CACHE_NAMESPACE, cacheKey, "1", {
+      expiresInSeconds: LAST_SEEN_THROTTLE_SECONDS,
+    });
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const data: any = {
+      lastSeenAt: OneUptimeDate.getCurrentDate(),
+      otelCollectorStatus: "connected",
+    };
+
+    if (extra?.osType) {
+      data.osType = extra.osType;
+    }
+    if (extra?.osVersion) {
+      data.osVersion = extra.osVersion;
+    }
+
+    await this.updateOneById({
+      id: hostId,
+      data: data,
+      props: {
+        isRoot: true,
+      },
+    });
+  }
+
+  @CaptureSpan()
+  public async markDisconnectedHosts(): Promise<void> {
+    const fiveMinutesAgo: Date = OneUptimeDate.addRemoveMinutes(
+      OneUptimeDate.getCurrentDate(),
+      -5,
+    );
+
+    const connectedHosts: Array<Model> = await this.findBy({
+      query: {
+        otelCollectorStatus: "connected",
+        lastSeenAt: QueryHelper.lessThan(fiveMinutesAgo),
+      },
+      select: {
+        _id: true,
+      },
+      limit: LIMIT_MAX,
+      skip: 0,
+      props: {
+        isRoot: true,
+      },
+    });
+
+    for (const host of connectedHosts) {
+      if (host._id) {
+        await this.updateOneById({
+          id: new ObjectID(host._id.toString()),
+          data: {
+            otelCollectorStatus: "disconnected",
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+      }
+    }
+  }
+}
+
+export default new Service();