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" > - + + + - {{ gc0ChartData }} - - - - - - - + @@ -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",