From 78177e3a013353ea507f7bc6e94089cc2d99aca0 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 26 May 2020 20:34:56 +0000
Subject: [PATCH]

---
 ayanova/src/views/ops-metrics.vue | 51 ++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index 6aa96d16..bdf253bb 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -1,11 +1,13 @@
 <template>
   <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
-    <!-- <v-col>
-      {{ obj }}
-    </v-col> -->
-    <v-col>
-      <gz-chart-line :chartdata="chartData" :options="chartOptions" />
+
+    <v-col cols="12">
+      <gz-chart-line :chartdata="cpuChartData" :options="chartOptions" />
+    </v-col>
+
+    <v-col cols="12">
+      <gz-chart-line :chartdata="memChartData" :options="chartOptions" />
     </v-col>
   </v-row>
 </template>
@@ -33,9 +35,8 @@ export default {
   data() {
     return {
       obj: {},
-      chartData: {
+      xxcpuChartData: {
         labels: [],
-
         datasets: [
           {
             label: "CPU %",
@@ -65,6 +66,34 @@ export default {
       }
     };
   },
+  computed: {
+    cpuChartData() {
+      return {
+        labels: this.obj.metricMM.labels,
+        datasets: [
+          {
+            label: "CPU %",
+            borderColor: "indigo",
+            fill: false,
+            data: this.obj.metricMM.cpu
+          }
+        ]
+      };
+    },
+    memChartData() {
+      return {
+        labels: this.obj.metricMM.labels,
+        datasets: [
+          {
+            label: "Memory allocated",
+            borderColor: "green",
+            fill: false,
+            data: this.obj.metricMM.allocated
+          }
+        ]
+      };
+    }
+  },
   methods: {
     onResize() {
       this.logCardHeight = window.innerHeight * 0.7;
@@ -108,13 +137,7 @@ export default {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            if (res) {
-              vm.chartData.labels = res.data.metricMM.labels;
-              //vm.obj = res.data;
-              //vm.chartData.datasets[0].data = res.data.cpu;
-            } else {
-              vm.log = vm.$ay.t("NoData");
-            }
+            vm.obj = res.data;
 
             window.$gz.form.setFormState({
               vm: vm,