From 108dfaccf8db80d461bec8ee6def7976a26548fc Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Wed, 6 Nov 2024 13:42:25 +0000 Subject: [PATCH] Remove MonitorMetricsByMinute model and related service and job files --- .../AnalyticsModels/MonitorMetricsByMinute.ts | 177 ------------------ .../Services/MonitorMetricsByMinuteService.ts | 14 -- .../MonitorMetrics/MonitorMetricsByMinute.ts | 25 --- 3 files changed, 216 deletions(-) delete mode 100644 Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts delete mode 100644 Common/Server/Services/MonitorMetricsByMinuteService.ts delete mode 100644 Worker/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts diff --git a/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts b/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts deleted file mode 100644 index 5983d567e5..0000000000 --- a/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts +++ /dev/null @@ -1,177 +0,0 @@ -import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; -import Route from "../../Types/API/Route"; -import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine"; -import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; -import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType"; -import BrowserType from "../../Types/BrowserType"; -import { JSONObject } from "../../Types/JSON"; -import { CheckOn } from "../../Types/Monitor/CriteriaFilter"; -import ObjectID from "../../Types/ObjectID"; -import Permission from "../../Types/Permission"; -import ScreenSizeType from "../../Types/ScreenSizeType"; - -export interface MonitorMetricsMiscData { - diskPath?: string; - probeId?: string; - browserType?: BrowserType; - screenSizeType?: ScreenSizeType; -} - -export default class MonitorMetricsByMinute extends AnalyticsBaseModel { - public constructor() { - super({ - tableName: "MonitorMetrics", - tableEngine: AnalyticsTableEngine.MergeTree, - singularName: "Monitor Metric", - pluralName: "Monitor Metrics", - accessControl: { - read: [ - Permission.ProjectOwner, - Permission.ProjectAdmin, - Permission.ProjectMember, - Permission.ReadProjectMonitor, - ], - create: [], - update: [], - delete: [], - }, - crudApiPath: new Route("/monitor-metrics"), - tableColumns: [ - new AnalyticsTableColumn({ - key: "projectId", - title: "Project ID", - description: "ID of project", - required: true, - type: TableColumnType.ObjectID, - isTenantId: true, - accessControl: { - read: [ - Permission.ProjectOwner, - Permission.ProjectAdmin, - Permission.ProjectMember, - Permission.ReadProjectMonitor, - ], - create: [], - update: [], - }, - }), - - new AnalyticsTableColumn({ - key: "monitorId", - title: "Monitor ID", - description: "ID of the Monitor which this metric belongs to", - required: true, - type: TableColumnType.ObjectID, - accessControl: { - read: [ - Permission.ProjectOwner, - Permission.ProjectAdmin, - Permission.ProjectMember, - Permission.ReadProjectMonitor, - ], - create: [], - update: [], - }, - }), - - new AnalyticsTableColumn({ - key: "metricType", - title: "Metric Type", - description: "Type of metric", - required: true, - type: TableColumnType.Text, - accessControl: { - read: [ - Permission.ProjectOwner, - Permission.ProjectAdmin, - Permission.ProjectMember, - Permission.ReadProjectMonitor, - ], - create: [], - update: [], - }, - }), - - new AnalyticsTableColumn({ - key: "metricValue", - title: "Metric Value", - description: "Value of the metric", - required: true, - type: TableColumnType.Number, - accessControl: { - read: [ - Permission.ProjectOwner, - Permission.ProjectAdmin, - Permission.ProjectMember, - Permission.ReadProjectMonitor, - ], - create: [], - update: [], - }, - }), - - new AnalyticsTableColumn({ - key: "miscData", - title: "Misc Data", - description: "Misc data for the metric (if any)", - required: false, - type: TableColumnType.JSON, - accessControl: { - read: [ - Permission.ProjectOwner, - Permission.ProjectAdmin, - Permission.ProjectMember, - Permission.ReadProjectMonitor, - ], - create: [], - update: [], - }, - }), - ], - sortKeys: ["projectId", "monitorId", "createdAt"], - primaryKeys: ["projectId", "monitorId"], - }); - } - - public get projectId(): ObjectID | undefined { - return this.getColumnValue("projectId") as ObjectID | undefined; - } - - public set projectId(v: ObjectID | undefined) { - this.setColumnValue("projectId", v); - } - - public get monitorId(): ObjectID | undefined { - return this.getColumnValue("monitorId") as ObjectID | undefined; - } - - public set monitorId(v: ObjectID | undefined) { - this.setColumnValue("monitorId", v); - } - - public get metricType(): CheckOn | undefined { - return this.getColumnValue("metricType") as CheckOn | undefined; - } - - public set metricType(v: CheckOn | undefined) { - this.setColumnValue("metricType", v); - } - - public get metricValue(): number | undefined { - return this.getColumnValue("metricValue") as number | undefined; - } - - public set metricValue(v: number | undefined) { - this.setColumnValue("metricValue", v); - } - - public get miscData(): MonitorMetricsMiscData | undefined { - return this.getColumnValue("miscData") as - | MonitorMetricsMiscData - | undefined; - } - - public set miscData(v: MonitorMetricsMiscData | undefined) { - this.setColumnValue("miscData", v as JSONObject); - } -} diff --git a/Common/Server/Services/MonitorMetricsByMinuteService.ts b/Common/Server/Services/MonitorMetricsByMinuteService.ts deleted file mode 100644 index 9048df5886..0000000000 --- a/Common/Server/Services/MonitorMetricsByMinuteService.ts +++ /dev/null @@ -1,14 +0,0 @@ -import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; -import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute"; - -export class MonitorMetricsByMinuteService extends AnalyticsDatabaseService { - public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { - super({ - modelType: MonitorMetricsByMinute, - database: clickhouseDatabase, - }); - } -} - -export default new MonitorMetricsByMinuteService(); diff --git a/Worker/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts b/Worker/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts deleted file mode 100644 index bb21a04920..0000000000 --- a/Worker/Jobs/MonitorMetrics/MonitorMetricsByMinute.ts +++ /dev/null @@ -1,25 +0,0 @@ -import RunCron from "../../Utils/Cron"; -import LessThan from "Common/Types/BaseDatabase/LessThan"; -import OneUptimeDate from "Common/Types/Date"; -import { EVERY_MINUTE } from "Common/Utils/CronTime"; -import MonitorMetricsByMinuteService from "Common/Server/Services/MonitorMetricsByMinuteService"; - -// Schedule a cron job to run every minute -RunCron( - "MonitorMetrics:HardDeleteMonitorMetricsByMinute", - { schedule: EVERY_MINUTE, runOnStartup: false }, - async () => { - // Calculate the timestamp for one hour ago - const oneHourAgo: Date = OneUptimeDate.getSomeMinutesAgo(60); - - // Delete all monitor metrics older than one hour - await MonitorMetricsByMinuteService.deleteBy({ - query: { - createdAt: new LessThan(oneHourAgo), - }, - props: { - isRoot: true, - }, - }); - }, -);