diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 12:06:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 12:06:01 +0000 |
commit | dea6ebd31af8e97e8b14160181bd4ea7578c94e8 (patch) | |
tree | 5e429fda4d43aa3450f7d6b015668c3474cd9e6c /app/assets/javascripts/monitoring | |
parent | 94611567bd03083e0ecef7a582a174aa34844482 (diff) | |
download | gitlab-ce-dea6ebd31af8e97e8b14160181bd4ea7578c94e8.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
-rw-r--r-- | app/assets/javascripts/monitoring/components/charts/time_series.vue | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index 64d0a713b13..04aced985c8 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -1,5 +1,5 @@ <script> -import { __ } from '~/locale'; +import { s__, __ } from '~/locale'; import { GlLink, GlButton } from '@gitlab/ui'; import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import dateFormat from 'dateformat'; @@ -52,6 +52,16 @@ export default { required: false, default: () => [], }, + legendAverageText: { + type: String, + required: false, + default: s__('Metrics|Avg'), + }, + legendMaxText: { + type: String, + required: false, + default: s__('Metrics|Max'), + }, }, data() { return { @@ -260,7 +270,6 @@ export default { <slot></slot> </div> </div> - <component :is="glChartComponent" ref="chart" @@ -271,6 +280,8 @@ export default { :thresholds="thresholds" :width="width" :height="height" + :average-text="legendAverageText" + :max-text="legendMaxText" @updated="onChartUpdated" > <template v-if="tooltip.isDeployment"> |