From 97153e7f62023f304ba76f713e610e635d107aff Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 5 Oct 2017 00:17:54 -0500
Subject: fix formatting

---
 app/assets/javascripts/monitoring/components/graph.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/assets/javascripts/monitoring')

diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue
index 6b3e341f936..523cf7c3dda 100644
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -141,10 +141,12 @@
       },
 
       renderAxesPaths() {
-        this.timeSeries = createTimeSeries(this.graphData.queries[0],
-        this.graphWidth,
-        this.graphHeight,
-        this.graphHeightOffset);
+        this.timeSeries = createTimeSeries(
+          this.graphData.queries[0],
+          this.graphWidth,
+          this.graphHeight,
+          this.graphHeightOffset
+        );
 
         if (this.timeSeries.length > 3) {
           this.baseGraphHeight = this.baseGraphHeight += (this.timeSeries.length - 3) * 20;
-- 
cgit v1.2.1


From eb31e31478aab52d26df7cb97f075deccd8dd9dc Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 5 Oct 2017 00:37:09 -0500
Subject: fix spelling ("outter" -> "outer")

---
 app/assets/javascripts/monitoring/components/graph.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/monitoring')

diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue
index 523cf7c3dda..2124fc3e8af 100644
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -65,7 +65,7 @@
     },
 
     computed: {
-      outterViewBox() {
+      outerViewBox() {
         return `0 0 ${this.baseGraphWidth} ${this.baseGraphHeight}`;
       },
 
@@ -213,7 +213,7 @@
       class="prometheus-svg-container"
       :style="paddingBottomRootSvg">
       <svg
-        :viewBox="outterViewBox"
+        :viewBox="outerViewBox"
         ref="baseSvg">
         <g
           class="x-axis"
-- 
cgit v1.2.1


From f036d43be9cc6fb9a1b225f6c5ea2071bce190dd Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 5 Oct 2017 01:07:01 -0500
Subject: rename graph_paths.vue consistent with all other sub-components of
 graph.vue

---
 .../javascripts/monitoring/components/graph.vue    |  2 +-
 .../monitoring/components/graph/path.vue           | 40 ++++++++++++++++++++++
 .../monitoring/components/graph_path.vue           | 40 ----------------------
 3 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 app/assets/javascripts/monitoring/components/graph/path.vue
 delete mode 100644 app/assets/javascripts/monitoring/components/graph_path.vue

(limited to 'app/assets/javascripts/monitoring')

diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue
index 2124fc3e8af..eb1eb6f1143 100644
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -3,7 +3,7 @@
   import GraphLegend from './graph/legend.vue';
   import GraphFlag from './graph/flag.vue';
   import GraphDeployment from './graph/deployment.vue';
-  import GraphPath from './graph_path.vue';
+  import GraphPath from './graph/path.vue';
   import MonitoringMixin from '../mixins/monitoring_mixins';
   import eventHub from '../event_hub';
   import measurements from '../utils/measurements';
diff --git a/app/assets/javascripts/monitoring/components/graph/path.vue b/app/assets/javascripts/monitoring/components/graph/path.vue
new file mode 100644
index 00000000000..043f1bf66bb
--- /dev/null
+++ b/app/assets/javascripts/monitoring/components/graph/path.vue
@@ -0,0 +1,40 @@
+<script>
+  export default {
+    props: {
+      generatedLinePath: {
+        type: String,
+        required: true,
+      },
+      generatedAreaPath: {
+        type: String,
+        required: true,
+      },
+      lineColor: {
+        type: String,
+        required: true,
+      },
+      areaColor: {
+        type: String,
+        required: true,
+      },
+    },
+  };
+</script>
+<template>
+  <g>
+    <path
+      class="metric-area"
+      :d="generatedAreaPath"
+      :fill="areaColor"
+      transform="translate(-5, 20)">
+    </path>
+    <path
+      class="metric-line"
+      :d="generatedLinePath"
+      :stroke="lineColor"
+      fill="none"
+      stroke-width="1"
+      transform="translate(-5, 20)">
+    </path>
+  </g>
+</template>
diff --git a/app/assets/javascripts/monitoring/components/graph_path.vue b/app/assets/javascripts/monitoring/components/graph_path.vue
deleted file mode 100644
index 043f1bf66bb..00000000000
--- a/app/assets/javascripts/monitoring/components/graph_path.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script>
-  export default {
-    props: {
-      generatedLinePath: {
-        type: String,
-        required: true,
-      },
-      generatedAreaPath: {
-        type: String,
-        required: true,
-      },
-      lineColor: {
-        type: String,
-        required: true,
-      },
-      areaColor: {
-        type: String,
-        required: true,
-      },
-    },
-  };
-</script>
-<template>
-  <g>
-    <path
-      class="metric-area"
-      :d="generatedAreaPath"
-      :fill="areaColor"
-      transform="translate(-5, 20)">
-    </path>
-    <path
-      class="metric-line"
-      :d="generatedLinePath"
-      :stroke="lineColor"
-      fill="none"
-      stroke-width="1"
-      transform="translate(-5, 20)">
-    </path>
-  </g>
-</template>
-- 
cgit v1.2.1


From b0e8d623b79f2a010616c51303c5db1cb25870e1 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 5 Oct 2017 01:08:05 -0500
Subject: fix x-axis pixel scale to account for transform x-offset

---
 app/assets/javascripts/monitoring/components/graph.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts/monitoring')

diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue
index eb1eb6f1143..f1792749936 100644
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -153,7 +153,7 @@
         }
 
         const axisXScale = d3.time.scale()
-          .range([0, this.graphWidth]);
+          .range([0, this.graphWidth - 70]);
         const axisYScale = d3.scale.linear()
           .range([this.graphHeight - this.graphHeightOffset, 0]);
 
-- 
cgit v1.2.1


From 790bc25dcd727471698838c5f8504fa9dc44fc37 Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Thu, 5 Oct 2017 12:00:20 -0500
Subject: fix linter errors and karma specs

---
 app/assets/javascripts/monitoring/components/graph.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts/monitoring')

diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue
index f1792749936..972f4f7adef 100644
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -145,7 +145,7 @@
           this.graphData.queries[0],
           this.graphWidth,
           this.graphHeight,
-          this.graphHeightOffset
+          this.graphHeightOffset,
         );
 
         if (this.timeSeries.length > 3) {
-- 
cgit v1.2.1