diff --git a/server/AyaNova/Controllers/ServerMetricsController.cs b/server/AyaNova/Controllers/ServerMetricsController.cs index 8f4f52ac..b7ead9f1 100644 --- a/server/AyaNova/Controllers/ServerMetricsController.cs +++ b/server/AyaNova/Controllers/ServerMetricsController.cs @@ -69,7 +69,7 @@ namespace AyaNova.Api.Controllers //use specified values or just return all maxRecords ??= MAX_RECORDS_BEFORE_DOWNSAMPLING; - List MinuteMetrics = new List(); + List MinuteMetrics = new List(); MinuteMetrics = await ct.MetricMM.AsNoTracking().Where(z => z.t >= tsStart && z.t <= tsEnd).OrderBy(z => z.t).ToListAsync(); //Log @@ -77,7 +77,6 @@ namespace AyaNova.Api.Controllers - //Downsample? This should work for longer time period metrics because the minute ones are the greatest quantity if (maxRecords < MinuteMetrics.Count) { @@ -134,12 +133,13 @@ namespace AyaNova.Api.Controllers } else { + var tsOffset = new TimeSpan(0); var ret = new { DownSampled = false, MetricMM = new { - labels = MinuteMetrics.Select(z => z.t).ToArray(), + labels = MinuteMetrics.Select(z => z.t.ToUniversalTime()).ToArray(),//db is in UTC, ef core retrieves as if it was local cpu = MinuteMetrics.Select(z => z.CPU).ToArray(), gen0 = MinuteMetrics.Select(z => z.Gen0).ToArray(), gen1 = MinuteMetrics.Select(z => z.Gen1).ToArray(),