@oneuptime/common 10.0.43 → 10.0.45

package/Models/DatabaseModels/Workflow.ts

@@ -527,6 +527,35 @@ export default class Workflow extends BaseModel {
   })
   public triggerArguments?: JSONObject = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadWorkflow,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditWorkflow,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.LongText,
+    title: "Webhook Secret Key",
+    description:
+      "Secret key used to trigger this workflow via webhook. Use this instead of the workflow ID for security.",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    nullable: true,
+  })
+  public webhookSecretKey?: string = undefined;
+
   // This is a BullMQ job key that is used to schedule job for this workflow. This is used internally to remove existing job.
   @ColumnAccessControl({
     create: [],

package/Server/API/StatusPageAPI.ts

@@ -2169,6 +2169,50 @@ export default class StatusPageAPI extends BaseAPI<
               },
             });
 
+          /*
+           * Fetch all incidents (active + resolved) in the timeline date range
+           * for the uptime bar tooltip and click-through
+           */
+          let timelineIncidents: Array<Incident> = [];
+          if (
+            monitorsOnStatusPage.length > 0 &&
+            statusPage.showIncidentsOnStatusPage
+          ) {
+            timelineIncidents = await IncidentService.findBy({
+              query: {
+                monitors: monitorsOnStatusPage as any,
+                declaredAt: QueryHelper.inBetween(startDate, endDate),
+                isVisibleOnStatusPage: true,
+                projectId: statusPage.projectId!,
+              },
+              select: {
+                _id: true,
+                title: true,
+                declaredAt: true,
+                incidentSeverity: {
+                  name: true,
+                  color: true,
+                },
+                currentIncidentState: {
+                  _id: true,
+                  name: true,
+                  color: true,
+                },
+                monitors: {
+                  _id: true,
+                },
+              },
+              sort: {
+                declaredAt: SortOrder.Descending,
+              },
+              skip: 0,
+              limit: LIMIT_PER_PROJECT,
+              props: {
+                isRoot: true,
+              },
+            });
+          }
+
           const overallStatus: MonitorStatus | null =
             StatusPageService.getOverallMonitorStatus({
               statusPageResources,
@@ -2251,6 +2295,10 @@ export default class StatusPageAPI extends BaseAPI<
               monitorGroupCurrentStatuses,
             ),
             monitorsInGroup: JSONFunctions.serialize(monitorsInGroup),
+            timelineIncidents: BaseModel.toJSONArray(
+              timelineIncidents,
+              Incident,
+            ),
           };
 
           return Response.sendJsonObjectResponse(req, res, response);

package/Server/EnvironmentConfig.ts

@@ -176,15 +176,9 @@ export const AppApiHostname: Hostname = Hostname.fromString(
   }`,
 );
 
-export const OpenTelemetryIngestHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_TELEMETRY_HOSTNAME"] || "localhost"}:${
-    process.env["TELEMETRY_PORT"] || 80
-  }`,
-);
-
 export const WorkerHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_WORKER_HOSTNAME"] || "localhost"}:${
-    process.env["WORKER_PORT"] || 80
+  `${process.env["SERVER_APP_HOSTNAME"] || "localhost"}:${
+    process.env["APP_PORT"] || 80
   }`,
 );
 
@@ -406,6 +400,9 @@ export const IpWhitelist: string = process.env["IP_WHITELIST"] || "";
 export const DisableTelemetry: boolean =
   process.env["DISABLE_TELEMETRY"] === "true";
 
+export const EnableProfiling: boolean =
+  process.env["ENABLE_PROFILING"] === "true";
+
 export const IsEnterpriseEdition: boolean =
   process.env["IS_ENTERPRISE_EDITION"] === "true";
 

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

@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1774559064920 implements MigrationInterface {
+  public name = "MigrationName1774559064920";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Workflow" ADD "webhookSecretKey" text`,
+    );
+
+    // Set secret key to existing workflow ID so current webhook URLs keep working.
+    await queryRunner.query(
+      `UPDATE "Workflow" SET "webhookSecretKey" = "_id"::text WHERE "webhookSecretKey" IS NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Workflow" DROP COLUMN "webhookSecretKey"`,
+    );
+  }
+}

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

