@oneuptime/common 10.0.54 → 10.0.56

package/Models/DatabaseModels/GlobalConfig.ts

@@ -10,6 +10,8 @@ import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import Email from "../../Types/Email";
+import OAuthProviderType from "../../Types/Email/OAuthProviderType";
+import SMTPAuthenticationType from "../../Types/Email/SMTPAuthenticationType";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Phone from "../../Types/Phone";
@@ -206,6 +208,116 @@ export default class GlobalConfig extends GlobalConfigModel {
   })
   public smtpFromName?: string = undefined;
 
+  // SMTP OAuth 2.0 Settings.
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "SMTP Authentication Type",
+    description:
+      "The type of authentication to use for this SMTP server. Options: Username and Password, OAuth, or None.",
+    defaultValue: SMTPAuthenticationType.UsernamePassword,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    default: SMTPAuthenticationType.UsernamePassword,
+  })
+  public smtpAuthType?: SMTPAuthenticationType = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "SMTP OAuth Client ID",
+    description:
+      "The Client ID from your OAuth application registration. Required for OAuth authentication.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public smtpClientId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.VeryLongText,
+    title: "SMTP OAuth Client Secret",
+    description:
+      "The Client Secret from your OAuth application registration. Required for OAuth authentication. For Google service accounts, this is the private key from the JSON key file.",
+  })
+  @Column({
+    type: ColumnType.VeryLongText,
+    nullable: true,
+  })
+  public smtpClientSecret?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.LongURL,
+    title: "SMTP OAuth Token URL",
+    description:
+      "The OAuth token endpoint URL. For Microsoft 365: https://login.microsoftonline.com/{tenant-id}/oauth2/v2.0/token. For Google: https://oauth2.googleapis.com/token",
+  })
+  @Column({
+    type: ColumnType.LongURL,
+    nullable: true,
+  })
+  public smtpTokenUrl?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.LongText,
+    title: "SMTP OAuth Scope",
+    description:
+      "The OAuth scope(s) required for SMTP access. For Microsoft 365: https://outlook.office365.com/.default. For Google: https://mail.google.com/",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    nullable: true,
+  })
+  public smtpScope?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "SMTP OAuth Provider Type",
+    description:
+      "The OAuth grant type to use. 'Client Credentials' for Microsoft 365 and most providers. 'JWT Bearer' for Google Workspace service accounts.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+  })
+  public smtpOAuthProviderType?: OAuthProviderType = undefined;
+
   // Twilio config.
 
   @ColumnAccessControl({

package/Models/DatabaseModels/Index.ts

@@ -1,6 +1,7 @@
 import AcmeCertificate from "./AcmeCertificate";
 import AcmeChallenge from "./AcmeChallenge";
 import KubernetesCluster from "./KubernetesCluster";
+import DockerHost from "./DockerHost";
 // API Keys
 import ApiKey from "./ApiKey";
 import ApiKeyPermission from "./ApiKeyPermission";
@@ -506,6 +507,7 @@ const AllModelTypes: Array<{
   StatusPageSCIMLog,
 
   KubernetesCluster,
+  DockerHost,
 ];
 
 const modelTypeMap: { [key: string]: { new (): BaseModel } } = {};

package/Server/API/TelemetryAPI.ts

@@ -23,6 +23,16 @@ import LogAggregationService, {
   AnalyticsTopItem,
   AnalyticsTableRow,
 } from "../Services/LogAggregationService";
+import TraceAggregationService, {
+  HistogramBucket as TraceHistogramBucket,
+  HistogramRequest as TraceHistogramRequest,
+  FacetValue as TraceFacetValue,
+  MultiFacetRequest as TraceMultiFacetRequest,
+} from "../Services/TraceAggregationService";
+import ExceptionAggregationService, {
+  HistogramBucket as ExceptionHistogramBucket,
+  HistogramRequest as ExceptionHistogramRequest,
+} from "../Services/ExceptionAggregationService";
 import ProfileAggregationService, {
   FlamegraphRequest,
   FunctionListRequest,
@@ -349,24 +359,259 @@ router.post(
         ? (body["attributes"] as Record<string, string>)
         : undefined;
 
-      const facets: Record<string, Array<FacetValue>> = {};
+      /*
+       * Capture tenantId locally so TypeScript narrowing survives the
+       * async closure below (narrowing is lost across closure boundaries).
+       */
+      const projectId: ObjectID = databaseProps.tenantId;
+
+      /*
+       * Run facet queries in parallel so a slow individual facet can't
+       * starve the endpoint. Per-facet errors degrade gracefully to [].
+       */
+      const facetResults: Array<readonly [string, Array<FacetValue>]> =
+        await Promise.all(
+          facetKeys.map(
+            async (
+              facetKey: string,
+            ): Promise<readonly [string, Array<FacetValue>]> => {
+              try {
+                const request: FacetRequest = {
+                  projectId,
+                  startTime,
+                  endTime,
+                  facetKey,
+                  limit,
+                  serviceIds,
+                  severityTexts,
+                  bodySearchText,
+                  traceIds,
+                  spanIds,
+                  attributes,
+                };
+                const values: Array<FacetValue> =
+                  await LogAggregationService.getFacetValues(request);
+                return [facetKey, values] as const;
+              } catch {
+                return [facetKey, [] as Array<FacetValue>] as const;
+              }
+            },
+          ),
+        );
 
-      for (const facetKey of facetKeys) {
-        const request: FacetRequest = {
-          projectId: databaseProps.tenantId,
-          startTime,
-          endTime,
-          facetKey,
-          limit,
-          serviceIds,
-          severityTexts,
-          bodySearchText,
-          traceIds,
-          spanIds,
-          attributes,
-        };
+      const facets: Record<string, Array<FacetValue>> = Object.fromEntries(
+        facetResults,
+      );
+
+      return Response.sendJsonObjectResponse(req, res, {
+        facets: facets as unknown as JSONObject,
+      });
+    } catch (err: unknown) {
+      next(err);
+    }
+  },
+);
+
+// --- Trace Histogram Endpoint ---
+
+router.post(
+  "/telemetry/traces/histogram",
+  UserMiddleware.getUserMiddleware,
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      const databaseProps: DatabaseCommonInteractionProps =
+        await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+      if (!databaseProps?.tenantId) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("Invalid Project ID"),
+        );
+      }
+
+      const body: JSONObject = req.body as JSONObject;
+
+      const startTime: Date = body["startTime"]
+        ? OneUptimeDate.fromString(body["startTime"] as string)
+        : OneUptimeDate.addRemoveHours(OneUptimeDate.getCurrentDate(), -1);
+
+      const endTime: Date = body["endTime"]
+        ? OneUptimeDate.fromString(body["endTime"] as string)
+        : OneUptimeDate.getCurrentDate();
+
+      const bucketSizeInMinutes: number =
+        (body["bucketSizeInMinutes"] as number) ||
+        computeDefaultBucketSize(startTime, endTime);
+
+      const serviceIds: Array<ObjectID> | undefined = body["serviceIds"]
+        ? (body["serviceIds"] as Array<string>).map((id: string) => {
+            return new ObjectID(id);
+          })
+        : undefined;
+
+      const statusCodes: Array<number> | undefined = body["statusCodes"]
+        ? (body["statusCodes"] as Array<number>)
+        : undefined;
+
+      const spanKinds: Array<string> | undefined = body["spanKinds"]
+        ? (body["spanKinds"] as Array<string>)
+        : undefined;
+
+      const spanNames: Array<string> | undefined = body["spanNames"]
+        ? (body["spanNames"] as Array<string>)
+        : undefined;
+
+      const traceIds: Array<string> | undefined = body["traceIds"]
+        ? (body["traceIds"] as Array<string>)
+        : undefined;
+
+      const nameSearchText: string | undefined = body["nameSearchText"]
+        ? (body["nameSearchText"] as string)
+        : undefined;
+
+      const rootOnly: boolean | undefined =
+        body["rootOnly"] === undefined ? undefined : Boolean(body["rootOnly"]);
+
+      const attributes: Record<string, string> | undefined = body["attributes"]
+        ? (body["attributes"] as Record<string, string>)
+        : undefined;
+
+      const request: TraceHistogramRequest = {
+        projectId: databaseProps.tenantId,
+        startTime,
+        endTime,
+        bucketSizeInMinutes,
+        serviceIds,
+        statusCodes,
+        spanKinds,
+        spanNames,
+        traceIds,
+        nameSearchText,
+        rootOnly,
+        attributes,
+      };
+
+      const buckets: Array<TraceHistogramBucket> =
+        await TraceAggregationService.getHistogram(request);
+
+      return Response.sendJsonObjectResponse(req, res, {
+        buckets: buckets as unknown as JSONObject,
+      });
+    } catch (err: unknown) {
+      next(err);
+    }
+  },
+);
+
+// --- Trace Facets Endpoint ---
+
+router.post(
+  "/telemetry/traces/facets",
+  UserMiddleware.getUserMiddleware,
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      const databaseProps: DatabaseCommonInteractionProps =
+        await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+      if (!databaseProps?.tenantId) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("Invalid Project ID"),
+        );
+      }
+
+      const body: JSONObject = req.body as JSONObject;
+
+      const facetKeys: Array<string> = body["facetKeys"]
+        ? (body["facetKeys"] as Array<string>)
+        : ["serviceId", "statusCode", "kind", "name"];
+
+      const startTime: Date = body["startTime"]
+        ? OneUptimeDate.fromString(body["startTime"] as string)
+        : OneUptimeDate.addRemoveHours(OneUptimeDate.getCurrentDate(), -1);
+
+      const endTime: Date = body["endTime"]
+        ? OneUptimeDate.fromString(body["endTime"] as string)
+        : OneUptimeDate.getCurrentDate();
+
+      const limit: number = (body["limit"] as number) || 500;
+
+      const serviceIds: Array<ObjectID> | undefined = body["serviceIds"]
+        ? (body["serviceIds"] as Array<string>).map((id: string) => {
+            return new ObjectID(id);
+          })
+        : undefined;
+
+      const statusCodes: Array<number> | undefined = body["statusCodes"]
+        ? (body["statusCodes"] as Array<number>)
+        : undefined;
+
+      const spanKinds: Array<string> | undefined = body["spanKinds"]
+        ? (body["spanKinds"] as Array<string>)
+        : undefined;
+
+      const spanNames: Array<string> | undefined = body["spanNames"]
+        ? (body["spanNames"] as Array<string>)
+        : undefined;
+
+      const traceIds: Array<string> | undefined = body["traceIds"]
+        ? (body["traceIds"] as Array<string>)
+        : undefined;
 
