From ffbbb5bc9ee3efd327db8b0aa6f27ea7099d1465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 7 Jan 2015 20:03:51 +0100
Subject: [PATCH] Graph: Fixed issue when using zero as a grid threshold, Fixes
 #1309

---
 CHANGELOG.md                  |  1 +
 src/app/panels/graph/graph.js |  4 ++--
 src/test/specs/graph-specs.js | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da346aa2836..34f3d757b33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 **Fixes**
 - [Issue #1298](https://github.com/grafana/grafana/issues/1298). InfluxDB: Fix handling of empty array in templating variable query
+- [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold
 
 # 1.9.1 (2014-12-29)
 
diff --git a/src/app/panels/graph/graph.js b/src/app/panels/graph/graph.js
index 485d64d76ae..62fd543d0e8 100755
--- a/src/app/panels/graph/graph.js
+++ b/src/app/panels/graph/graph.js
@@ -260,14 +260,14 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
         }
 
         function addGridThresholds(options, panel) {
-          if (panel.grid.threshold1) {
+          if (_.isNumber(panel.grid.threshold1)) {
             var limit1 = panel.grid.thresholdLine ? panel.grid.threshold1 : (panel.grid.threshold2 || null);
             options.grid.markings.push({
               yaxis: { from: panel.grid.threshold1, to: limit1 },
               color: panel.grid.threshold1Color
             });
 
-            if (panel.grid.threshold2) {
+            if (_.isNumber(panel.grid.threshold2)) {
               var limit2;
               if (panel.grid.thresholdLine) {
                 limit2 = panel.grid.threshold2;
diff --git a/src/test/specs/graph-specs.js b/src/test/specs/graph-specs.js
index 98968adaa09..1a4e52ad875 100644
--- a/src/test/specs/graph-specs.js
+++ b/src/test/specs/graph-specs.js
@@ -126,6 +126,20 @@ define([
       });
     });
 
+    graphScenario('grid thresholds from zero', function(ctx) {
+      ctx.setup(function(scope) {
+        scope.panel.grid = {
+          threshold1: 0,
+          threshold1Color: "#111",
+        };
+      });
+
+      it('should add grid markings', function() {
+        var markings = ctx.plotOptions.grid.markings;
+        expect(markings[0].yaxis.from).to.be(0);
+      });
+    });
+
     graphScenario('should use timeStep for barWidth', function(ctx) {
       ctx.setup(function(scope, data) {
         scope.panel.bars = true;