diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:29 +0300 |
| commit | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (patch) | |
| tree | 6b77dc8183135b8316cc70c8dbc9c4e7c18cf05a /app/assets/javascripts/monitoring | |
| parent | a9ced7da447785c57477b3d8dbccc73a78cface1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
4 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/bar.vue b/app/assets/javascripts/monitoring/components/charts/bar.vue index 01fd8940dad..e1018cd5952 100644 --- a/app/assets/javascripts/monitoring/components/charts/bar.vue +++ b/app/assets/javascripts/monitoring/components/charts/bar.vue @@ -58,7 +58,7 @@ export default { }, methods: { formatLegendLabel(query) { - return `${query.label}`; + return query.label; }, onResize() { if (!this.$refs.barChart) return; diff --git a/app/assets/javascripts/monitoring/components/charts/column.vue b/app/assets/javascripts/monitoring/components/charts/column.vue index 0ed801e6e57..7a2e3e1b511 100644 --- a/app/assets/javascripts/monitoring/components/charts/column.vue +++ b/app/assets/javascripts/monitoring/components/charts/column.vue @@ -76,7 +76,7 @@ export default { }, methods: { formatLegendLabel(query) { - return `${query.label}`; + return query.label; }, onResize() { if (!this.$refs.columnChart) return; diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index e43a0131528..f4cd6bbbb34 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -251,7 +251,7 @@ export default { }, methods: { formatLegendLabel(query) { - return `${query.label}`; + return query.label; }, isTooltipOfType(tooltipType, defaultType) { return tooltipType === defaultType; diff --git a/app/assets/javascripts/monitoring/stores/utils.js b/app/assets/javascripts/monitoring/stores/utils.js index 5e620d6c2f5..d01acdd031b 100644 --- a/app/assets/javascripts/monitoring/stores/utils.js +++ b/app/assets/javascripts/monitoring/stores/utils.js @@ -68,12 +68,11 @@ export const parseEnvironmentsResponse = (response = [], projectPath) => * https://gitlab.com/gitlab-org/gitlab/issues/207198 * * @param {Array} metrics - Array of prometheus metrics - * @param {String} defaultLabel - Default label for metrics * @returns {Object} */ -const mapToMetricsViewModel = (metrics, defaultLabel) => +const mapToMetricsViewModel = metrics => metrics.map(({ label, id, metric_id, query_range, prometheus_endpoint_path, ...metric }) => ({ - label: label || defaultLabel, + label, queryRange: query_range, prometheusEndpointPath: prometheus_endpoint_path, metricId: uniqMetricsId({ metric_id, id }), |