From f4b8ec7ea1ecc517bd4a15e56cce6f7cd9eeb70c Mon Sep 17 00:00:00 2001
From: Tristan Read <tread@gitlab.com>
Date: Fri, 29 Mar 2019 08:33:10 +0000
Subject: [PATCH] Add requested resources to cluster health - ce port

---
 .../javascripts/monitoring/components/charts/area.vue  | 10 +++++-----
 app/assets/javascripts/monitoring/constants.js         |  1 -
 spec/javascripts/monitoring/charts/area_spec.js        |  4 ++++
 spec/javascripts/monitoring/mock_data.js               |  5 +++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/monitoring/components/charts/area.vue b/app/assets/javascripts/monitoring/components/charts/area.vue
index 41783d311ef..d453dc1fdb7 100644
--- a/app/assets/javascripts/monitoring/components/charts/area.vue
+++ b/app/assets/javascripts/monitoring/components/charts/area.vue
@@ -69,17 +69,17 @@ export default {
           appearance && appearance.line && appearance.line.type
             ? appearance.line.type
             : lineTypes.default;
-        const lineColor = lineType === lineTypes.threshold ? this.primaryColor : undefined;
+        const lineWidth =
+          appearance && appearance.line && appearance.line.width
+            ? appearance.line.width
+            : undefined;
 
         return {
           name: this.formatLegendLabel(query),
           data: this.concatenateResults(query.result),
           lineStyle: {
             type: lineType,
-            color: lineColor,
-          },
-          itemStyle: {
-            color: lineColor,
+            width: lineWidth,
           },
           areaStyle: {
             opacity:
diff --git a/app/assets/javascripts/monitoring/constants.js b/app/assets/javascripts/monitoring/constants.js
index 869173b6572..55ecf3b5334 100644
--- a/app/assets/javascripts/monitoring/constants.js
+++ b/app/assets/javascripts/monitoring/constants.js
@@ -6,5 +6,4 @@ export const graphTypes = {
 
 export const lineTypes = {
   default: 'solid',
-  threshold: 'dashed',
 };
diff --git a/spec/javascripts/monitoring/charts/area_spec.js b/spec/javascripts/monitoring/charts/area_spec.js
index fb49290be19..549a7935c0f 100644
--- a/spec/javascripts/monitoring/charts/area_spec.js
+++ b/spec/javascripts/monitoring/charts/area_spec.js
@@ -203,6 +203,10 @@ describe('Area component', () => {
             .length,
         ).toBe(data.length);
       });
+
+      it('formats line width correctly', () => {
+        expect(chartData[0].lineStyle.width).toBe(2);
+      });
     });
 
     describe('scatterSeries', () => {
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index ffc7148fde2..6d4ef960c1a 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -330,6 +330,11 @@ export const metricsGroupsAPIResponse = {
           weight: 1,
           queries: [
             {
+              appearance: {
+                line: {
+                  width: 2,
+                },
+              },
               query_range:
                 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100',
               label: 'Core Usage',