@oneuptime/common 7.0.3225 → 7.0.3227

package/Models/AnalyticsModels/Index.ts

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

package/Models/AnalyticsModels/Metric.ts

@@ -19,6 +19,11 @@ export enum MetricPointType {
   ExponentialHistogram = "ExponentialHistogram",
 }
 
+export enum ServiceType {
+  OpenTelemetry = "OpenTelemetry",
+  Monitor = "Monitor",
+}
+
 export default class Metric extends AnalyticsBaseModel {
   public constructor() {
     super({
@@ -78,10 +83,11 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
 
+        // this can also be the monitor id or the telemetry service id.
         new AnalyticsTableColumn({
           key: "serviceId",
           title: "Service ID",
-          description: "ID of the Service which created the log",
+          description: "ID of the Service which created the Metric",
           required: true,
           type: TableColumnType.ObjectID,
           accessControl: {
@@ -101,6 +107,30 @@ export default class Metric extends AnalyticsBaseModel {
           },
         }),
 
+        // this can also be the monitor id or the telemetry service id.
+        new AnalyticsTableColumn({
+          key: "serviceType",
+          title: "Service Type",
+          description: "Type of the service that this telemetry belongs to",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
         // add name and description
 
         new AnalyticsTableColumn({
@@ -539,6 +569,10 @@ export default class Metric extends AnalyticsBaseModel {
     return this.getColumnValue("serviceId") as ObjectID | undefined;
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
   public get name(): string | undefined {
     return this.getColumnValue("name") as string | undefined;
   }
@@ -595,6 +629,10 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public get time(): Date | undefined {
     return this.getColumnValue("time") as Date | undefined;
   }

package/Server/API/BaseAnalyticsAPI.ts

@@ -291,6 +291,17 @@ export default class BaseAnalyticsAPI<
       ) as any;
     }
 
+    let groupBy: GroupBy<AnalyticsDataModel> | null =
+      req.body["groupBy"] || null;
+
+    if (groupBy && Object.keys(groupBy).length > 0) {
+      groupBy = JSONFunctions.deserialize(groupBy as JSONObject) as any;
+    }
+
+    if (groupBy && Object.keys(groupBy).length === 0) {
+      groupBy = null;
+    }
+
     if (!aggregateBy) {
       throw new BadRequestException("AggregateBy is required");
     }

package/Server/Services/AnalyticsDatabaseService.ts

@@ -259,6 +259,11 @@ export default class AnalyticsDatabaseService<
 
       // convert date column from string to date.
 
+      const groupByColumnName: keyof TBaseModel | undefined =
+        aggregateBy.groupBy && Object.keys(aggregateBy.groupBy).length > 0
+          ? (Object.keys(aggregateBy.groupBy)[0] as keyof TBaseModel)
+          : undefined;
+
       for (const item of items) {
         if (
           !(item as JSONObject)[
@@ -277,6 +282,9 @@ export default class AnalyticsDatabaseService<
           value: (item as JSONObject)[
             aggregateBy.aggregateColumnName as string
           ] as number,
+          [groupByColumnName as string]: (item as JSONObject)[
+            groupByColumnName as string
+          ],
         };
 
         aggregatedItems.push(aggregatedModel);
@@ -457,7 +465,7 @@ export default class AnalyticsDatabaseService<
                 count()
             FROM ${databaseName}.${this.model.tableName}
             WHERE TRUE `.append(whereStatement);
-    
+
 
     if (countBy.groupBy && Object.keys(countBy.groupBy).length > 0) {
       statement.append(
@@ -519,9 +527,11 @@ export default class AnalyticsDatabaseService<
     statement.append(SQL` FROM ${databaseName}.${this.model.tableName}`);
     statement.append(SQL` WHERE TRUE `).append(whereStatement);
 
-   
-      statement.append(SQL` GROUP BY `).append(`${aggregateBy.aggregationTimestampColumnName.toString()}`);
-   
+    statement.append(SQL` GROUP BY `).append(`${aggregateBy.aggregationTimestampColumnName.toString()}`);
+
+    if (aggregateBy.groupBy && Object.keys(aggregateBy.groupBy).length > 0) {
+      statement.append(SQL` , `).append(this.statementGenerator.toGroupByStatement(aggregateBy.groupBy));
+    }
 
     statement.append(SQL` ORDER BY `).append(sortStatement);
 
@@ -538,7 +548,7 @@ export default class AnalyticsDatabaseService<
     }}
         `);
 
-    
+
 
     logger.debug(`${this.model.tableName} Aggregate Statement`);
     logger.debug(statement);
@@ -604,7 +614,7 @@ export default class AnalyticsDatabaseService<
     }}
         `);
 
-    
+
 
     logger.debug(`${this.model.tableName} Find Statement`);
     logger.debug(statement);
@@ -626,7 +636,7 @@ export default class AnalyticsDatabaseService<
     const statement: Statement = SQL`
             ALTER TABLE ${databaseName}.${this.model.tableName}
             DELETE WHERE TRUE `.append(whereStatement);
-    
+
 
     logger.debug(`${this.model.tableName} Delete Statement`);
     logger.debug(statement);

package/Server/Services/DatabaseService.ts

@@ -437,10 +437,10 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
     const columns: Columns = this.model.getTableColumns();
 
     for (const columnName of columns.columns) {
-      if (this.model.isEntityColumn(columnName)) {
-        const tableColumnMetadata: TableColumnMetadata =
-          this.model.getTableColumnMetadata(columnName);
+      const tableColumnMetadata: TableColumnMetadata =
+        this.model.getTableColumnMetadata(columnName);
 
+      if (this.model.isEntityColumn(columnName)) {
         const columnValue: JSONValue = (data as any)[columnName];
 
         if (
@@ -507,6 +507,14 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
           (data as any)[columnName] = columnValue.toString();
         }
       }
+
+      // if its a Date column and if date is null then set it to null.
+      if (
+        (data as any)[columnName] === "" &&
+        tableColumnMetadata.type === TableColumnType.Date
+      ) {
+        (data as any)[columnName] = null;
+      }
     }
 
     // check createByUserId.

package/Server/Services/Index.ts

@@ -41,7 +41,6 @@ import MonitorGroupOwnerTeamService from "./MonitorGroupOwnerTeamService";
 import MonitorGroupOwnerUserService from "./MonitorGroupOwnerUserService";
 import MonitorGroupResourceService from "./MonitorGroupResourceService";
 import MonitorGroupService from "./MonitorGroupService";
-import MonitorMetricsByMinuteService from "./MonitorMetricsByMinuteService";
 import MonitorOwnerTeamService from "./MonitorOwnerTeamService";
 import MonitorOwnerUserService from "./MonitorOwnerUserService";
 import MonitorProbeService from "./MonitorProbeService";
@@ -316,7 +315,6 @@ export const AnalyticsServices: Array<
   LogService,
   SpanService,
   MetricService,
-  MonitorMetricsByMinuteService,
   TelemetryAttributeService,
   ExceptionInstanceService,
 ];

package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts

@@ -548,11 +548,25 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
       `${aggregationMethod}(${aggregateBy.aggregateColumnName.toString()}) as ${aggregateBy.aggregateColumnName.toString()}, date_trunc('${aggregationInterval.toLowerCase()}', toStartOfInterval(${aggregateBy.aggregationTimestampColumnName.toString()}, INTERVAL 1 ${aggregationInterval.toLowerCase()})) as ${aggregateBy.aggregationTimestampColumnName.toString()}`,
     );
 
+    const columns: Array<string> = [
+      aggregateBy.aggregateColumnName.toString(),
+      aggregateBy.aggregationTimestampColumnName.toString(),
+    ];
+
+    if (aggregateBy.groupBy && Object.keys(aggregateBy.groupBy).length > 0) {
+      const groupByStatement: Statement = this.toGroupByStatement(
+        aggregateBy.groupBy,
+      );
+      selectStatement.append(SQL`, `).append(groupByStatement);
+
+      // add to columns.
+      for (const key in aggregateBy.groupBy) {
+        columns.push(key);
+      }
+    }
+
     return {
-      columns: [
-        aggregateBy.aggregateColumnName.toString(),
-        aggregateBy.aggregationTimestampColumnName.toString(),
-      ],
+      columns: columns,
       statement: selectStatement,
     };
   }

package/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts

@@ -1,4 +1,3 @@
-import MonitorMetricsByMinuteService from "../../../Services/MonitorMetricsByMinuteService";
 import Query from "../../../Types/AnalyticsDatabase/Query";
 import GreaterThanOrEqual from "Common/Types/BaseDatabase/GreaterThanOrEqual";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
@@ -10,7 +9,9 @@ import {
   EvaluateOverTimeType,
 } from "Common/Types/Monitor/CriteriaFilter";
 import ObjectID from "Common/Types/ObjectID";
-import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
+import Metric from "../../../../Models/AnalyticsModels/Metric";
+import MonitorMetricTypeUtil from "../../../../Utils/Monitor/MonitorMetricType";
+import MetricService from "../../../Services/MetricService";
 
 export default class EvaluateOverTime {
   public static async getValueOverTime(data: {
@@ -27,36 +28,35 @@ export default class EvaluateOverTime {
 
     // TODO: Query over miscData
 
-    const query: Query<MonitorMetricsByMinute> = {
+    const query: Query<Metric> = {
       createdAt: new GreaterThanOrEqual(lastMinutesDate),
-      monitorId: data.monitorId,
-      metricType: data.metricType,
+      serviceId: data.monitorId,
+      name: MonitorMetricTypeUtil.getMonitorMeticTypeByCheckOn(data.metricType),
     };
 
     if (data.miscData) {
-      query.miscData = data.miscData;
+      query.attributes = data.miscData;
     }
 
-    const monitorMetricsItems: Array<MonitorMetricsByMinute> =
-      await MonitorMetricsByMinuteService.findBy({
-        query: query,
-        limit: LIMIT_PER_PROJECT,
-        skip: 0,
-        props: {
-          isRoot: true,
-        },
-        select: {
-          metricValue: true,
-        },
-      });
+    const monitorMetricsItems: Array<Metric> = await MetricService.findBy({
+      query: query,
+      limit: LIMIT_PER_PROJECT,
+      skip: 0,
+      props: {
+        isRoot: true,
+      },
+      select: {
+        value: true,
+      },
+    });
 
     const values: Array<number | boolean> = monitorMetricsItems
-      .map((item: MonitorMetricsByMinute) => {
+      .map((item: Metric) => {
         if (data.metricType === CheckOn.IsOnline) {
-          return item.metricValue === 1;
+          return item.value === 1;
         }
 
-        return item.metricValue;
+        return item.value;
       })
       .filter((value: number | boolean | undefined) => {
         return value !== undefined;