From fa358397cad332e0232a4049acabcf20b5383c46 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 27 May 2020 22:58:26 +0000
Subject: [PATCH]

---
 ayanova/src/views/ops-metrics.vue | 47 ++++++++-----------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index f79694a9..85076785 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -11,22 +11,15 @@
         @input="timePeriodChanged"
       ></v-select>
     </v-col>
-    <!-- <v-col cols="12">
-      <gz-chart-line :chartdata="memChartData" :options="chartOptions" />
-    </v-col> -->
+    <v-col cols="12">
+      <gz-chart-line :chartData="memAllChartData" :options="chartOptions" />
+    </v-col>
 
     <v-col cols="12">
       <gz-chart-line :chartData="cpuChartData" :options="chartOptions" />
     </v-col>
     <v-col cols="12">
-      {{ gc0ChartData }}
-      <gz-chart-line :chartData="gc0ChartData" :options="chartOptions" />
-    </v-col>
-    <v-col cols="12">
-      <gz-chart-line :chartData="gc1ChartData" :options="chartOptions" />
-    </v-col>
-    <v-col cols="12">
-      <gz-chart-line :chartData="gc2ChartData" :options="chartOptions" />
+      <gz-chart-line :chartData="gcAllChartData" :options="chartOptions" />
     </v-col>
   </v-row>
 </template>
@@ -100,10 +93,10 @@ export default {
         ]
       };
     },
-    gc0ChartData() {
+    gcAllChartData() {
       return {
         labels: this.obj.downSampled
-          ? this.obj.metricMM.gen0Labels
+          ? this.obj.metricMM.genAllLabels
           : this.obj.metricMM.labels,
         datasets: [
           {
@@ -111,31 +104,13 @@ export default {
             borderColor: "red",
             fill: false,
             data: this.obj.metricMM.gen0
-          }
-        ]
-      };
-    },
-    gc1ChartData() {
-      return {
-        labels: this.obj.downSampled
-          ? this.obj.metricMM.gen1Labels
-          : this.obj.metricMM.labels,
-        datasets: [
+          },
           {
             label: "GC Gen1",
             borderColor: "blue",
             fill: false,
             data: this.obj.metricMM.gen1
-          }
-        ]
-      };
-    },
-    gc2ChartData() {
-      return {
-        labels: this.obj.downSampled
-          ? this.obj.metricMM.gen2Labels
-          : this.obj.metricMM.labels,
-        datasets: [
+          },
           {
             label: "GC Gen2",
             borderColor: "green",
@@ -145,9 +120,11 @@ export default {
         ]
       };
     },
-    memChartData() {
+    memAllChartData() {
       return {
-        labels: this.obj.metricMM.labels,
+        labels: this.obj.downSampled
+          ? this.obj.metricMM.memAllLabels
+          : this.obj.metricMM.labels,
         datasets: [
           {
             label: "Allocated",