@oneuptime/common 7.0.4358 → 7.0.4395

package/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -140,13 +140,6 @@ export default class AnalyticsBaseModel extends CommonModel {
     this.crudApiPath = data.crudApiPath;
     this.enableRealtimeEventsOn = data.enableRealtimeEventsOn;
     this.partitionKey = data.partitionKey;
-
-    // initialize Arrays.
-    for (const column of this.tableColumns) {
-      if (column.type === TableColumnType.NestedModel) {
-        this.setColumnValue(column.key, []);
-      }
-    }
   }
 
   private _enableWorkflowOn: EnableWorkflowOn | undefined;

package/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.ts

@@ -207,19 +207,6 @@ export default class CommonModel {
         return;
       }
 
-      if (recordValue instanceof Array) {
-        if (recordValue.length > 0 && column.nestedModelType) {
-          json[column.key] = CommonModel.toJSONArray(
-            recordValue as Array<CommonModel>,
-            column.nestedModelType,
-          );
-        } else {
-          json[column.key] = recordValue;
-        }
-
-        return;
-      }
-
       json[column.key] = recordValue;
     });
 

package/Models/AnalyticsModels/ExceptionInstance.ts

@@ -12,8 +12,8 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
     super({
       tableName: "ExceptionItem",
       tableEngine: AnalyticsTableEngine.MergeTree,
-      singularName: "Exception",
-      pluralName: "Exceptions",
+      singularName: "Exception Instance",
+      pluralName: "Exception Instances",
       enableRealtimeEventsOn: {
         create: true,
       },

package/Models/DatabaseModels/Monitor.ts

@@ -531,7 +531,7 @@ export default class Monitor extends BaseModel {
     ],
   })
   @TableColumn({
-    type: TableColumnType.JSON,
+    type: TableColumnType.MonitorSteps,
     required: false,
     title: "Monitor Steps",
     description: "What would you like to monitor and what is the criteria?",

package/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule.ts

@@ -53,8 +53,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 })
 @TableMetadata({
   tableName: "OnCallDutyPolicyEscalationRuleSchedule",
-  singularName: "On-Call Duty Escalation Rule Schedule",
-  pluralName: "On-Call Duty Escalation Rule Schedules",
+  singularName: "Schedule's On-Call Duty Escalation Rule",
+  pluralName: "Schedule's On-Call Duty Escalation Rules",
   icon: IconProp.Calendar,
   tableDescription:
     "Manage schedules for on-call duty policy escalation rules.",

package/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam.ts

@@ -53,8 +53,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 })
 @TableMetadata({
   tableName: "OnCallDutyPolicyEscalationRuleTeam",
-  singularName: "On-Call Duty Escalation Rule",
-  pluralName: "On-Call Duty Escalation Rules",
+  singularName: "Team On-Call Duty Escalation Rule",
+  pluralName: "Team On-Call Duty Escalation Rules",
   icon: IconProp.Call,
   tableDescription:
     "Manage on-call duty escalation rule for the on-call policy.",

package/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser.ts

@@ -52,8 +52,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 })
 @TableMetadata({
   tableName: "OnCallDutyPolicyEscalationRuleUser",
-  singularName: "On-Call Duty Escalation Rule",
-  pluralName: "On-Call Duty Esdcalation Rules",
+  singularName: "User's On-Call Duty Escalation Rule",
+  pluralName: "User's On-Call Duty Esdcalation Rules",
   icon: IconProp.Call,
   tableDescription:
     "Manage on-call duty escalation rule for the on-call policy.",

package/Models/DatabaseModels/OnCallDutyPolicyTimeLog.ts

@@ -55,8 +55,8 @@ import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 })
 @TableMetadata({
   tableName: "OnCallDutyPolicyTimeLog",
-  singularName: "User Override",
-  pluralName: "User Overrides",
+  singularName: "On Call Time Log",
+  pluralName: "On Call Time Logs",
   icon: IconProp.Call,
   tableDescription:
     "Manage on-call duty user overrides, for example if the user is on leave you can override the on-call duty policy for that user so all the alerts will be routed to the other user.",

package/Models/DatabaseModels/Probe.ts

@@ -71,7 +71,13 @@ export enum ProbeConnectionStatus {
     Permission.ProjectMember,
     Permission.CreateProjectProbe,
   ],
-  read: [Permission.Public],
+  read: [
+    Permission.Public,
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.ReadProjectProbe,
+  ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,

package/Models/DatabaseModels/ServiceCatalog.ts

@@ -80,8 +80,8 @@ import {
 @SlugifyColumn("name", "slug")
 @TableMetadata({
   tableName: "ServiceCatalog",
-  singularName: "Service",
-  pluralName: "Services",
+  singularName: "Service in Service Catalog",
+  pluralName: "Services in Service Catalog",
   icon: IconProp.SquareStack,
   tableDescription:
     "Service Catalog is a collection of services that you have in your organization. It can be a collection of services that you are monitoring or services that you are providing to your customers. It can be anything that you want to keep track of.",

package/Models/DatabaseModels/ServiceCopilotCodeRepository.ts

@@ -68,8 +68,8 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @CrudApiEndpoint(new Route("/service-copilot-code-repository"))
 @TableMetadata({
   tableName: "ServiceCopilotCodeRepository",
-  singularName: "Service",
-  pluralName: "Services",
+  singularName: "Service Code Repository for Copilot",
+  pluralName: "Service Code Repositories for Copilot",
   icon: IconProp.SquareStack,
   tableDescription:
     "Add services to your code repository to categorize and manage them easily. This will help copilot understand and generate code.",

package/Server/Middleware/ProjectAuthorization.ts

@@ -67,7 +67,7 @@ export default class ProjectMiddleware {
     next: NextFunction,
   ): Promise<void> {
     try {
-      const tenantId: ObjectID | null = this.getProjectId(req);
+      let tenantId: ObjectID | null = this.getProjectId(req);
 
       const apiKey: ObjectID | null = this.getApiKey(req);
 
@@ -81,19 +81,27 @@ export default class ProjectMiddleware {
 
       let apiKeyModel: ApiKey | null = null;
 
-      if (tenantId) {
+      if (apiKey) {
         apiKeyModel = await ApiKeyService.findOneBy({
           query: {
-            projectId: tenantId,
             apiKey: apiKey,
             expiresAt: QueryHelper.greaterThan(OneUptimeDate.getCurrentDate()),
           },
           select: {
             _id: true,
+            projectId: true,
           },
           props: { isRoot: true },
         });
 
+        tenantId = apiKeyModel?.projectId || null;
+
+        if (!tenantId) {
+          throw new BadDataException(
+            "Project ID not found for the provided API Key.",
+          );
+        }
+
         if (apiKeyModel) {
           (req as OneUptimeRequest).userType = UserType.API;
           // TODO: Add API key permissions.

package/Server/Services/OpenTelemetryIngestService.ts

@@ -125,18 +125,22 @@ export default class OTelIngestService {
 
     const newDbMetric: Metric = Metric.fromJSON(
       dbMetric.toJSON(),
-      Metric,
+      Metric
     ) as Metric;
 
-    newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"] as number;
-    newDbMetric.startTime = OneUptimeDate.fromUnixNano(
-      datapoint["startTimeUnixNano"] as number,
-    );
+    if (datapoint["startTimeUnixNano"]) {
+      newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"] as number;
+      newDbMetric.startTime = OneUptimeDate.fromUnixNano(
+        datapoint["startTimeUnixNano"] as number
+      );
+    }
 
-    newDbMetric.timeUnixNano = datapoint["timeUnixNano"] as number;
-    newDbMetric.time = OneUptimeDate.fromUnixNano(
-      datapoint["timeUnixNano"] as number,
-    );
+    if (datapoint["timeUnixNano"]) {
+      newDbMetric.timeUnixNano = datapoint["timeUnixNano"] as number;
+      newDbMetric.time = OneUptimeDate.fromUnixNano(
+        datapoint["timeUnixNano"] as number
+      );
+    }
 
     if (Object.keys(datapoint).includes("asInt")) {
       newDbMetric.value = datapoint["asInt"] as number;

package/Server/Utils/AnalyticsDatabase/Statement.ts

@@ -169,7 +169,6 @@ export class Statement implements BaseQueryParams {
       [TableColumnType.Decimal]: "Double",
       [TableColumnType.Date]: "DateTime",
       [TableColumnType.JSON]: "JSON",
-      [TableColumnType.NestedModel]: "Nested",
       [TableColumnType.ArrayNumber]: "Array(Int32)",
       [TableColumnType.ArrayText]: "Array(String)",
       [TableColumnType.LongNumber]: "Int128",

package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts

@@ -53,12 +53,18 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
     const whereStatement: Statement = this.toWhereStatement(updateBy.query);
 
     /* eslint-disable prettier/prettier */
-        const statement: Statement = SQL`
-            ALTER TABLE ${this.database.getDatasourceOptions().database!}.${this.model.tableName
+    const statement: Statement = SQL`
+            ALTER TABLE ${this.database.getDatasourceOptions().database!}.${
+              this.model.tableName
             }
-            UPDATE `.append(setStatement).append(SQL`
-            WHERE TRUE `).append(whereStatement);
-        /* eslint-enable prettier/prettier */
+            UPDATE `
+      .append(setStatement)
+      .append(
+        SQL`
+            WHERE TRUE `
+      )
+      .append(whereStatement);
+    /* eslint-enable prettier/prettier */
 
     logger.debug(`${this.model.tableName} Update Statement`);
     logger.debug(statement);
@@ -71,27 +77,7 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
   ): Array<string> {
     const columnNames: Array<string> = [];
     for (const column of tableColumns) {
-      if (column.type === TableColumnType.NestedModel) {
-        // Example of nested model query:
-
-        /**
-                 * 
-                 * INSERT INTO opentelemetry_spans (trace_id, span_id, attributes.key, attributes.value) VALUES 
-                    ('trace1', 'span1', ['key1', 'key2'], ['value1', 'value2']),
-                    ('trace2', 'span2', ['keyA', 'keyB'], ['valueA', 'valueB']);
-                 */
-
-        // Nested Model Support.
-        const nestedModelColumnNames: Array<string> = this.getColumnNames(
-          column.nestedModel!.tableColumns,
-        );
-
-        for (const nestedModelColumnName of nestedModelColumnNames) {
-          columnNames.push(`${column.key}.${nestedModelColumnName}`);
-        }
-      } else {
-        columnNames.push(column.key);
-      }
+      columnNames.push(column.key);
     }
 
     return columnNames;
@@ -168,45 +154,12 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
     const record: Record = [];
 
     for (const column of item.getTableColumns()) {
-      if (column.type === TableColumnType.NestedModel) {
-        // Nested Model Support.
-
-        // THis is very werid, but the output should work in a query like this:
-
-        /**
-                 * 
-                 * INSERT INTO opentelemetry_spans (trace_id, span_id, attributes.key, attributes.value) VALUES 
-                    ('trace1', 'span1', ['key1', 'key2'], ['value1', 'value2']),
-                    ('trace2', 'span2', ['keyA', 'keyB'], ['valueA', 'valueB']);
-                 */
-
-        for (const subColumn of column.nestedModel!.tableColumns) {
-          const subRecord: Record = [];
-
-          for (const nestedModelItem of item.getColumnValue(
-            column.key,
-          ) as Array<CommonModel>) {
-            const value: RecordValue = this.sanitizeValue(
-              nestedModelItem.getColumnValue(subColumn.key),
-              subColumn,
-              {
-                isNestedModel: true,
-              },
-            );
-
-            subRecord.push(value);
-          }
-
-          record.push(subRecord);
-        }
-      } else {
-        const value: RecordValue | undefined = this.sanitizeValue(
-          item.getColumnValue(column.key),
-          column,
-        );
+      const value: RecordValue | undefined = this.sanitizeValue(
+        item.getColumnValue(column.key),
+        column,
+      );
 
-        record.push(value);
-      }
+      record.push(value);
     }
 
     return record;
@@ -625,16 +578,6 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
         columns.append(SQL`, `);
       }
 
-      let nestedModelColumns: Statement | null = null;
-
-      if (column.type === TableColumnType.NestedModel) {
-        nestedModelColumns = SQL`(`
-          .append(
-            this.toColumnsCreateStatement(column.nestedModel!.tableColumns),
-          )
-          .append(SQL`)`);
-      }
-
       // special case - ClickHouse does not support using an a query parameter
       // to specify the column name when creating the table
       const keyStatement: string = column.key;
@@ -649,10 +592,6 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
                 .append(this.toColumnType(column.type))
                 .append(SQL`)`),
         );
-
-      if (nestedModelColumns) {
-        columns.append(SQL` `).append(nestedModelColumns);
-      }
     }
 
     return columns;
@@ -672,26 +611,34 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
       "Array(String)": TableColumnType.ArrayText,
       "Array(Int32)": TableColumnType.ArrayNumber,
       JSON: TableColumnType.JSON, //JSONArray is also JSON
-      Nested: TableColumnType.NestedModel,
       Bool: TableColumnType.Boolean,
     }[clickhouseType];
   }
 
   public toColumnType(type: TableColumnType): Statement {
-    return {
+    const statement: Statement | undefined = {
       [TableColumnType.Text]: SQL`String`,
       [TableColumnType.ObjectID]: SQL`String`,
       [TableColumnType.Boolean]: SQL`Bool`,
       [TableColumnType.Number]: SQL`Int32`,
       [TableColumnType.Decimal]: SQL`Double`,
+      [TableColumnType.IP]: SQL`String`,
+      [TableColumnType.Port]: SQL`String`,
       [TableColumnType.Date]: SQL`DateTime`,
       [TableColumnType.JSON]: SQL`String`, // we use JSON as a string because ClickHouse has really good JSON support for string types
       [TableColumnType.JSONArray]: SQL`String`, // we use JSON as a string because ClickHouse has really good JSON support for string types
-      [TableColumnType.NestedModel]: SQL`Nested`,
       [TableColumnType.ArrayNumber]: SQL`Array(Int32)`,
       [TableColumnType.ArrayText]: SQL`Array(String)`,
       [TableColumnType.LongNumber]: SQL`Int128`,
     }[type];
+
+    if (!statement) {
+      throw new BadDataException(
+        `Unknown column type: ${type}. Please add support for this column type.`,
+      );
+    }
+
+    return statement;
   }
 
   public toDoesColumnExistStatement(columnName: string): string {