diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 03:07:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 03:07:24 +0000 |
| commit | 050f88965560f5ad38799a8344f7b8ac5e7a1b8d (patch) | |
| tree | 629ff07854af86f765a42f3561d9b6ed7f673d11 /app/assets/javascripts/monitoring/components/charts | |
| parent | b7e6df1abde1112ae1fa0778f45d6053eec3f052 (diff) | |
| download | gitlab-ce-050f88965560f5ad38799a8344f7b8ac5e7a1b8d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring/components/charts')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/charts/time_series.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index 76fb35aaa78..78fe575717a 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -63,6 +63,11 @@ export default { required: false, default: s__('Metrics|Max'), }, + groupId: { + type: String, + required: false, + default: '', + }, }, data() { return { @@ -290,6 +295,7 @@ export default { :is="glChartComponent" ref="chart" v-bind="$attrs" + :group-id="groupId" :data="chartData" :option="chartOptions" :format-tooltip-text="formatTooltipText" |