Add latest changes from gitlab-org/gitlab@master

3 files changed, 31 insertions, 23 deletions

diff --git a/app/assets/javascripts/helpers/monitor_helper.js b/app/assets/javascripts/helpers/monitor_helper.js
index 2c2a04d5b5e..900f0cf5bb8 100644
--- a/app/assets/javascripts/helpers/monitor_helper.js
+++ b/app/assets/javascripts/helpers/monitor_helper.js
@@ -1,17 +1,30 @@
 /* eslint-disable import/prefer-default-export */
+import _ from 'underscore';
 
+/**
+ * @param {Array} queryResults - Array of Result objects
+ * @param {Object} defaultConfig - Default chart config values (e.g. lineStyle, name)
+ * @returns {Array} The formatted values
+ */
 export const makeDataSeries = (queryResults, defaultConfig) =>
-  queryResults.reduce((acc, result) => {
-    const data = result.values.filter(([, value]) => !Number.isNaN(value));
-    if (!data.length) {
-      return acc;
-    }
-    const relevantMetric = defaultConfig.name.toLowerCase().replace(' ', '_');
-    const name = result.metric[relevantMetric];
-    const series = { data };
-    if (name) {
-      series.name = `${defaultConfig.name}: ${name}`;
-    }
+  queryResults
+    .map(result => {
+      const data = result.values.filter(([, value]) => !Number.isNaN(value));
+      if (!data.length) {
+        return null;
+      }
+      const relevantMetric = defaultConfig.name.toLowerCase().replace(' ', '_');
+      const name = result.metric[relevantMetric];
+      const series = { data };
+      if (name) {
+        series.name = `${defaultConfig.name}: ${name}`;
+      } else {
+        const template = _.template(defaultConfig.name, {
+          interpolate: /\{\{(.+?)\}\}/g,
+        });
+        series.name = template(result.metric);
+      }
 
-    return acc.concat({ ...defaultConfig, ...series });
-  }, []);
+      return { ...defaultConfig, ...series };
+    })
+    .filter(series => series !== null);
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index e2d188103bc..e9d8d0a4184 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -553,14 +553,10 @@ export const calculateRemainingMilliseconds = endDate => {
  *
  * @param {Date} date the date that we will substract days from
  * @param {number} daysInPast number of days that are subtracted from a given date
- * @returns {String} Date string in ISO format
+ * @returns {Date} Date in past as Date object
  */
-export const getDateInPast = (date, daysInPast) => {
-  const dateClone = newDate(date);
-  return new Date(
-    dateClone.setTime(dateClone.getTime() - daysInPast * 24 * 60 * 60 * 1000),
-  ).toISOString();
-};
+export const getDateInPast = (date, daysInPast) =>
+  new Date(newDate(date).setDate(date.getDate() - daysInPast));
 
 export const beginOfDayTime = 'T00:00:00Z';
 export const endOfDayTime = 'T23:59:59Z';
diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js
index 2f793a9e162..c1fe7aa7e71 100644
--- a/app/assets/javascripts/monitoring/stores/actions.js
+++ b/app/assets/javascripts/monitoring/stores/actions.js
@@ -7,7 +7,7 @@ import { s__, __ } from '../../locale';
 
 const MAX_REQUESTS = 3;
 
-function backOffRequest(makeRequestCallback) {
+export function backOffRequest(makeRequestCallback) {
   let requestCounter = 0;
   return backOff((next, stop) => {
     makeRequestCallback()
@@ -111,8 +111,7 @@ export const fetchDashboard = ({ state, dispatch }, params) => {
     params.dashboard = state.currentDashboard;
   }
 
-  return axios
-    .get(state.dashboardEndpoint, { params })
+  return backOffRequest(() => axios.get(state.dashboardEndpoint, { params }))
     .then(resp => resp.data)
     .then(response => {
       dispatch('receiveMetricsDashboardSuccess', { response, params });