Add latest changes from gitlab-org/gitlab@master

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)),
         };
       });