From ba3bb5792609b2e25a43eadda85f4d7e794a303d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 10 Apr 2015 00:34:23 +0900
Subject: [PATCH 1/3] suppress all graph redrawing when shared tooltip is
 enabled

---
 public/app/panels/graph/graph.tooltip.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/app/panels/graph/graph.tooltip.js b/public/app/panels/graph/graph.tooltip.js
index 724588c4fd5..33c29e4e14a 100644
--- a/public/app/panels/graph/graph.tooltip.js
+++ b/public/app/panels/graph/graph.tooltip.js
@@ -82,14 +82,17 @@ function ($) {
     };
 
     elem.mouseleave(function () {
-      if (scope.panel.tooltip.shared || dashboard.sharedCrosshair) {
+      if (scope.panel.tooltip.shared) {
         var plot = elem.data().plot;
         if (plot) {
           $tooltip.detach();
           plot.unhighlight();
-          scope.appEvent('clearCrosshair');
         }
       }
+
+      if (dashboard.sharedCrosshair) {
+        scope.appEvent('clearCrosshair');
+      }
     });
 
     elem.bind("plothover", function (event, pos, item) {

From 2d016c5a3f104c34dde7c80340fbeb92d443b40a Mon Sep 17 00:00:00 2001
From: David Raifaizen <david.raifaizen@lab49.com>
Date: Thu, 9 Apr 2015 12:05:18 -0400
Subject: [PATCH 2/3] When performing a metric find query, the InfluxDb9
 datasource needs a query type in order to return results succesfully. This
 parameter is not available when called from the templateValuesSrv, which is
 causing an error

---
 public/app/plugins/datasource/influxdb/datasource.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js
index 3ce22f8743b..35fb495c740 100644
--- a/public/app/plugins/datasource/influxdb/datasource.js
+++ b/public/app/plugins/datasource/influxdb/datasource.js
@@ -105,6 +105,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
         case 'TAG_VALUES':
           var tagValues = _.flatten(series.values);
           return _.map(tagValues, function(tagValue) { return { text: tagValue, expandable: true }; });
+        default: // template values service does not pass in a a query type
+          var flattenedValues = _.flatten(series.values);
+          return _.map(flattenedValues, function(value) { return { text: value, expandable: true }; });
         }
       });
     };

From 40b2535728f1bfaa37106c409c9bc4ad089796be Mon Sep 17 00:00:00 2001
From: Matt <matt@raintank.io>
Date: Thu, 9 Apr 2015 16:18:15 -0400
Subject: [PATCH 3/3] Typo fix in help_modal.html

Fixed typo in header (Keyboard shutcuts -. Keyboard shortcuts)
---
 public/app/partials/help_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/partials/help_modal.html b/public/app/partials/help_modal.html
index e8c63fbc2ea..5b9452a94f3 100644
--- a/public/app/partials/help_modal.html
+++ b/public/app/partials/help_modal.html
@@ -2,7 +2,7 @@
 	<div class="gf-box-header">
 		<div class="gf-box-title">
 			<i class="fa fa-keyboard-o"></i>
-			Keyboard shutcuts
+			Keyboard shortcuts
 		</div>
 
 		<button class="gf-box-header-close-btn" ng-click="dismiss();">