summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/monitoring/stores
diff options
context:
space:
mode:
authorAdriel Santiago <adriel@gitlab.com>2019-01-23 18:42:31 -0500
committerAdriel Santiago <adriel@gitlab.com>2019-02-01 06:41:56 -0500
commit33cd912b90c7021eedabbed25f07988e71ccf21c (patch)
tree36d4c766370232688bdfbf4202c786dfc15cadf7 /app/assets/javascripts/monitoring/stores
parentd7a3f875d13b8d4a599a61232938f762d9c5e735 (diff)
downloadgitlab-ce-33cd912b90c7021eedabbed25f07988e71ccf21c.tar.gz
Use ECharts for metrics dashboard
Update metrics dashboard to support GitLab UI area chart changes
Diffstat (limited to 'app/assets/javascripts/monitoring/stores')
-rw-r--r--app/assets/javascripts/monitoring/stores/monitoring_store.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/monitoring/stores/monitoring_store.js b/app/assets/javascripts/monitoring/stores/monitoring_store.js
index 96ecc5ab8a8..70635059bd9 100644
--- a/app/assets/javascripts/monitoring/stores/monitoring_store.js
+++ b/app/assets/javascripts/monitoring/stores/monitoring_store.js
@@ -13,7 +13,7 @@ function checkQueryEmptyData(query) {
result: query.result.filter(timeSeries => {
const newTimeSeries = timeSeries;
const hasValue = series =>
- !Number.isNaN(series.value) && (series.value !== null || series.value !== undefined);
+ !Number.isNaN(series[1]) && (series[1] !== null || series[1] !== undefined);
const hasNonNullValue = timeSeries.values.find(hasValue);
newTimeSeries.values = hasNonNullValue ? newTimeSeries.values : [];
@@ -33,10 +33,10 @@ function normalizeMetrics(metrics) {
...query,
result: query.result.map(result => ({
...result,
- values: result.values.map(([timestamp, value]) => ({
- time: new Date(timestamp * 1000),
- value: Number(value),
- })),
+ values: result.values.map(([timestamp, value]) => [
+ new Date(timestamp * 1000).toISOString(),
+ Number(value),
+ ]),
})),
}));