refactor monitor stats

This commit is contained in:
Alex Holliday committed 2026-01-05 19:45:30 +00:00
1 parent 36cdb20dfc
commit 7aae57e9ab
13 files changed
+189 -53

No files matched your search

@@ -2,6 +2,7 @@ import mongoose, { Schema } from "mongoose";
import { MonitorStatus, MonitorStatuses } from "@/types/domain/index.js";
export interface IMonitorStats extends mongoose.Document {
_id: mongoose.Types.ObjectId;
monitorId: mongoose.Types.ObjectId;
avgResponseTime: number;
maxResponseTime: number;
+13 -3
View File
@@ -36,23 +36,32 @@ import { MeService } from "@/services/index.js";
import {
MongoMonitorRepository,
MongoChecksRepository,
MongoMonitorStatsRepository,
} from "@/repositories/index.js";
export const initServices = async () => {
const monitorRepository = new MongoMonitorRepository();
const checksRepository = new MongoChecksRepository();
const monitorStatsRepository = new MongoMonitorStatsRepository();
const checkService = new CheckService();
const inviteService = new InviteService();
const maintenanceService = new MaintenanceService();
const monitorStatsService = new MonitorStatsService();
const monitorStatsService = new MonitorStatsService(
monitorRepository,
monitorStatsRepository
);
const notificationChannelService = new NotificationChannelService();
const userService = new UserService();
const discordService = new DiscordService();
const slackService = new SlackService();
const webhookService = new WebhookService();
const networkService = new NetworkService(got);
const statusService = new StatusService(monitorRepository);
const statusService = new StatusService(
monitorRepository,
monitorStatsRepository
);
// If desired in future, use repository for stats as well
const settingsService = new SettingsService();
const stripeService = new StripeService();
const billingService = new BillingService();
@@ -85,7 +94,8 @@ export const initServices = async () => {
const monitorService = new MonitorService(
jobQueue,
monitorRepository,
checksRepository
checksRepository,
monitorStatsRepository
);
const queueService = new QueueService(jobQueue);
const teamService = new TeamService(jobQueue, monitorRepository);
@@ -580,7 +580,7 @@ class MongoCheckRepository implements IChecksRepository {
return base;
});
return checks;
return checks.map(this.toAggregateCheck);
};
}
+3
View File
@@ -6,3 +6,6 @@ export { default as MongoMonitorRepository } from "@/repositories/monitors/Mongo
export type { IChecksRepository } from "@/repositories/checks/IChecksRepository.js";
export { default as MongoChecksRepository } from "@/repositories/checks/MongoCheckRepository.js";
export type { IMonitorStatsRepository } from "@/repositories/monitor-stats/IMonitorStatsRepository.js";
export { default as MongoMonitorStatsRepository } from "@/repositories/monitor-stats/MongoMonitorStatsRepository.js";
@@ -0,0 +1,17 @@
import type { MonitorStats } from "@/types/domain/index.js";
export interface IMonitorStatsRepository {
// create
create: (monitorStatsData: Partial<MonitorStats>) => Promise<MonitorStats>;
// single fetch
findByMonitorId: (monitorId: string) => Promise<MonitorStats>;
// collection fetch
// update
updateByMonitorId: (
monitorId: string,
updateData: Partial<MonitorStats>
) => Promise<MonitorStats>;
// delete`
deleteManyExcludedByMonitorIds: (monitorIds: string[]) => Promise<number>;
}
export default IMonitorStatsRepository;
@@ -0,0 +1,66 @@
import type { IMonitorStats } from "@/db/models/index.js";
import { MonitorStats } from "@/db/models/index.js";
import type { IMonitorStatsRepository } from "@/repositories/monitor-stats/IMonitorStatsRepository.js";
import type { MonitorStats as MonitorStatsEntity } from "@/types/domain/monitorStats.js";
import ApiError from "@/utils/ApiError.js";
class MongoMonitorStatsRepository implements IMonitorStatsRepository {
private toEntity(doc: IMonitorStats): MonitorStatsEntity {
return {
id: doc._id.toString(),
monitorId: doc.monitorId.toString(),
avgResponseTime: doc.avgResponseTime,
maxResponseTime: doc.maxResponseTime,
lastResponseTime: doc.lastResponseTime,
totalChecks: doc.totalChecks,
totalUpChecks: doc.totalUpChecks,
totalDownChecks: doc.totalDownChecks,
uptimePercentage: doc.uptimePercentage,
lastCheckTimestamp: doc.lastCheckTimestamp,
timeOfLastFailure: doc.timeOfLastFailure,
currentStreak: doc.currentStreak,
currentStreakStatus: doc.currentStreakStatus,
currentStreakStartedAt: doc.currentStreakStartedAt,
certificateExpiry: doc.certificateExpiry ?? null,
createdAt: doc.createdAt,
updatedAt: doc.updatedAt,
};
}
create = async (monitorStatsData: Partial<MonitorStatsEntity>) => {
const monitorStats = await MonitorStats.create(monitorStatsData);
return this.toEntity(monitorStats);
};
findByMonitorId = async (monitorId: string) => {
const monitorStats = await MonitorStats.findOne({ monitorId });
if (!monitorStats) {
throw new ApiError("Monitor stats not found", 404);
}
return this.toEntity(monitorStats);
};
updateByMonitorId = async (
monitorId: string,
updateData: Partial<MonitorStatsEntity>
) => {
const monitorStats = await MonitorStats.findOneAndUpdate(
{ monitorId },
updateData,
{ new: true }
);
if (!monitorStats) {
throw new ApiError("Monitor stats not found", 404);
}
return this.toEntity(monitorStats);
};
deleteManyExcludedtByMonitorIds = async (monitorIds: string[]) => {
const result = await MonitorStats.deleteMany({
monitorId: { $nin: monitorIds },
});
return result.deletedCount ?? 0;
};
}
export default MongoMonitorStatsRepository;
+13 -13
View File
@@ -1,11 +1,14 @@
import { MonitorStats } from "@/db/models/index.js";
import ApiError from "@/utils/ApiError.js";
import { IJobQueue } from "@/services/infrastructure/JobQueue.js";
import { MonitorWithChecksResponse } from "@/types/index.js";
import { MonitorStatus } from "@/types/domain/index.js";
import { Entitlements } from "@/types/entitlements.js";
import { getStartDate } from "@/utils/TimeUtils.js";
import { IMonitorRepository, IChecksRepository } from "@/repositories/index.js";
import {
IMonitorRepository,
IChecksRepository,
IMonitorStatsRepository,
} from "@/repositories/index.js";
import type { Monitor, MonitorType } from "@/types/domain/index.js";
export enum MonitorImportCode {
@@ -86,15 +89,18 @@ class MonitorService implements IMonitorService {
private jobQueue: IJobQueue;
private monitorRepository: IMonitorRepository;
private checksRepository: IChecksRepository;
private monitorStatsRepository: IMonitorStatsRepository;
constructor(
jobQueue: IJobQueue,
monitorRepository: IMonitorRepository,
checksRepository: IChecksRepository
checksRepository: IChecksRepository,
monitorStatsRepository: IMonitorStatsRepository
) {
this.SERVICE_NAME = SERVICE_NAME;
this.jobQueue = jobQueue;
this.monitorRepository = monitorRepository;
this.checksRepository = checksRepository;
this.monitorStatsRepository = monitorStatsRepository;
}
create = async (
@@ -109,7 +115,7 @@ class MonitorService implements IMonitorService {
currentTeamId,
monitorData
);
await MonitorStats.create({
await this.monitorStatsRepository.create({
monitorId: monitor.id,
currentStreakStartedAt: Date.now(),
});
@@ -186,13 +192,7 @@ class MonitorService implements IMonitorService {
throw new ApiError("Monitor not found", 404);
}
const stats = await MonitorStats.findOne({
monitorId: monitor.id,
});
if (!stats) {
throw new ApiError("Monitor stats not found", 404);
}
const stats = await this.monitorStatsRepository.findByMonitorId(monitor.id);
const startDate = getStartDate(range);
@@ -206,7 +206,7 @@ class MonitorService implements IMonitorService {
return {
checks,
monitor,
stats,
stats: (stats as any) || undefined,
};
} else {
const checks = await this.checksRepository.findRecentChecksByMonitor(
@@ -217,7 +217,7 @@ class MonitorService implements IMonitorService {
return {
checks,
monitor,
stats,
stats: (stats as any) || undefined,
};
}
};
@@ -1,4 +1,7 @@
import { Monitor, MonitorStats } from "@/db/models/index.js";
import type {
IMonitorRepository,
IMonitorStatsRepository,
} from "@/repositories/index.js";
import { getChildLogger } from "@/logger/Logger.js";
const SERVICE_NAME = "MonitorStatsService";
@@ -9,17 +12,28 @@ export interface IMonitorStatsService {
class MonitorStatsService implements IMonitorStatsService {
public SERVICE_NAME: string;
constructor() {
private monitorRepository: IMonitorRepository;
private monitorStatsRepository: IMonitorStatsRepository;
constructor(
monitorRepository: IMonitorRepository,
monitorStatsRepository: IMonitorStatsRepository
) {
this.SERVICE_NAME = SERVICE_NAME;
this.monitorRepository = monitorRepository;
this.monitorStatsRepository = monitorStatsRepository;
}
async cleanupOrphanedMonitorStats() {
try {
const monitorIds = await Monitor.find().distinct("_id");
const result = await MonitorStats.deleteMany({
monitorId: { $nin: monitorIds },
});
logger.info(`Deleted ${result.deletedCount} orphaned MonitorStats.`);
const monitorIds = (await this.monitorRepository.findAll()).map(
(m) => m.id
);
const deletedCount =
await this.monitorStatsRepository.deleteManyExcludedByMonitorIds(
monitorIds
);
logger.info(`Deleted ${deletedCount} orphaned MonitorStats.`);
return true;
} catch (error) {
logger.error("Error cleaning up orphaned MonitorStats:", error);
@@ -1,4 +1,3 @@
import { IMonitor } from "@/db/models/index.js";
import { INetworkService } from "./NetworkService.js";
import { ICheckService } from "../business/CheckService.js";
import { IMonitorStatsService } from "../business/MonitorStatsService.js";
@@ -9,12 +8,12 @@ import { IIncidentService } from "../business/IncidentService.js";
import { IStatsAggregationService } from "@/services/business/StatsAggregationService.js";
import ApiError from "@/utils/ApiError.js";
import { getChildLogger } from "@/logger/Logger.js";
import type { Monitor as MonitorEntity } from "@/types/domain/index.js";
import type { Monitor } from "@/types/domain/index.js";
const SERVICE_NAME = "JobGenerator";
const logger = getChildLogger(SERVICE_NAME);
export interface IJobGenerator {
generateJob: () => (monitor: MonitorEntity) => Promise<void>;
generateJob: () => (monitor: Monitor) => Promise<void>;
generateCleanupJob: () => () => Promise<void>;
}
@@ -51,7 +50,7 @@ class JobGenerator implements IJobGenerator {
}
generateJob = () => {
return async (monitor: MonitorEntity) => {
return async (monitor: Monitor) => {
try {
const monitorId = monitor.id.toString();
if (!monitorId) {
@@ -1,6 +1,5 @@
import UserService from "../business/UserService.js";
import {
IMonitor,
Monitor,
NotificationChannel,
INotificationChannel,
@@ -1,14 +1,11 @@
import {
IMonitor,
IMonitorStats,
MonitorStats,
ICheck,
} from "@/db/models/index.js";
import { ICheck } from "@/db/models/index.js";
import { StatusResponse } from "./NetworkService.js";
import { IMonitorRepository } from "@/repositories/index.js";
import type { Monitor as MonitorEntity } from "@/types/domain/index.js";
import {
IMonitorRepository,
IMonitorStatsRepository,
} from "@/repositories/index.js";
import type { Monitor, MonitorStats } from "@/types/domain/index.js";
import ApiError from "@/utils/ApiError.js";
// Using compact latestStatuses on Monitor for transition checks
const emptyMetrics = (): ThresholdEvaluationResult["metrics"] => ({
cpu: { breached: false },
@@ -39,41 +36,46 @@ const MAX_LATEST_CHECKS = 25;
export interface IStatusService {
updateMonitorStatus: (
monitor: MonitorEntity,
monitor: Monitor,
status: StatusResponse
) => Promise<StatusChangeResult>;
calculateAvgResponseTime: (
stats: IMonitorStats,
stats: MonitorStats,
statusResponse: StatusResponse
) => number;
updateMonitorStats: (
monitor: MonitorEntity,
monitor: Monitor,
status: StatusResponse,
statusChanged: boolean
) => Promise<IMonitorStats | null>;
) => Promise<MonitorStats | null>;
evaluateThresholds: (
monitor: MonitorEntity,
monitor: Monitor,
check: ICheck
) => Promise<ThresholdEvaluationResult>;
}
export type StatusChangeResult = [
updatedMonitor: MonitorEntity,
updatedMonitor: Monitor,
statusChanged: boolean
];
class StatusService implements IStatusService {
public SERVICE_NAME: string;
private monitorRepository: IMonitorRepository;
constructor(monitorRepository: IMonitorRepository) {
private monitorStatsRepository: IMonitorStatsRepository;
constructor(
monitorRepository: IMonitorRepository,
monitorStatsRepository: IMonitorStatsRepository
) {
this.SERVICE_NAME = SERVICE_NAME;
this.monitorRepository = monitorRepository;
this.monitorStatsRepository = monitorStatsRepository;
}
updateMonitorStatus = async (
monitor: MonitorEntity,
monitor: Monitor,
statusResponse: StatusResponse
): Promise<StatusChangeResult> => {
const newStatus = statusResponse.status;
@@ -134,7 +136,7 @@ class StatusService implements IStatusService {
};
calculateAvgResponseTime = (
stats: IMonitorStats,
stats: MonitorStats,
statusResponse: StatusResponse
): number => {
let avgResponseTime = stats.avgResponseTime;
@@ -151,13 +153,15 @@ class StatusService implements IStatusService {
};
updateMonitorStats = async (
monitor: MonitorEntity,
monitor: Monitor,
statusResponse: StatusResponse,
statusChanged: boolean
) => {
let stats = await MonitorStats.findOne({ monitorId: monitor.id });
if (!stats) {
stats = await MonitorStats.create({
let stats: MonitorStats;
try {
stats = await this.monitorStatsRepository.findByMonitorId(monitor.id);
} catch (error) {
stats = await this.monitorStatsRepository.create({
monitorId: monitor.id,
currentStreakStartedAt: Date.now(),
});
@@ -199,11 +203,14 @@ class StatusService implements IStatusService {
stats.certificateExpiry = statusResponse.certificateExpiry;
}
return await stats.save();
return await this.monitorStatsRepository.updateByMonitorId(
monitor.id,
stats
);
};
evaluateThresholds = async (
monitor: MonitorEntity,
monitor: Monitor,
check: ICheck
): Promise<ThresholdEvaluationResult> => {
try {
+1
View File
@@ -1,2 +1,3 @@
export * from "@/types/domain/monitor.js";
export * from "@/types/domain/check.js";
export * from "@/types/domain/monitorStats.js";
+19
View File
@@ -0,0 +1,19 @@
export interface MonitorStats {
id: string;
monitorId: string;
avgResponseTime: number;
maxResponseTime: number;
lastResponseTime: number;
totalChecks: number;
totalUpChecks: number;
totalDownChecks: number;
uptimePercentage: number;
lastCheckTimestamp: number;
timeOfLastFailure: number;
currentStreak: number;
currentStreakStatus?: string;
currentStreakStartedAt?: number;
certificateExpiry?: Date | null;
createdAt: Date;
updatedAt: Date;
}