admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-05-27 17:15:17 +00:00
parent 859b2c3a56
commit 86f165d7f5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/Controllers/ServerMetricsController.cs
View File

@@ -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 //Downsample? This should work for longer time period metrics because the minute ones are the greatest quantity
if (maxRecords < MinuteMetrics.Count) if (maxRecords < MinuteMetrics.Count)
{ {
@@ -134,12 +133,13 @@ namespace AyaNova.Api.Controllers
} }
else else
{ {
var tsOffset = new TimeSpan(0);
var ret = new var ret = new
{ {
DownSampled = false, DownSampled = false,
MetricMM = new 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(), cpu = MinuteMetrics.Select(z => z.CPU).ToArray(),
gen0 = MinuteMetrics.Select(z => z.Gen0).ToArray(), gen0 = MinuteMetrics.Select(z => z.Gen0).ToArray(),
gen1 = MinuteMetrics.Select(z => z.Gen1).ToArray(), gen1 = MinuteMetrics.Select(z => z.Gen1).ToArray(),