From e69dc3d05757788fff69c27e47a39791254a7c1e Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Tue, 12 Dec 2017 14:37:58 -0800
Subject: [PATCH 1/3] Do not return a label if provided with empty query config

---
 ui/spec/shared/presenters/presentersSpec.js | 7 +++++++
 ui/src/shared/presenters/index.js           | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/ui/spec/shared/presenters/presentersSpec.js b/ui/spec/shared/presenters/presentersSpec.js
index d751e9cd4..29c837490 100644
--- a/ui/spec/shared/presenters/presentersSpec.js
+++ b/ui/spec/shared/presenters/presentersSpec.js
@@ -258,5 +258,12 @@ describe('Presenters', () => {
 
       expect(actual).to.equal('m1.derivative_mean_usage_system')
     })
+
+    it('returns a label of empty string if the query config is empty', () => {
+      const query = defaultQueryConfig({id: 1})
+      const actual = buildDefaultYLabel(query)
+
+      expect(actual).to.equal('')
+    })
   })
 })
diff --git a/ui/src/shared/presenters/index.js b/ui/src/shared/presenters/index.js
index 1c19b5e55..ccb096ba5 100644
--- a/ui/src/shared/presenters/index.js
+++ b/ui/src/shared/presenters/index.js
@@ -114,6 +114,11 @@ function getRolesForUser(roles, user) {
 export const buildDefaultYLabel = queryConfig => {
   const {measurement} = queryConfig
   const fields = _.get(queryConfig, ['fields', '0'], [])
+  const isEmpty = !measurement && !fields.length
+
+  if (isEmpty) {
+    return ''
+  }
 
   const walkZerothArgs = f => {
     if (f.type === 'field') {

From 537d2448c72c6bdbcc02d1ba50faa24c9d6a8a06 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Tue, 12 Dec 2017 14:45:13 -0800
Subject: [PATCH 2/3] Update placeholder if y-axis default title is empty

---
 ui/src/dashboards/components/AxesOptions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/dashboards/components/AxesOptions.js b/ui/src/dashboards/components/AxesOptions.js
index 8cd5849e7..072f6d0b5 100644
--- a/ui/src/dashboards/components/AxesOptions.js
+++ b/ui/src/dashboards/components/AxesOptions.js
@@ -40,7 +40,7 @@ const AxesOptions = ({
           <div className="form-group col-sm-12">
             <label htmlFor="prefix">Title</label>
             <OptIn
-              customPlaceholder={defaultYLabel}
+              customPlaceholder={defaultYLabel || 'y-axis title'}
               customValue={label}
               onSetValue={onSetLabel}
               type="text"

From c7149543be0ccd33edaa5f845e6477a3b9dfc77c Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Wed, 13 Dec 2017 17:17:43 -0800
Subject: [PATCH 3/3] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9caf63f1..8baf9edb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### UI Improvements
 ### Bug Fixes
 1. [#2528](https://github.com/influxdata/chronograf/pull/2528): Fix template rendering to ignore template if not in query 
+1. [#2563](https://github.com/influxdata/chronograf/pull/2563): Fix graph inversion if user input y-axis min greater than max
 
 ## v1.4.0.0-beta1 [2017-12-07]
 ### Features