diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/monitoring/components/charts/column.vue | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/monitoring/components/charts/column.vue')
-rw-r--r-- | app/assets/javascripts/monitoring/components/charts/column.vue | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/column.vue b/app/assets/javascripts/monitoring/components/charts/column.vue index d7d01def45e..511f77a441b 100644 --- a/app/assets/javascripts/monitoring/components/charts/column.vue +++ b/app/assets/javascripts/monitoring/components/charts/column.vue @@ -35,18 +35,14 @@ export default { }; }, computed: { - chartData() { - const queryData = this.graphData.metrics.reduce((acc, query) => { + barChartData() { + return this.graphData.metrics.reduce((acc, query) => { const series = makeDataSeries(query.result || [], { name: this.formatLegendLabel(query), }); return acc.concat(series); }, []); - - return { - values: queryData[0].data, - }; }, chartOptions() { const xAxis = getTimeAxisOptions({ timezone: this.timezone }); @@ -109,7 +105,7 @@ export default { <gl-column-chart ref="columnChart" v-bind="$attrs" - :data="chartData" + :bars="barChartData" :option="chartOptions" :width="width" :height="height" |