@@ -274,6 +274,7 @@ import { MigrationName1774524742177 } from "./1774524742177-MigrationName";
 import { MigrationName1774524742178 } from "./1774524742178-MigrationName";
 import { MigrationName1774524742179 } from "./1774524742179-MigrationName";
 import { MigrationName1774559064919 } from "./1774559064919-MigrationName";
+import { MigrationName1774559064920 } from "./1774559064920-MigrationName";
 
 export default [
   InitialMigration,
@@ -552,4 +553,5 @@ export default [
   MigrationName1774524742178,
   MigrationName1774524742179,
   MigrationName1774559064919,
+  MigrationName1774559064920,
 ];

package/Server/Services/AlertService.ts

@@ -31,6 +31,8 @@ import { IsBillingEnabled } from "../EnvironmentConfig";
 import logger from "../Utils/Logger";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
 import MetricService from "./MetricService";
+import GlobalConfigService from "./GlobalConfigService";
+import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig";
 import OneUptimeDate from "../../Types/Date";
 import Metric, {
   MetricPointType,
@@ -1060,6 +1062,39 @@ ${alertSeverity.name}
     });
   }
 
+  private static readonly DEFAULT_METRIC_RETENTION_DAYS: number = 180;
+
+  private async getMetricRetentionDays(): Promise<number> {
+    try {
+      const globalConfig: GlobalConfig | null =
+        await GlobalConfigService.findOneBy({
+          query: {
+            _id: ObjectID.getZeroObjectID().toString(),
+          },
+          props: {
+            isRoot: true,
+          },
+          select: {
+            monitorMetricRetentionInDays: true,
+          },
+        });
+
+      if (
+        globalConfig &&
+        globalConfig.monitorMetricRetentionInDays !== undefined &&
+        globalConfig.monitorMetricRetentionInDays !== null &&
+        globalConfig.monitorMetricRetentionInDays > 0
+      ) {
+        return globalConfig.monitorMetricRetentionInDays;
+      }
+    } catch (error) {
+      logger.error("Error fetching metric retention config, using default:");
+      logger.error(error);
+    }
+
+    return Service.DEFAULT_METRIC_RETENTION_DAYS;
+  }
+
   @CaptureSpan()
   public async refreshAlertMetrics(data: { alertId: ObjectID }): Promise<void> {
     const alert: Model | null = await this.findOneById({
@@ -1130,6 +1165,12 @@ ${alertSeverity.name}
     const itemsToSave: Array<Metric> = [];
     const metricTypesMap: Dictionary<MetricType> = {};
 
+    const metricRetentionDays: number = await this.getMetricRetentionDays();
+    const alertMetricRetentionDate: Date = OneUptimeDate.addRemoveDays(
+      OneUptimeDate.getCurrentDate(),
+      metricRetentionDays,
+    );
+
     // now we need to create new metrics for this alert - TimeToAcknowledge, TimeToResolve, AlertCount, AlertDuration
     const alertStartsAt: Date =
       firstAlertStateTimeline?.startsAt ||
@@ -1160,6 +1201,7 @@ ${alertSeverity.name}
       alertCountMetric.time,
     );
     alertCountMetric.metricPointType = MetricPointType.Sum;
+    alertCountMetric.retentionDate = alertMetricRetentionDate;
 
     itemsToSave.push(alertCountMetric);
 
@@ -1214,6 +1256,7 @@ ${alertSeverity.name}
           timeToAcknowledgeMetric.time,
         );
         timeToAcknowledgeMetric.metricPointType = MetricPointType.Sum;
+        timeToAcknowledgeMetric.retentionDate = alertMetricRetentionDate;
 
         itemsToSave.push(timeToAcknowledgeMetric);
 
@@ -1270,6 +1313,7 @@ ${alertSeverity.name}
           timeToResolveMetric.time,
         );
         timeToResolveMetric.metricPointType = MetricPointType.Sum;
+        timeToResolveMetric.retentionDate = alertMetricRetentionDate;
 
         itemsToSave.push(timeToResolveMetric);
 
@@ -1319,6 +1363,7 @@ ${alertSeverity.name}
         alertDurationMetric.time,
       );
       alertDurationMetric.metricPointType = MetricPointType.Sum;
+      alertDurationMetric.retentionDate = alertMetricRetentionDate;
 
       itemsToSave.push(alertDurationMetric);
 

