@oneuptime/common 8.0.5386 → 8.0.5403

package/Models/AnalyticsModels/Index.ts

@@ -2,7 +2,6 @@ import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Log from "./Log";
 import Metric from "./Metric";
 import Span from "./Span";
-import TelemetryAttribute from "./TelemetryAttribute";
 import ExceptionInstance from "./ExceptionInstance";
 import MonitorLog from "./MonitorLog";
 
@@ -10,7 +9,6 @@ const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
   Log,
   Span,
   Metric,
-  TelemetryAttribute,
   ExceptionInstance,
   MonitorLog,
 ];

package/Models/DatabaseModels/TelemetryException.ts

@@ -8,7 +8,6 @@ import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
-import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -45,12 +44,6 @@ import TelemetryService from "./TelemetryService";
     Permission.EditTelemetryException,
   ],
 })
-@EnableWorkflow({
-  create: true,
-  delete: true,
-  update: true,
-  read: true,
-})
 @CrudApiEndpoint(new Route("/telemetry-exception-status"))
 @TableMetadata({
   tableName: "TelemetryException",

package/Server/API/MicrosoftTeamsAPI.ts

@@ -75,12 +75,13 @@ export default class MicrosoftTeamsAPI {
       },
       description: {
         short: "Complete open-source monitoring and observability platform. ",
-        full: `OneUptime is a comprehensive solution for monitoring and managing your online services. Whether you need to check the availability of your website, dashboard, API, or any other online resource, OneUptime can alert your team when downtime happens and keep your customers informed with a status page. OneUptime also helps you handle incidents, set up on-call rotations, run tests, secure your services, analyze logs, track performance, and debug errors.
+        full: `<p>OneUptime is a comprehensive solution for monitoring and managing your online services. Whether you need to check the availability of your website, dashboard, API, or any other online resource, OneUptime can alert your team when downtime happens and keep your customers informed with a status page. OneUptime also helps you handle incidents, set up on-call rotations, run tests, secure your services, analyze logs, track performance, and debug errors.</p>
 
-In order to use the app, you need to have an active account with OneUptime at https://oneuptime.com. Please send an email to support@oneupitme.com if you need more details. 
+<p>In order to use the app, you need to have an active account with <a href="https://oneuptime.com" target="_blank">OneUptime</a>. Please send an email to <a href="mailto:support@oneuptime.com">support@oneuptime.com</a> if you need more details.</p>
 
-Create a new OneUptime Account: If you wish to sign up for a new account, you can do so at https://oneuptime.com and click on Sign up. 
-Help and Support: You can reach out to help and support here: https://oneuptime.com/support or contact support@oneuptime.com
+<p><strong>Create a new OneUptime Account:</strong> If you wish to sign up for a new account, you can do so by visiting <a href="https://oneuptime.com" target="_blank">OneUptime Sign Up</a>.</p>
+
+<p><strong>Help and Support:</strong> You can reach out to help and support via <a href="https://oneuptime.com/support" target="_blank">Support Page</a> or contact <a href="mailto:support@oneuptime.com">support@oneuptime.com</a>.</p>
 `,
       },
       // Default to size-specific names; route will adjust if fallbacks are used

package/Server/API/UserOnCallLogTimelineAPI.ts

@@ -236,12 +236,16 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
           if (timelineItem.isAcknowledged) {
             // already acknowledged. Then show already acknowledged page with view details button.
 
+            const viewDetailsRoute: Route = new Route(
+              DashboardRoute.toString(),
+            ).addRoute(
+              `/${timelineItem.projectId?.toString()}/${timelineItem.triggeredByIncidentId ? "incidents" : "alerts"}/${timelineItem.triggeredByIncidentId ? timelineItem.triggeredByIncidentId!.toString() : timelineItem.triggeredByAlertId!.toString()}`,
+            );
+
             const viewDetailsUrl: URL = new URL(
               httpProtocol,
               host,
-              DashboardRoute.addRoute(
-                `/${timelineItem.projectId?.toString()}/${timelineItem.triggeredByIncidentId ? "incidents" : "alerts"}/${timelineItem.triggeredByIncidentId ? timelineItem.triggeredByIncidentId!.toString() : timelineItem.triggeredByAlertId!.toString()}`,
-              ),
+              viewDetailsRoute,
             );
 
             return Response.render(
@@ -273,30 +277,30 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
           // redirect to dashboard to incidents page.
 
           if (timelineItem.triggeredByIncidentId) {
+            const incidentRoute: Route = new Route(
+              DashboardRoute.toString(),
+            ).addRoute(
+              `/${timelineItem.projectId?.toString()}/incidents/${timelineItem.triggeredByIncidentId!.toString()}`,
+            );
+
             return Response.redirect(
               req,
               res,
-              new URL(
-                httpProtocol,
-                host,
-                DashboardRoute.addRoute(
-                  `/${timelineItem.projectId?.toString()}/incidents/${timelineItem.triggeredByIncidentId!.toString()}`,
-                ),
-              ),
+              new URL(httpProtocol, host, incidentRoute),
             );
           }
 
           if (timelineItem.triggeredByAlertId) {
+            const alertRoute: Route = new Route(
+              DashboardRoute.toString(),
+            ).addRoute(
+              `/${timelineItem.projectId?.toString()}/alerts/${timelineItem.triggeredByAlertId!.toString()}`,
+            );
+
             return Response.redirect(
               req,
               res,
-              new URL(
-                httpProtocol,
-                host,
-                DashboardRoute.addRoute(
-                  `/${timelineItem.projectId?.toString()}/alerts/${timelineItem.triggeredByAlertId!.toString()}`,
-                ),
-              ),
+              new URL(httpProtocol, host, alertRoute),
             );
           }
 

package/Server/DatabaseConfig.ts

@@ -3,6 +3,7 @@ import { AccountsRoute, DashboardRoute } from "../ServiceRoute";
 import Hostname from "../Types/API/Hostname";
 import Protocol from "../Types/API/Protocol";
 import URL from "../Types/API/URL";
+import Route from "../Types/API/Route";
 import BadDataException from "../Types/Exception/BadDataException";
 import { JSONValue } from "../Types/JSON";
 import GlobalConfig from "../Models/DatabaseModels/GlobalConfig";
@@ -56,7 +57,11 @@ export default class DatabaseConfig {
   @CaptureSpan()
   public static async getAccountsUrl(): Promise<URL> {
     const host: Hostname = await DatabaseConfig.getHost();
-    return new URL(await DatabaseConfig.getHttpProtocol(), host, AccountsRoute);
+    return new URL(
+      await DatabaseConfig.getHttpProtocol(),
+      host,
+      new Route(AccountsRoute.toString()),
+    );
   }
 
   @CaptureSpan()
@@ -65,7 +70,7 @@ export default class DatabaseConfig {
     return new URL(
       await DatabaseConfig.getHttpProtocol(),
       host,
-      DashboardRoute,
+      new Route(DashboardRoute.toString()),
     );
   }
 

package/Server/EnvironmentConfig.ts

@@ -10,6 +10,7 @@ import {
 import BillingConfig from "./BillingConfig";
 import Protocol from "../Types/API/Protocol";
 import URL from "../Types/API/URL";
+import Route from "../Types/API/Route";
 import SubscriptionPlan from "../Types/Billing/SubscriptionPlan";
 import Email from "../Types/Email";
 import { JSONObject } from "../Types/JSON";
@@ -303,32 +304,44 @@ export const NotificationSlackWebhookOnSubscriptionUpdate: string =
 export const AdminDashboardClientURL: URL = new URL(
   HttpProtocol,
   Host,
-  AdminDashboardRoute,
+  new Route(AdminDashboardRoute.toString()),
 );
 
-export const AppApiClientUrl: URL = new URL(HttpProtocol, Host, AppApiRoute);
+export const AppApiClientUrl: URL = new URL(
+  HttpProtocol,
+  Host,
+  new Route(AppApiRoute.toString()),
+);
 
 export const StatusPageApiClientUrl: URL = new URL(
   HttpProtocol,
   Host,
-  StatusPageApiRoute,
+  new Route(StatusPageApiRoute.toString()),
 );
 
 export const DashboardClientUrl: URL = new URL(
   HttpProtocol,
   Host,
-  DashboardRoute,
+  new Route(DashboardRoute.toString()),
 );
 
 export const AccountsClientUrl: URL = new URL(
   HttpProtocol,
   Host,
-  AccountsRoute,
+  new Route(AccountsRoute.toString()),
 );
 
-export const HomeClientUrl: URL = new URL(HttpProtocol, Host, HomeRoute);
+export const HomeClientUrl: URL = new URL(
+  HttpProtocol,
+  Host,
+  new Route(HomeRoute.toString()),
+);
 
-export const DocsClientUrl: URL = new URL(HttpProtocol, Host, DocsRoute);
+export const DocsClientUrl: URL = new URL(
+  HttpProtocol,
+  Host,
+  new Route(DocsRoute.toString()),
+);
 
 export const DisableTelemetry: boolean =
   process.env["DISABLE_TELEMETRY"] === "true";

package/Server/Infrastructure/GlobalCache.ts

@@ -7,6 +7,10 @@ import { JSONArray, JSONObject } from "../../Types/JSON";
 import JSONFunctions from "../../Types/JSONFunctions";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
+type CacheSetOptions = {
+  expiresInSeconds: number;
+};
+
 export default abstract class GlobalCache {
   @CaptureSpan()
   public static async getJSONObject(
@@ -56,8 +60,9 @@ export default abstract class GlobalCache {
     namespace: string,
     key: string,
     value: string[],
+    options?: CacheSetOptions,
   ): Promise<void> {
-    await this.setString(namespace, key, JSON.stringify(value));
+    await this.setString(namespace, key, JSON.stringify(value), options);
   }
 
   @CaptureSpan()
@@ -136,11 +141,13 @@ export default abstract class GlobalCache {
     namespace: string,
     key: string,
     value: JSONObject,
+    options?: CacheSetOptions,
   ): Promise<void> {
     await this.setString(
       namespace,
       key,
       JSON.stringify(JSONFunctions.serialize(value)),
+      options,
     );
   }
 
@@ -149,6 +156,7 @@ export default abstract class GlobalCache {
     namespace: string,
     key: string,
     value: string,
+    options?: CacheSetOptions,
   ): Promise<void> {
     const client: ClientType | null = Redis.getClient();
 
@@ -157,9 +165,8 @@ export default abstract class GlobalCache {
     }
 
     await client.set(`${namespace}-${key}`, value);
-    await client.expire(
-      `${namespace}-${key}`,
-      OneUptimeDate.getSecondsInDays(30),
-    );
+    const expiresInSeconds: number =
+      options?.expiresInSeconds ?? OneUptimeDate.getSecondsInDays(30);
+    await client.expire(`${namespace}-${key}`, expiresInSeconds);
   }
 }

package/Server/Services/AlertService.ts

@@ -28,7 +28,6 @@ import AlertState from "../../Models/DatabaseModels/AlertState";
 import AlertStateTimeline from "../../Models/DatabaseModels/AlertStateTimeline";
 import User from "../../Models/DatabaseModels/User";
 import { IsBillingEnabled } from "../EnvironmentConfig";
-import TelemetryType from "../../Types/Telemetry/TelemetryType";
 import logger from "../Utils/Logger";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
 import MetricService from "./MetricService";
@@ -1329,15 +1328,6 @@ ${alertSeverity.name}
       },
     });
 
-    // index attributes
-    TelemetryUtil.indexAttributes({
-      attributes: ["monitorId", "projectId", "alertId", "monitorName"],
-      projectId: alert.projectId,
-      telemetryType: TelemetryType.Metric,
-    }).catch((err: Error) => {
-      logger.error(err);
-    });
-
     TelemetryUtil.indexMetricNameServiceNameMap({
       metricNameServiceNameMap: metricTypesMap,
       projectId: alert.projectId,

package/Server/Services/AnalyticsDatabaseService.ts

@@ -55,6 +55,11 @@ import Sort from "../Types/AnalyticsDatabase/Sort";
 import AggregatedModel from "../../Types/BaseDatabase/AggregatedModel";
 import ModelEventType from "../../Types/Realtime/ModelEventType";
 
+export type Results = ResultSet<"JSON">;
+export type DbJSONResponse = ResponseJSON<{
+  data?: Array<JSONObject>;
+}>;
+
 export default class AnalyticsDatabaseService<
   TBaseModel extends AnalyticsBaseModel,
 > extends BaseService {

package/Server/Services/IncidentService.ts

@@ -43,7 +43,6 @@ import Metric, {
 } from "../../Models/AnalyticsModels/Metric";
 import OneUptimeDate from "../../Types/Date";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
-import TelemetryType from "../../Types/Telemetry/TelemetryType";
 import logger from "../Utils/Logger";
 import Semaphore, {
   SemaphoreMutex,
@@ -2162,15 +2161,6 @@ ${incidentSeverity.name}
       },
     });
 
-    // index attributes.
-    TelemetryUtil.indexAttributes({
-      attributes: ["monitorIds", "projectId", "incidentId", "monitorNames"],
-      projectId: incident.projectId,
-      telemetryType: TelemetryType.Metric,
-    }).catch((err: Error) => {
-      logger.error(err);
-    });
-
     TelemetryUtil.indexMetricNameServiceNameMap({
       metricNameServiceNameMap: metricTypesMap,
       projectId: incident.projectId,

package/Server/Services/Index.ts

@@ -135,7 +135,6 @@ import WorkflowVariablesService from "./WorkflowVariableService";
 import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
 import CopilotPullRequestService from "./CopilotPullRequestService";
 import ServiceCatalogDependencyService from "./ServiceCatalogDependencyService";
-import TelemetryAttributeService from "./TelemetryAttributeService";
 import TelemetryExceptionService from "./TelemetryExceptionService";
 import ExceptionInstanceService from "./ExceptionInstanceService";
 import CopilotActionTypePriorityService from "./CopilotActionTypePriorityService";
@@ -356,7 +355,6 @@ export const AnalyticsServices: Array<
   LogService,
   SpanService,
   MetricService,
-  TelemetryAttributeService,
   ExceptionInstanceService,
   MonitorLogService,
 ];

package/Server/Services/TeamMemberService.ts

@@ -21,6 +21,7 @@ import { AccountsRoute } from "../../ServiceRoute";
 import Hostname from "../../Types/API/Hostname";
 import Protocol from "../../Types/API/Protocol";
 import URL from "../../Types/API/URL";
+import Route from "../../Types/API/Route";
 import SubscriptionPlan, {
   PlanType,
 } from "../../Types/Billing/SubscriptionPlan";
@@ -151,10 +152,18 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
             templateType: EmailTemplateType.InviteMember,
             vars: {
               signInLink: URL.fromString(
-                new URL(httpProtocol, host, AccountsRoute).toString(),
+                new URL(
+                  httpProtocol,
+                  host,
+                  new Route(AccountsRoute.toString()),
+                ).toString(),
               ).toString(),
               registerLink: URL.fromString(
-                new URL(httpProtocol, host, AccountsRoute).toString(),
+                new URL(
+                  httpProtocol,
+                  host,
+                  new Route(AccountsRoute.toString()),
+                ).toString(),
               )
                 .addRoute("/register")
                 .addQueryParam("email", email.toString(), true)