diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 21:06:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 21:06:27 +0300 |
commit | d2801eda8464e5e9ce730caf30111c1190fe87a0 (patch) | |
tree | 9b2814ff0c6a61ac192b86afaa35fa2d1985277b /app/assets/javascripts | |
parent | 88542a5e9613c8442a982e65ad5cf13eb33bc541 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/helpers/monitor_helper.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/components/charts/anomaly.vue | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/helpers/monitor_helper.js b/app/assets/javascripts/helpers/monitor_helper.js index d172aa8a444..87b4b14f6bf 100644 --- a/app/assets/javascripts/helpers/monitor_helper.js +++ b/app/assets/javascripts/helpers/monitor_helper.js @@ -7,6 +7,7 @@ export const makeDataSeries = (queryResults, defaultConfig) => queryResults .map(result => { + // NaN values may disrupt avg., max. & min. calculations in the legend, filter them out const data = result.values.filter(([, value]) => !Number.isNaN(value)); if (!data.length) { return null; diff --git a/app/assets/javascripts/monitoring/components/charts/anomaly.vue b/app/assets/javascripts/monitoring/components/charts/anomaly.vue index 8eeac737a11..b8767f48c5f 100644 --- a/app/assets/javascripts/monitoring/components/charts/anomaly.vue +++ b/app/assets/javascripts/monitoring/components/charts/anomaly.vue @@ -66,6 +66,7 @@ export default { const values = query.result[0] ? query.result[0].values : []; return { label: query.label, + // NaN values may disrupt avg., max. & min. calculations in the legend, filter them out data: values.filter(([, value]) => !Number.isNaN(value)), }; }); |