package/Server/Services/IncidentService.ts

@@ -36,6 +36,8 @@ import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTime
 import User from "../../Models/DatabaseModels/User";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import MetricService from "./MetricService";
+import GlobalConfigService from "./GlobalConfigService";
+import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig";
 import IncidentMetricType from "../../Types/Incident/IncidentMetricType";
 import Metric, {
   MetricPointType,
@@ -1396,6 +1398,12 @@ ${incident.remediationNotes || "No remediation notes provided."}
                 postmortemMetric.time,
               );
               postmortemMetric.metricPointType = MetricPointType.Sum;
+              const postmortemRetentionDays: number =
+                await this.getMetricRetentionDays();
+              postmortemMetric.retentionDate = OneUptimeDate.addRemoveDays(
+                OneUptimeDate.getCurrentDate(),
+                postmortemRetentionDays,
+              );
 
               await MetricService.create({
                 data: postmortemMetric,
@@ -1583,6 +1591,12 @@ ${incidentSeverity.name}
                 severityChangeMetric.time,
               );
               severityChangeMetric.metricPointType = MetricPointType.Sum;
+              const severityRetentionDays: number =
+                await this.getMetricRetentionDays();
+              severityChangeMetric.retentionDate = OneUptimeDate.addRemoveDays(
+                OneUptimeDate.getCurrentDate(),
+                severityRetentionDays,
+              );
 
               await MetricService.create({
                 data: severityChangeMetric,
@@ -2075,6 +2089,39 @@ ${incidentSeverity.name}
     });
   }
 
+  private static readonly DEFAULT_METRIC_RETENTION_DAYS: number = 180;
+
+  private async getMetricRetentionDays(): Promise<number> {
+    try {
+      const globalConfig: GlobalConfig | null =
+        await GlobalConfigService.findOneBy({
+          query: {
+            _id: ObjectID.getZeroObjectID().toString(),
+          },
+          props: {
+            isRoot: true,
+          },
+          select: {
+            monitorMetricRetentionInDays: true,
+          },
+        });
+
+      if (
+        globalConfig &&
+        globalConfig.monitorMetricRetentionInDays !== undefined &&
+        globalConfig.monitorMetricRetentionInDays !== null &&
+        globalConfig.monitorMetricRetentionInDays > 0
+      ) {
+        return globalConfig.monitorMetricRetentionInDays;
+      }
+    } catch (error) {
+      logger.error("Error fetching metric retention config, using default:");
+      logger.error(error);
+    }
+
+    return Service.DEFAULT_METRIC_RETENTION_DAYS;
+  }
+
   @CaptureSpan()
   public async refreshIncidentMetrics(data: {
     incidentId: ObjectID;
@@ -2223,6 +2270,12 @@ ${incidentSeverity.name}
 
     const itemsToSave: Array<Metric> = [];
 
+    const metricRetentionDays: number = await this.getMetricRetentionDays();
+    const incidentMetricRetentionDate: Date = OneUptimeDate.addRemoveDays(
+      OneUptimeDate.getCurrentDate(),
+      metricRetentionDays,
+    );
+
     // now we need to create new metrics for this incident - TimeToAcknowledge, TimeToResolve, IncidentCount, IncidentDuration
 
     const incidentStartsAt: Date =
@@ -2233,24 +2286,34 @@ ${incidentSeverity.name}
 
     const metricTypesMap: Dictionary<MetricType> = {};
 
-    // common attributes shared by all incident metrics
+    /*
+     * common attributes shared by all incident metrics
+     * All values must be strings for ClickHouse Map(String, String) storage.
+     * Arrays are joined as comma-separated strings.
+     */
     const baseMetricAttributes: JSONObject = {
       incidentId: data.incidentId.toString(),
       projectId: incident.projectId.toString(),
-      monitorIds:
-        incident.monitors?.map((monitor: Monitor) => {
-          return monitor._id?.toString();
-        }) || [],
-      monitorNames:
-        incident.monitors?.map((monitor: Monitor) => {
-          return monitor.name?.toString();
-        }) || [],
+      monitorIds: (
+        incident.monitors
+          ?.map((monitor: Monitor) => {
+            return monitor._id?.toString();
+          })
+          .filter(Boolean) || []
+      ).join(", "),
+      monitorNames: (
+        incident.monitors
+          ?.map((monitor: Monitor) => {
+            return monitor.name?.toString();
+          })
+          .filter(Boolean) || []
+      ).join(", "),
       incidentSeverityId: incident.incidentSeverity?._id?.toString(),
       incidentSeverityName: incident.incidentSeverity?.name?.toString(),
-      ownerUserIds: ownerUserIds,
-      ownerUserNames: ownerUserNames,
-      ownerTeamIds: ownerTeamIds,
-      ownerTeamNames: ownerTeamNames,
+      ownerUserIds: ownerUserIds.join(", "),
+      ownerUserNames: ownerUserNames.join(", "),
+      ownerTeamIds: ownerTeamIds.join(", "),
+      ownerTeamNames: ownerTeamNames.join(", "),
     };
 
     const incidentCountMetric: Metric = new Metric();
@@ -2270,6 +2333,7 @@ ${incidentSeverity.name}
       incidentCountMetric.time,
     );
     incidentCountMetric.metricPointType = MetricPointType.Sum;
+    incidentCountMetric.retentionDate = incidentMetricRetentionDate;
 
     itemsToSave.push(incidentCountMetric);
 
@@ -2321,6 +2385,7 @@ ${incidentSeverity.name}
           timeToAcknowledgeMetric.time,
         );
         timeToAcknowledgeMetric.metricPointType = MetricPointType.Sum;
