Merge branch 'support-additional-colors' into 'master'

Supports additional colors and labels for the prometheus monitoring dashboard

Closes #34629

See merge request !14065

4 files changed, 31 insertions, 24 deletions

diff --git a/spec/javascripts/monitoring/graph/legend_spec.js b/spec/javascripts/monitoring/graph/legend_spec.js
index da2fbd26e23..2571b7ef869 100644
--- a/spec/javascripts/monitoring/graph/legend_spec.js
+++ b/spec/javascripts/monitoring/graph/legend_spec.js
@@ -28,7 +28,7 @@ const defaultValuesComponent = {
   currentDataIndex: 0,
 };
 
-const timeSeries = createTimeSeries(convertedMetrics[0].queries[0].result,
+const timeSeries = createTimeSeries(convertedMetrics[0].queries[0],
   defaultValuesComponent.graphWidth, defaultValuesComponent.graphHeight,
   defaultValuesComponent.graphHeightOffset);
 
@@ -89,13 +89,12 @@ describe('GraphLegend', () => {
     expect(component.$el.querySelectorAll('.rect-axis-text').length).toEqual(2);
   });
 
-  it('contains text to signal the usage, title and time', () => {
+  it('contains text to signal the usage, title and time with multiple time series', () => {
     const component = createComponent(defaultValuesComponent);
     const titles = component.$el.querySelectorAll('.legend-metric-title');
 
-    expect(getTextFromNode(component, '.legend-metric-title').indexOf(component.legendTitle)).not.toEqual(-1);
-    expect(titles[0].textContent.indexOf('Title')).not.toEqual(-1);
-    expect(titles[1].textContent.indexOf('Series')).not.toEqual(-1);
+    expect(titles[0].textContent.indexOf('1xx')).not.toEqual(-1);
+    expect(titles[1].textContent.indexOf('2xx')).not.toEqual(-1);
     expect(getTextFromNode(component, '.y-label-text')).toEqual(component.yAxisLabel);
   });
 
diff --git a/spec/javascripts/monitoring/monitoring_paths_spec.js b/spec/javascripts/monitoring/graph_path_spec.js
index d39db945e17..a4844636d09 100644
--- a/spec/javascripts/monitoring/monitoring_paths_spec.js
+++ b/spec/javascripts/monitoring/graph_path_spec.js
@@ -1,10 +1,10 @@
 import Vue from 'vue';
-import MonitoringPaths from '~/monitoring/components/monitoring_paths.vue';
+import GraphPath from '~/monitoring/components/graph_path.vue';
 import createTimeSeries from '~/monitoring/utils/multiple_time_series';
 import { singleRowMetricsMultipleSeries, convertDatesMultipleSeries } from './mock_data';
 
 const createComponent = (propsData) => {
-  const Component = Vue.extend(MonitoringPaths);
+  const Component = Vue.extend(GraphPath);
 
   return new Component({
     propsData,
@@ -13,22 +13,23 @@ const createComponent = (propsData) => {
 
 const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
 
-const timeSeries = createTimeSeries(convertedMetrics[0].queries[0].result, 428, 272, 120);
+const timeSeries = createTimeSeries(convertedMetrics[0].queries[0], 428, 272, 120);
+const firstTimeSeries = timeSeries[0];
 
 describe('Monitoring Paths', () => {
   it('renders two paths to represent a line and the area underneath it', () => {
     const component = createComponent({
-      generatedLinePath: timeSeries[0].linePath,
-      generatedAreaPath: timeSeries[0].areaPath,
-      lineColor: '#ccc',
-      areaColor: '#fff',
+      generatedLinePath: firstTimeSeries.linePath,
+      generatedAreaPath: firstTimeSeries.areaPath,
+      lineColor: firstTimeSeries.lineColor,
+      areaColor: firstTimeSeries.areaColor,
     });
     const metricArea = component.$el.querySelector('.metric-area');
     const metricLine = component.$el.querySelector('.metric-line');
 
-    expect(metricArea.getAttribute('fill')).toBe('#fff');
-    expect(metricArea.getAttribute('d')).toBe(timeSeries[0].areaPath);
-    expect(metricLine.getAttribute('stroke')).toBe('#ccc');
-    expect(metricLine.getAttribute('d')).toBe(timeSeries[0].linePath);
+    expect(metricArea.getAttribute('fill')).toBe('#8fbce8');
+    expect(metricArea.getAttribute('d')).toBe(firstTimeSeries.areaPath);
+    expect(metricLine.getAttribute('stroke')).toBe('#1f78d1');
+    expect(metricLine.getAttribute('d')).toBe(firstTimeSeries.linePath);
   });
 });
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index 3d399f2bb95..7ceab657464 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -6346,7 +6346,13 @@ export const singleRowMetricsMultipleSeries = [
                             }
                         ]
                     },
-                ]
+                ],
+                'when': [
+                  {
+                    'value': 'hundred(s)',
+                    'color': 'green',
+                  },
+                ],
             }
         ]
     },
diff --git a/spec/javascripts/monitoring/utils/multiple_time_series_spec.js b/spec/javascripts/monitoring/utils/multiple_time_series_spec.js
index 3daf6bf82df..7e44a9ade9e 100644
--- a/spec/javascripts/monitoring/utils/multiple_time_series_spec.js
+++ b/spec/javascripts/monitoring/utils/multiple_time_series_spec.js
@@ -2,16 +2,17 @@ import createTimeSeries from '~/monitoring/utils/multiple_time_series';
 import { convertDatesMultipleSeries, singleRowMetricsMultipleSeries } from '../mock_data';
 
 const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries);
-const timeSeries = createTimeSeries(convertedMetrics[0].queries[0].result, 428, 272, 120);
+const timeSeries = createTimeSeries(convertedMetrics[0].queries[0], 428, 272, 120);
+const firstTimeSeries = timeSeries[0];
 
 describe('Multiple time series', () => {
   it('createTimeSeries returned array contains an object for each element', () => {
-    expect(typeof timeSeries[0].linePath).toEqual('string');
-    expect(typeof timeSeries[0].areaPath).toEqual('string');
-    expect(typeof timeSeries[0].timeSeriesScaleX).toEqual('function');
-    expect(typeof timeSeries[0].areaColor).toEqual('string');
-    expect(typeof timeSeries[0].lineColor).toEqual('string');
-    expect(timeSeries[0].values instanceof Array).toEqual(true);
+    expect(typeof firstTimeSeries.linePath).toEqual('string');
+    expect(typeof firstTimeSeries.areaPath).toEqual('string');
+    expect(typeof firstTimeSeries.timeSeriesScaleX).toEqual('function');
+    expect(typeof firstTimeSeries.areaColor).toEqual('string');
+    expect(typeof firstTimeSeries.lineColor).toEqual('string');
+    expect(firstTimeSeries.values instanceof Array).toEqual(true);
   });
 
   it('createTimeSeries returns an array', () => {