diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-11-06 06:27:45 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-11-06 23:07:09 +0300 |
| commit | 309c1e6b712b5839a451299b6b8f6bef7692352c (patch) | |
| tree | a8450ca51d8f8b16c40abcbcddecd0e5217d8ae3 /app | |
| parent | b7273c10ea91c71c8d0eb1d9ecde7983839ffae7 (diff) | |
pass all graph queries into createTimeSeries
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/graph.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/utils/multiple_time_series.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue index d3174bceb08..ccd9815c2b0 100644 --- a/app/assets/javascripts/monitoring/components/graph.vue +++ b/app/assets/javascripts/monitoring/components/graph.vue @@ -138,7 +138,7 @@ renderAxesPaths() { this.timeSeries = createTimeSeries( - this.graphData.queries[0], + this.graphData.queries, this.graphWidth, this.graphHeight, this.graphHeightOffset, diff --git a/app/assets/javascripts/monitoring/utils/multiple_time_series.js b/app/assets/javascripts/monitoring/utils/multiple_time_series.js index 65eec0d8d02..35c0a7f703b 100644 --- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js +++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js @@ -11,7 +11,8 @@ const defaultColorPalette = { const defaultColorOrder = ['blue', 'orange', 'red', 'green', 'purple']; -export default function createTimeSeries(queryData, graphWidth, graphHeight, graphHeightOffset) { +export default function createTimeSeries(queries, graphWidth, graphHeight, graphHeightOffset) { + const queryData = queries[0]; let usedColors = []; function pickColor(name) { |