diff --git a/client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx b/client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx index 86b6c3d47..f5f122c93 100644 --- a/client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx +++ b/client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx @@ -132,10 +132,10 @@ export const HistogramInfrastructure = ({ if (type === "temp") { avgTemps = data.map((check) => { const temps = check.avgTemperature || []; - if (temps.length === 0) return { bucketDate: check._id, avg_temp: null }; + if (temps.length === 0) return { bucketDate: check.bucketDate, avg_temp: null }; const totalTemp = temps.reduce((sum, temp) => sum + (temp || 0), 0); const avgTemp = totalTemp / temps.length; - return { bucketDate: check?._id, avg_temp: avgTemp }; + return { bucketDate: check.bucketDate, avg_temp: avgTemp }; }); const maxTemp: number = avgTemps.reduce((max, item) => { diff --git a/client/src/Types/Check.ts b/client/src/Types/Check.ts index 8fc4e5664..9b903207c 100644 --- a/client/src/Types/Check.ts +++ b/client/src/Types/Check.ts @@ -192,7 +192,7 @@ export interface HardwareChecksResult { totalChecks: number; }; checks: Array<{ - _id: string; + bucketDate: string; avgCpuUsage: number; avgMemoryUsage: number; avgTemperature: number[]; diff --git a/client/src/Types/Monitor.ts b/client/src/Types/Monitor.ts index 92af7ccd8..94b3d83d7 100644 --- a/client/src/Types/Monitor.ts +++ b/client/src/Types/Monitor.ts @@ -132,7 +132,7 @@ export interface HardwareNetStats { } export interface HardwareCheckStats { - _id: string; + bucketDate: string; avgCpuUsage: number; avgMemoryUsage: number; avgTemperature: number[]; diff --git a/server/src/repositories/checks/MongoChecksRepistory.ts b/server/src/repositories/checks/MongoChecksRepistory.ts index 64e8dbbb1..a36788e2c 100644 --- a/server/src/repositories/checks/MongoChecksRepistory.ts +++ b/server/src/repositories/checks/MongoChecksRepistory.ts @@ -529,7 +529,7 @@ class MongoChecksRepository implements IChecksRepository { }; const checks = (hardwareMetrics ?? []).map((metric) => ({ - _id: metric._id, + bucketDate: metric._id, avgCpuUsage: metric.avgCpuUsage ?? 0, avgMemoryUsage: metric.avgMemoryUsage ?? 0, avgTemperature: metric.avgTemperature ?? [], diff --git a/server/src/types/check.ts b/server/src/types/check.ts index 757fb95e9..c02b03099 100644 --- a/server/src/types/check.ts +++ b/server/src/types/check.ts @@ -136,7 +136,7 @@ export interface HardwareChecksResult { totalChecks: number; }; checks: Array<{ - _id: string; + bucketDate: string; avgCpuUsage: number; avgMemoryUsage: number; avgTemperature: number[]; diff --git a/server/src/types/monitor.ts b/server/src/types/monitor.ts index 57185a735..62ced091d 100644 --- a/server/src/types/monitor.ts +++ b/server/src/types/monitor.ts @@ -99,7 +99,7 @@ export interface HardwareNetStats { } export interface HardwareCheckStats { - _id: string; + bucketDate: string; avgCpuUsage: number; avgMemoryUsage: number; avgTemperature: number[];