-        facets[facetKey] = await LogAggregationService.getFacetValues(request);
+      const nameSearchText: string | undefined = body["nameSearchText"]
+        ? (body["nameSearchText"] as string)
+        : undefined;
+
+      const rootOnly: boolean | undefined =
+        body["rootOnly"] === undefined ? undefined : Boolean(body["rootOnly"]);
+
+      const attributes: Record<string, string> | undefined = body["attributes"]
+        ? (body["attributes"] as Record<string, string>)
+        : undefined;
+
+      /*
+       * Compute all facets from a single sort-key-aligned sample query
+       * (ORDER BY startTime DESC LIMIT N) and count top-K in Node. This
+       * avoids ClickHouse GROUP BY aggregations that can't return partial
+       * results under max_execution_time 'break' mode, and returns in
+       * <1s even over 14-day windows.
+       */
+      const multiRequest: TraceMultiFacetRequest = {
+        projectId: databaseProps.tenantId,
+        startTime,
+        endTime,
+        facetKeys,
+        limit,
+        serviceIds,
+        statusCodes,
+        spanKinds,
+        spanNames,
+        traceIds,
+        nameSearchText,
+        rootOnly,
+        attributes,
+      };
+
+      let facets: Record<string, Array<TraceFacetValue>>;
+      try {
+        facets =
+          await TraceAggregationService.getFacetValuesFromSample(multiRequest);
+      } catch {
+        facets = Object.fromEntries(
+          facetKeys.map((key: string): [string, Array<TraceFacetValue>] => {
+            return [key, []];
+          }),
+        );
       }
 
       return Response.sendJsonObjectResponse(req, res, {
@@ -378,6 +623,97 @@ router.post(
   },
 );
 
+// --- Exception Histogram Endpoint ---
+
+router.post(
+  "/telemetry/exceptions/histogram",
+  UserMiddleware.getUserMiddleware,
+  async (
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> => {
+    try {
+      const databaseProps: DatabaseCommonInteractionProps =
+        await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+      if (!databaseProps?.tenantId) {
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new BadDataException("Invalid Project ID"),
+        );
+      }
+
+      const body: JSONObject = req.body as JSONObject;
+
+      const startTime: Date = body["startTime"]
+        ? OneUptimeDate.fromString(body["startTime"] as string)
+        : OneUptimeDate.addRemoveHours(OneUptimeDate.getCurrentDate(), -24);
+
+      const endTime: Date = body["endTime"]
+        ? OneUptimeDate.fromString(body["endTime"] as string)
+        : OneUptimeDate.getCurrentDate();
+
+      const bucketSizeInMinutes: number =
+        (body["bucketSizeInMinutes"] as number) ||
+        computeDefaultBucketSize(startTime, endTime);
+
+      const serviceIds: Array<ObjectID> | undefined = body["serviceIds"]
+        ? (body["serviceIds"] as Array<string>).map((id: string) => {
+            return new ObjectID(id);
+          })
+        : undefined;
+
+      const exceptionTypes: Array<string> | undefined = body["exceptionTypes"]
+        ? (body["exceptionTypes"] as Array<string>)
+        : undefined;
+
+      const environments: Array<string> | undefined = body["environments"]
+        ? (body["environments"] as Array<string>)
+        : undefined;
+
+      const fingerprints: Array<string> | undefined = body["fingerprints"]
+        ? (body["fingerprints"] as Array<string>)
+        : undefined;
+
+      const traceIds: Array<string> | undefined = body["traceIds"]
+        ? (body["traceIds"] as Array<string>)
+        : undefined;
+
+      const escaped: boolean | undefined =
+        body["escaped"] === undefined ? undefined : Boolean(body["escaped"]);
+
+      const messageSearchText: string | undefined = body["messageSearchText"]
+        ? (body["messageSearchText"] as string)
+        : undefined;
+
+      const request: ExceptionHistogramRequest = {
+        projectId: databaseProps.tenantId,
+        startTime,
+        endTime,
+        bucketSizeInMinutes,
+        serviceIds,
+        exceptionTypes,
+        environments,
+        fingerprints,
+        traceIds,
+        escaped,
+        messageSearchText,
+      };
+
+      const buckets: Array<ExceptionHistogramBucket> =
+        await ExceptionAggregationService.getHistogram(request);
+
+      return Response.sendJsonObjectResponse(req, res, {
+        buckets: buckets as unknown as JSONObject,
+      });
+    } catch (err: unknown) {
+      next(err);
+    }
+  },
+);
+
 // --- Log Analytics Endpoint ---
 
 router.post(

package/Server/Infrastructure/ClickhouseConfig.ts

@@ -26,6 +26,15 @@ const options: ClickHouseClientConfigOptions = {
   password: ClickhousePassword,
   database: ClickhouseDatabase,
   application: "oneuptime",
+  /*
+   * The default @clickhouse/client request_timeout is 30s which is too
+   * short for aggregation queries over wide time ranges on large span /
+   * log tables. Cap it just under nginx's 60s proxy_read_timeout so that
+   * (a) a slow query still has headroom and (b) nginx never hits its
+   * upstream timeout first. Per-query SETTINGS max_execution_time on
+   * aggregation statements provides the hard server-side cap.
+   */
+  request_timeout: 58_000,
 };
 
 if (ShouldClickhouseSslEnable && ClickhouseTlsCa) {

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

@@ -0,0 +1,76 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1774000000002 implements MigrationInterface {
+  public name = "MigrationName1774000000002";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "DockerHost" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "name" character varying(100) NOT NULL, "slug" character varying(100) NOT NULL, "description" character varying(500), "hostIdentifier" character varying(100) NOT NULL, "otelCollectorStatus" character varying(100) DEFAULT 'disconnected', "lastSeenAt" TIMESTAMP WITH TIME ZONE, "containersRunning" integer DEFAULT '0', "containersStopped" integer DEFAULT '0', "containersPaused" integer DEFAULT '0', "osType" character varying(100), "osVersion" character varying(100), "createdByUserId" uuid, "deletedByUserId" uuid, CONSTRAINT "PK_docker_host_id" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_projectId" ON "DockerHost" ("projectId")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_hostIdentifier" ON "DockerHost" ("hostIdentifier")`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_docker_host_slug" ON "DockerHost" ("slug")`,
+    );
+    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`,
+    );
+    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_deletedByUserId" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    // Label join table
+    await queryRunner.query(
+      `CREATE TABLE "DockerHostLabel" ("dockerHostId" uuid NOT NULL, "labelId" uuid NOT NULL, CONSTRAINT "PK_docker_host_label" PRIMARY KEY ("dockerHostId", "labelId"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_label_dockerHostId" ON "DockerHostLabel" ("dockerHostId")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_docker_host_label_labelId" ON "DockerHostLabel" ("labelId")`,
+    );
+    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 "DockerHostLabel" ADD CONSTRAINT "FK_docker_host_label_labelId" 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_docker_host_label_labelId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHostLabel" DROP CONSTRAINT "FK_docker_host_label_dockerHostId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_docker_host_label_labelId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_docker_host_label_dockerHostId"`,
+    );
+    await queryRunner.query(`DROP TABLE "DockerHostLabel"`);
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_docker_host_deletedByUserId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_docker_host_createdByUserId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerHost" DROP CONSTRAINT "FK_docker_host_projectId"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."IDX_docker_host_slug"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_docker_host_hostIdentifier"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."IDX_docker_host_projectId"`);
+    await queryRunner.query(`DROP TABLE "DockerHost"`);
+  }
+}