+        timeToAcknowledgeMetric.retentionDate = incidentMetricRetentionDate;
 
         itemsToSave.push(timeToAcknowledgeMetric);
 
@@ -2374,6 +2439,7 @@ ${incidentSeverity.name}
           timeToResolveMetric.time,
         );
         timeToResolveMetric.metricPointType = MetricPointType.Sum;
+        timeToResolveMetric.retentionDate = incidentMetricRetentionDate;
 
         itemsToSave.push(timeToResolveMetric);
 
@@ -2422,6 +2488,7 @@ ${incidentSeverity.name}
         incidentDurationMetric.time,
       );
       incidentDurationMetric.metricPointType = MetricPointType.Sum;
+      incidentDurationMetric.retentionDate = incidentMetricRetentionDate;
 
       itemsToSave.push(incidentDurationMetric);
 
@@ -2474,6 +2541,7 @@ ${incidentSeverity.name}
         timeInStateMetric.time,
       );
       timeInStateMetric.metricPointType = MetricPointType.Sum;
+      timeInStateMetric.retentionDate = incidentMetricRetentionDate;
 
       itemsToSave.push(timeInStateMetric);
     }

package/Server/Services/LogAggregationService.ts

@@ -676,6 +676,7 @@ export class LogAggregationService {
     bodySearchText?: string | undefined;
     traceIds?: Array<string> | undefined;
     spanIds?: Array<string> | undefined;
+    attributes?: Record<string, string> | undefined;
   }): Promise<Array<JSONObject>> {
     const maxLimit: number = Math.min(request.limit || 10000, 10000);
 

package/Server/Services/WorkflowService.ts

@@ -1,6 +1,6 @@
 import { WorkflowHostname } from "../EnvironmentConfig";
 import ClusterKeyAuthorization from "../Middleware/ClusterKeyAuthorization";
-import { OnUpdate } from "../Types/Database/Hooks";
+import { OnCreate, OnUpdate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import EmptyResponseData from "../../Types/API/EmptyResponse";
 import Protocol from "../../Types/API/Protocol";
@@ -17,12 +17,39 @@ import {
 import API from "../../Utils/API";
 import Model from "../../Models/DatabaseModels/Workflow";
 import logger from "../Utils/Logger";
+import UUID from "../../Utils/UUID";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
+  protected override async onCreateSuccess(
+    _onCreate: OnCreate<Model>,
+    createdItem: Model,
+  ): Promise<Model> {
+    // Auto-generate webhook secret key for new workflows.
+    if (!createdItem.webhookSecretKey && createdItem._id) {
+      const secretKey: string = UUID.generate();
+
+      await this.updateOneById({
+        id: new ObjectID(createdItem._id),
+        data: {
+          webhookSecretKey: secretKey,
+        } as any,
+        props: {
+          isRoot: true,
+          ignoreHooks: true,
+        },
+      });
+
+      createdItem.webhookSecretKey = secretKey;
+    }
+
+    return createdItem;
+  }
+
   @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,

package/Server/Types/Workflow/Components/Webhook.ts

@@ -13,6 +13,8 @@ import ComponentMetadata, { Port } from "../../../../Types/Workflow/Component";
 import ComponentID from "../../../../Types/Workflow/ComponentID";
 import WebhookComponents from "../../../../Types/Workflow/Components/Webhook";
 import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
+import WorkflowService from "../../../Services/WorkflowService";
+import Workflow from "../../../../Models/DatabaseModels/Workflow";
 
 export default class WebhookTrigger extends TriggerCode {
   public constructor() {
@@ -54,7 +56,7 @@ export default class WebhookTrigger extends TriggerCode {
   @CaptureSpan()
   public override async init(props: InitProps): Promise<void> {
     props.router.get(
-      `/trigger/:workflowId`,
+      `/trigger/:secretkey`,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
           await this.initTrigger(req, res, props);
@@ -65,7 +67,7 @@ export default class WebhookTrigger extends TriggerCode {
     );
 
     props.router.post(
-      `/trigger/:workflowId`,
+      `/trigger/:secretkey`,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
           await this.initTrigger(req, res, props);
@@ -82,12 +84,33 @@ export default class WebhookTrigger extends TriggerCode {
     res: ExpressResponse,
     props: InitProps,
   ): Promise<void> {
-    /// Run Graph.
+    const secretKey: string = req.params["secretkey"] as string;
 
-    // check if this workflow has the trigger enabled.
+    if (!secretKey) {
+      throw new BadDataException("Secret key is required to trigger workflow.");
+    }
+
+    // Look up the workflow by webhook secret key.
+    const workflow: Workflow | null = await WorkflowService.findOneBy({
+      query: {
+        webhookSecretKey: secretKey,
+      },
+      select: {
+        _id: true,
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!workflow || !workflow._id) {
+      throw new BadDataException(
+        "Workflow not found for the provided secret key.",
+      );
+    }
 
     const executeWorkflow: ExecuteWorkflowType = {
-      workflowId: new ObjectID(req.params["workflowId"] as string),
+      workflowId: new ObjectID(workflow._id),
       returnValues: {
         "request-headers": req.headers,
         "request-params": req.query,

package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts

@@ -208,6 +208,12 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
       )}')`;
     }
 
+    if (column.type === TableColumnType.DateTime64 && value instanceof Date) {
+      value = `parseDateTimeBestEffortOrNull('${OneUptimeDate.toClickhouseDateTime64(
+        value as Date,
+      )}')`;
+    }
+
     if (column.type === TableColumnType.Number) {
       if (typeof value === "string") {
         value = parseInt(value);
@@ -419,23 +425,33 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
         tableColumn.type === TableColumnType.MapStringString &&
         typeof value === "object"
       ) {
-        const mapValue: Record<string, string> = value as Record<
-          string,
-          string
-        >;
+        const mapValue: Record<string, string | Search<string>> =
+          value as Record<string, string | Search<string>>;
         for (const mapKey in mapValue) {
           if (mapValue[mapKey] === undefined) {
             continue;
           }
-          whereStatement.append(
-            SQL`AND ${key}[${{
-              value: mapKey,
-              type: TableColumnType.Text,
-            }}] = ${{
-              value: mapValue[mapKey] as string,
-              type: TableColumnType.Text,
-            }}`,
-          );
+          if (mapValue[mapKey] instanceof Search) {
+            whereStatement.append(
+              SQL`AND ${key}[${{
+                value: mapKey,
+                type: TableColumnType.Text,
+              }}] ILIKE ${{
+                value: mapValue[mapKey] as Search<string>,
+                type: TableColumnType.Text,
+              }}`,
+            );
+          } else {
+            whereStatement.append(
+              SQL`AND ${key}[${{
+                value: mapKey,
+                type: TableColumnType.Text,
+              }}] = ${{
+                value: mapValue[mapKey] as string,
+                type: TableColumnType.Text,
+              }}`,
+            );
+          }
         }
       } else if (
         (tableColumn.type === TableColumnType.JSON ||