diff --git a/server/src/repositories/checks/MongoCheckRepository.ts b/server/src/repositories/checks/MongoCheckRepository.ts index ce33ed909..6e439f8c3 100644 --- a/server/src/repositories/checks/MongoCheckRepository.ts +++ b/server/src/repositories/checks/MongoCheckRepository.ts @@ -41,7 +41,11 @@ class MongoCheckRepository implements IChecksRepository { const agg: AggregateCheck = { bucketDate: doc._id instanceof Date ? doc._id : new Date(doc._id), count: doc.count, + upChecks: doc.upChecks, + downChecks: doc.downChecks, avgResponseTime: doc.avgResponseTime, + avgResponseTimeUp: doc.avgResponseTimeUp, + avgResponseTimeDown: doc.avgResponseTimeDown, totalContainers: doc.totalContainers, runningContainers: doc.runningContainers, healthyContainers: doc.healthyContainers, @@ -580,6 +584,8 @@ class MongoCheckRepository implements IChecksRepository { return base; }); + console.log(checks); + return checks.map(this.toAggregateCheck); }; } diff --git a/server/src/repositories/monitor-stats/MongoMonitorStatsRepository.ts b/server/src/repositories/monitor-stats/MongoMonitorStatsRepository.ts index bcd5bf3de..6855a9745 100644 --- a/server/src/repositories/monitor-stats/MongoMonitorStatsRepository.ts +++ b/server/src/repositories/monitor-stats/MongoMonitorStatsRepository.ts @@ -55,7 +55,7 @@ class MongoMonitorStatsRepository implements IMonitorStatsRepository { return this.toEntity(monitorStats); }; - deleteManyExcludedtByMonitorIds = async (monitorIds: string[]) => { + deleteManyExcludedByMonitorIds = async (monitorIds: string[]) => { const result = await MonitorStats.deleteMany({ monitorId: { $nin: monitorIds }, }); diff --git a/server/src/types/domain/check.ts b/server/src/types/domain/check.ts index 5b3e829ce..25d4d20b8 100644 --- a/server/src/types/domain/check.ts +++ b/server/src/types/domain/check.ts @@ -144,7 +144,11 @@ export interface AggregateCheck { // Common aggregates count?: number; + upChecks?: number; + downChecks?: number; avgResponseTime?: number; + avgResponseTimeUp?: number; + avgResponseTimeDown?: number; // Docker aggregates (counts per bucket) totalContainers?: number;