server/AyaNova/Controllers/ServerMetricsController.cs

@@ -66,9 +66,9 @@ namespace AyaNova.Api.Controllers
             {
                 return StatusCode(403, new ApiNotAuthorizedResponse());
             }
-            
-           
-           
+
+
+
 
             //use specified values or just return all           
             maxRecords ??= MAX_RECORDS_BEFORE_DOWNSAMPLING;
@@ -77,7 +77,7 @@ namespace AyaNova.Api.Controllers
             //touniversal is because the parameters are converted to local time here, but then sent to the query as local time as well and not universal time which is what it should be
             MinuteMetrics = await ct.MetricMM.AsNoTracking().Where(z => z.t >= tsStart.ToUniversalTime() && z.t <= tsEnd.ToUniversalTime()).OrderBy(z => z.t).ToListAsync();
 
-//var v=await ct.MetricMM.AsNoTracking().Where(z => z.t >= tsStart.ToUniversalTime() && z.t <= tsEnd.ToUniversalTime()).OrderByDescending(z => z.t).ToListAsync();
+            //var v=await ct.MetricMM.AsNoTracking().Where(z => z.t >= tsStart.ToUniversalTime() && z.t <= tsEnd.ToUniversalTime()).OrderByDescending(z => z.t).ToListAsync();
             //Log
             await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
 
@@ -88,25 +88,25 @@ namespace AyaNova.Api.Controllers
             {
                 //yes, so need to return individual labels and downsampled data as they wont' sync anymore
 
-                var dsCPU = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.CPU)).ToList();
+                var dsCPU = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.CPU)).ToList();
                 dsCPU = Util.DataUtil.LargestTriangleThreeBuckets(dsCPU, (int)maxRecords) as List<Tuple<double, double>>;
 
-                var dsAllocated = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.Allocated)).ToList();
+                var dsAllocated = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Allocated)).ToList();
                 dsAllocated = Util.DataUtil.LargestTriangleThreeBuckets(dsAllocated, (int)maxRecords) as List<Tuple<double, double>>;
 
-                var dsWorkingSet = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.WorkingSet)).ToList();
+                var dsWorkingSet = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.WorkingSet)).ToList();
                 dsWorkingSet = Util.DataUtil.LargestTriangleThreeBuckets(dsWorkingSet, (int)maxRecords) as List<Tuple<double, double>>;
 
-                var dsPrivateBytes = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.PrivateBytes)).ToList();
+                var dsPrivateBytes = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.PrivateBytes)).ToList();
                 dsPrivateBytes = Util.DataUtil.LargestTriangleThreeBuckets(dsPrivateBytes, (int)maxRecords) as List<Tuple<double, double>>;
 
-                var dsGen0 = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.Gen0)).ToList();
+                var dsGen0 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen0)).ToList();
                 dsGen0 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen0, (int)maxRecords) as List<Tuple<double, double>>;
 
-                var dsGen1 = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.Gen1)).ToList();
+                var dsGen1 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen1)).ToList();
                 dsGen1 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen1, (int)maxRecords) as List<Tuple<double, double>>;
 
-                var dsGen2 = MinuteMetrics.Select(z => new Tuple<double, double>(new DateTimeOffset(z.t).ToUnixTimeSeconds(), z.Gen2)).ToList();
+                var dsGen2 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen2)).ToList();
                 dsGen2 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen2, (int)maxRecords) as List<Tuple<double, double>>;
 
 
@@ -118,19 +118,19 @@ namespace AyaNova.Api.Controllers
                     DownSampled = true,
                     MetricMM = new
                     {
-                        cpuLabels = dsCPU.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        cpuLabels = dsCPU.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         cpu = dsCPU.Select(z => z.Item2).ToArray(),
-                        get0Labels = dsGen0.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        get0Labels = dsGen0.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         gen0 = dsGen0.Select(z => (int)z.Item2).ToArray(),
-                        get1Labels = dsGen1.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        get1Labels = dsGen1.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         gen1 = dsGen1.Select(z => (int)z.Item2).ToArray(),
-                        get2Labels = dsGen2.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        get2Labels = dsGen2.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         gen2 = dsGen2.Select(z => (int)z.Item2).ToArray(),
-                        allocatedLabels = dsAllocated.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        allocatedLabels = dsAllocated.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         allocated = dsAllocated.Select(z => (long)z.Item2).ToArray(),
-                        workingSetLabels = dsWorkingSet.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        workingSetLabels = dsWorkingSet.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         workingSet = dsWorkingSet.Select(z => (long)z.Item2).ToArray(),
-                        privateBytesLabels = dsPrivateBytes.Select(z => DateTimeOffset.FromUnixTimeSeconds((long)z.Item1)).ToArray(),
+                        privateBytesLabels = dsPrivateBytes.Select(z => DateTime.FromOADate(z.Item1)).ToArray(),
                         privateBytes = dsPrivateBytes.Select(z => (long)z.Item2).ToArray()
 
                     }
@@ -147,7 +147,8 @@ namespace AyaNova.Api.Controllers
                     DownSampled = false,
                     MetricMM = new
                     {
-                        labels = MinuteMetrics.Select(z => z.t.ToUniversalTime()).ToArray(),//db is in UTC, ef core retrieves as if it was local
+                        //labels = MinuteMetrics.Select(z => z.t.ToUniversalTime()).ToArray(),//db is in UTC, ef core retrieves as if it was local
+                        labels = MinuteMetrics.Select(z => z.t).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(),

server/AyaNova/generator/CoreJobMetricsSnapshot.cs

@@ -24,7 +24,7 @@ namespace AyaNova.Biz
         private static double _cpu = 0;
 
 #if(DEBUG)
-        private static TimeSpan tsOneMinute = new TimeSpan(0, 0,10);
+        private static TimeSpan tsOneMinute = new TimeSpan(0, 0,5);
 #else
         private static TimeSpan tsOneMinute = new TimeSpan(0, 1, 0);
 #endif