From 27b4c0b446d03825fb16e26f08cc53a3b7ce4953 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 27 May 2020 22:53:54 +0000 Subject: [PATCH] --- .../AyaNova/Controllers/ServerMetricsController.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/Controllers/ServerMetricsController.cs b/server/AyaNova/Controllers/ServerMetricsController.cs index fa0061ae..d42e502f 100644 --- a/server/AyaNova/Controllers/ServerMetricsController.cs +++ b/server/AyaNova/Controllers/ServerMetricsController.cs @@ -120,17 +120,19 @@ namespace AyaNova.Api.Controllers { cpuLabels = dsCPU.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), cpu = dsCPU.Select(z => z.Item2).ToArray(), - gen0Labels = dsGen0.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), + genAllLabels = dsGen0.Select(z => DateTime.FromOADate(z.Item1)).Union(dsGen1.Select(z => DateTime.FromOADate(z.Item1))).Union(dsGen2.Select(z => DateTime.FromOADate(z.Item1))).ToArray(), + // gen0Labels = dsGen0.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), gen0 = dsGen0.Select(z => (int)z.Item2).ToArray(), - gen1Labels = dsGen1.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), + // gen1Labels = dsGen1.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), gen1 = dsGen1.Select(z => (int)z.Item2).ToArray(), - gen2Labels = dsGen2.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), + // gen2Labels = dsGen2.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), gen2 = dsGen2.Select(z => (int)z.Item2).ToArray(), - allocatedLabels = dsAllocated.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), + memAllLabels = dsAllocated.Select(z => DateTime.FromOADate(z.Item1)).Union(dsWorkingSet.Select(z => DateTime.FromOADate(z.Item1))).Union(dsPrivateBytes.Select(z => DateTime.FromOADate(z.Item1))).ToArray(), + // allocatedLabels = dsAllocated.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), allocated = dsAllocated.Select(z => (long)z.Item2).ToArray(), - workingSetLabels = dsWorkingSet.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), + //workingSetLabels = dsWorkingSet.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), workingSet = dsWorkingSet.Select(z => (long)z.Item2).ToArray(), - privateBytesLabels = dsPrivateBytes.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), + // privateBytesLabels = dsPrivateBytes.Select(z => DateTime.FromOADate(z.Item1)).ToArray(), privateBytes = dsPrivateBytes.Select(z => (long)z.Item2).ToArray() }