Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 13 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);