summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 17:16:31 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 17:16:31 -0500
commit7f5ae2e8b2a3e29ad128e28798b82c8b19d55100 (patch)
tree53845beb23909fe0517fdf327a00cc6c10a93873 /app
parent851ada82158fccce112665c420b60d1905317dba (diff)
downloadgitlab-ce-7f5ae2e8b2a3e29ad128e28798b82c8b19d55100.tar.gz
Changed how the backend response is handled for when instead of series
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/monitoring/utils/multiple_time_series.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/utils/multiple_time_series.js b/app/assets/javascripts/monitoring/utils/multiple_time_series.js
index 955b963b451..4e6a64fc47c 100644
--- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js
+++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js
@@ -68,8 +68,8 @@ export default function createTimeSeries(queryData, graphWidth, graphHeight, gra
.y1(d => timeSeriesScaleY(d.value));
const timeSeriesMetricLabel = timeSeries.metric[Object.keys(timeSeries.metric)[0]];
- const seriesCustomizationData = queryData.series != null &&
- _.findWhere(queryData.series[0].series,
+ const seriesCustomizationData = queryData.when != null &&
+ _.findWhere(queryData.when[0].series,
{ value: timeSeriesMetricLabel });
if (seriesCustomizationData != null) {
metricTag = seriesCustomizationData.value || timeSeriesMetricLabel;
@@ -90,4 +90,3 @@ export default function createTimeSeries(queryData, graphWidth, graphHeight, gra
};
});
}
-