This commit is contained in:
2020-05-26 22:33:00 +00:00
parent f5a7c5a1ce
commit 0346be3799

View File

@@ -2,13 +2,17 @@
<v-row v-if="this.formState.ready"> <v-row v-if="this.formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<!-- <v-col cols="12">
<gz-chart-line :chartdata="memChartData" :options="chartOptions" />
</v-col> -->
<v-col cols="12"> <v-col cols="12">
<gz-chart-line :chartdata="cpuChartData" :options="chartOptions" /> <gz-chart-line :chartdata="cpuChartData" :options="chartOptions" />
</v-col> </v-col>
<v-col cols="12"> <!-- <v-col cols="12">
<gz-chart-line :chartdata="memChartData" :options="chartOptions" /> <gz-chart-line :chartdata="gcChartData" :options="chartOptions" />
</v-col> </v-col> -->
</v-row> </v-row>
</template> </template>
@@ -69,7 +73,9 @@ export default {
computed: { computed: {
cpuChartData() { cpuChartData() {
return { return {
labels: this.obj.metricMM.labels, labels: this.obj.downSampled
? this.obj.metricMM.cpuLabels
: this.obj.metricMM.labels,
datasets: [ datasets: [
{ {
label: "CPU %", label: "CPU %",
@@ -104,6 +110,31 @@ export default {
} }
] ]
}; };
},
gcChartData() {
return {
labels: this.obj.metricMM.labels,
datasets: [
{
label: "Gen0",
borderColor: "green",
fill: false,
data: this.obj.metricMM.gen0
},
{
label: "Gen1",
borderColor: "blue",
fill: false,
data: this.obj.metricMM.gen1
},
{
label: "Gen2",
borderColor: "red",
fill: false,
data: this.obj.metricMM.gen2
}
]
};
} }
}, },
methods: { methods: {
@@ -131,7 +162,7 @@ export default {
let vm = this; let vm = this;
vm.formState.loading = true; vm.formState.loading = true;
let url = "server-metric"; //?maxRecords=100 let url = "server-metric?maxRecords=400"; // //2000 will cover all for now 2020-05-26 15:24:14
window.$gz.form.deleteAllErrorBoxErrors(vm); window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api window.$gz.api
.get(url) .get(url)