diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-11-05 22:46:15 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-11-06 14:07:09 -0600 |
| commit | 5af31d6eb0b1bb7b872c5c520cb26d7c7dd5110c (patch) | |
| tree | 6f1dd7bf34ef477b5c452f0dae1d0eda7790b4a4 /app | |
| parent | 1f7ecf9a6fee427a7ebe7968418e9cd95774e1de (diff) | |
| download | gitlab-ce-5af31d6eb0b1bb7b872c5c520cb26d7c7dd5110c.tar.gz | |
add track information to data legend
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/monitoring/utils/multiple_time_series.js | 10 |
1 files changed, 7 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 9122c6e1e1e..97f32795d5c 100644 --- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js +++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js @@ -65,9 +65,9 @@ function queryTimeSeries(query, graphWidth, graphHeight, graphHeightOffset, maxV const timeSeriesMetricLabel = timeSeries.metric[Object.keys(timeSeries.metric)[0]]; const seriesCustomizationData = query.series != null && - _.findWhere(query.series[0].when, - { value: timeSeriesMetricLabel }); - if (seriesCustomizationData != null) { + _.findWhere(query.series[0].when, { value: timeSeriesMetricLabel }); + + if (seriesCustomizationData) { metricTag = seriesCustomizationData.value || timeSeriesMetricLabel; [lineColor, areaColor] = pickColor(seriesCustomizationData.color); } else { @@ -75,6 +75,10 @@ function queryTimeSeries(query, graphWidth, graphHeight, graphHeightOffset, maxV [lineColor, areaColor] = pickColor(); } + if (query.track) { + metricTag += ` - track: ${query.track}`; + } + return { linePath: lineFunction(timeSeries.values), areaPath: areaFunction(timeSeries.values), |