From 1e4eb0105942debe27079174bd284bad5b1824f4 Mon Sep 17 00:00:00 2001
From: bigbenhur <benhur@alpenjodel.de>
Date: Fri, 3 Jun 2016 15:54:14 +0200
Subject: [PATCH 001/301] Support auto grid min/max when using log scale, Issue
 #3090

---
 public/app/plugins/panel/graph/graph.js       | 58 ++++++++++---------
 .../plugins/panel/graph/specs/graph_specs.ts  |  6 +-
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 86ad3b5f025..8019a51354b 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -373,42 +373,46 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
           if (axis.logBase === 1) {
             return;
           }
+          if (axis.min < Number.MIN_VALUE) {
+            axis.min = null;
+          }
 
           var series, i;
-          var max = axis.max;
+          var max = axis.max, min = axis.min;
 
-          if (max === null) {
-            for (i = 0; i < data.length; i++) {
-              series = data[i];
-              if (series.yaxis === axis.index) {
-                if (max < series.stats.max) {
-                  max = series.stats.max;
-                }
+          for (i = 0; i < data.length; i++) {
+            series = data[i];
+            if (series.yaxis === axis.index) {
+              if (max === null || max < series.stats.max) {
+                max = series.stats.max;
+              }
+              if (min === null || min > series.stats.min) {
+                min = series.stats.min;
               }
             }
-            if (max === void 0) {
-              max = Number.MAX_VALUE;
-            }
+          }
+          if (max === null && min === null) {
+            max = Math.pow(axis.logBase,+2);
+            min = Math.pow(axis.logBase,-2);
+          } else if (max === null) {
+            max = min*Math.pow(axis.logBase,+4);
+          } else if (min === null) {
+            min = max*Math.pow(axis.logBase,-4);
           }
 
-          axis.min = axis.min !== null ? axis.min : 0;
-          axis.ticks = [0, 1];
-          var nextTick = 1;
+          axis.transform = function(v) { return Math.log(v) / Math.log(axis.logBase); };
+          axis.inverseTransform  = function (v) { return Math.pow(axis.logBase,v); };
 
-          while (true) {
-            nextTick = nextTick * axis.logBase;
+          min = axis.inverseTransform(Math.floor(axis.transform(min)));
+          max = axis.inverseTransform(Math.ceil(axis.transform(max)));
+
+          axis.min = axis.min !== null ? axis.min : min;
+          axis.max = axis.max !== null ? axis.max : max;
+
+          axis.ticks = [];
+          var nextTick;
+          for (nextTick = min; nextTick <= max; nextTick *= axis.logBase) {
             axis.ticks.push(nextTick);
-            if (nextTick > max) {
-              break;
-            }
-          }
-
-          if (axis.logBase === 10) {
-            axis.transform = function(v) { return Math.log(v+0.1); };
-            axis.inverseTransform  = function (v) { return Math.pow(10,v); };
-          } else {
-            axis.transform = function(v) { return Math.log(v+0.1) / Math.log(axis.logBase); };
-            axis.inverseTransform  = function (v) { return Math.pow(axis.logBase,v); };
           }
         }
 
diff --git a/public/app/plugins/panel/graph/specs/graph_specs.ts b/public/app/plugins/panel/graph/specs/graph_specs.ts
index b9c9362e5de..b383a31a976 100644
--- a/public/app/plugins/panel/graph/specs/graph_specs.ts
+++ b/public/app/plugins/panel/graph/specs/graph_specs.ts
@@ -172,9 +172,9 @@ describe('grafanaGraph', function() {
 
     it('should apply axis transform and ticks', function() {
       var axis = ctx.plotOptions.yaxes[0];
-      expect(axis.transform(100)).to.be(Math.log(100+0.1));
-      expect(axis.ticks[0]).to.be(0);
-      expect(axis.ticks[1]).to.be(1);
+      expect(axis.transform(100)).to.be(Math.log(100)/Math.log(10));
+      expect(axis.ticks[0]).to.be(0.01);
+      expect(axis.ticks[1]).to.be(0.1);
     });
   });
 

From 29b9d17faa05bf804eb9667810a29ab94d089885 Mon Sep 17 00:00:00 2001
From: bigbenhur <benhur@alpenjodel.de>
Date: Fri, 3 Jun 2016 22:30:38 +0200
Subject: [PATCH 002/301] fix crash due to zero or negative data values in
 graph with log scale

---
 public/app/core/time_series2.ts         | 6 ++++++
 public/app/plugins/panel/graph/graph.js | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
index dfae26fb48b..d01fe1156b3 100644
--- a/public/app/core/time_series2.ts
+++ b/public/app/core/time_series2.ts
@@ -97,6 +97,7 @@ export default class TimeSeries {
     this.stats.total = 0;
     this.stats.max = -Number.MAX_VALUE;
     this.stats.min = Number.MAX_VALUE;
+    this.stats.logmin = Number.MAX_VALUE;
     this.stats.avg = null;
     this.stats.current = null;
     this.allIsNull = true;
@@ -133,6 +134,11 @@ export default class TimeSeries {
         if (currentValue < this.stats.min) {
           this.stats.min = currentValue;
         }
+
+        if (currentValue < this.stats.logmin && currentValue > 0) {
+          this.stats.logmin = currentValue;
+        }
+
       }
 
       if (currentValue !== 0) {
diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 8019a51354b..00fec42cd6f 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -386,11 +386,12 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
               if (max === null || max < series.stats.max) {
                 max = series.stats.max;
               }
-              if (min === null || min > series.stats.min) {
-                min = series.stats.min;
+              if (min === null || min > series.stats.logmin) {
+                min = series.stats.logmin;
               }
             }
           }
+
           if (max === null && min === null) {
             max = Math.pow(axis.logBase,+2);
             min = Math.pow(axis.logBase,-2);
@@ -400,7 +401,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
             min = max*Math.pow(axis.logBase,-4);
           }
 
-          axis.transform = function(v) { return Math.log(v) / Math.log(axis.logBase); };
+          axis.transform = function(v) { return (v < Number.MIN_VALUE) ? null : Math.log(v) / Math.log(axis.logBase); };
           axis.inverseTransform  = function (v) { return Math.pow(axis.logBase,v); };
 
           min = axis.inverseTransform(Math.floor(axis.transform(min)));

From ef623846c1d2d5e610d738bda49127616b5ed59d Mon Sep 17 00:00:00 2001
From: bigbenhur <benhur@alpenjodel.de>
Date: Mon, 6 Jun 2016 10:33:35 +0200
Subject: [PATCH 003/301] further tests for log-autoscale and log-fixedscale;
 only generate visible ticks; minor changes to prevent crashes due to bad user
 input

---
 public/app/plugins/panel/graph/graph.js       | 38 ++++++++++++-------
 .../plugins/panel/graph/specs/graph_specs.ts  | 35 ++++++++++++++---
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 00fec42cd6f..a74997d6651 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -376,6 +376,9 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
           if (axis.min < Number.MIN_VALUE) {
             axis.min = null;
           }
+          if (axis.max < Number.MIN_VALUE) {
+            axis.max = null;
+          }
 
           var series, i;
           var max = axis.max, min = axis.min;
@@ -392,23 +395,32 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
             }
           }
 
-          if (max === null && min === null) {
-            max = Math.pow(axis.logBase,+2);
-            min = Math.pow(axis.logBase,-2);
-          } else if (max === null) {
-            max = min*Math.pow(axis.logBase,+4);
-          } else if (min === null) {
-            min = max*Math.pow(axis.logBase,-4);
-          }
-
           axis.transform = function(v) { return (v < Number.MIN_VALUE) ? null : Math.log(v) / Math.log(axis.logBase); };
           axis.inverseTransform  = function (v) { return Math.pow(axis.logBase,v); };
 
-          min = axis.inverseTransform(Math.floor(axis.transform(min)));
-          max = axis.inverseTransform(Math.ceil(axis.transform(max)));
+          if (max === null && min === null) {
+            max = axis.inverseTransform(+2);
+            min = axis.inverseTransform(-2);
+          } else if (max === null) {
+            max = min*axis.inverseTransform(+4);
+          } else if (min === null) {
+            min = max*axis.inverseTransform(-4);
+          }
 
-          axis.min = axis.min !== null ? axis.min : min;
-          axis.max = axis.max !== null ? axis.max : max;
+          if (axis.min !== null) {
+            min = axis.inverseTransform(Math.ceil(axis.transform(axis.min)));
+          } else {
+            min = axis.min = axis.inverseTransform(Math.floor(axis.transform(min)));
+          }
+          if (axis.max !== null) {
+            max = axis.inverseTransform(Math.floor(axis.transform(axis.max)));
+          } else {
+            max = axis.max = axis.inverseTransform(Math.ceil(axis.transform(max)));
+          }
+
+          if (min < Number.MIN_VALUE || max < Number.MIN_VALUE) {
+            return;
+          }
 
           axis.ticks = [];
           var nextTick;
diff --git a/public/app/plugins/panel/graph/specs/graph_specs.ts b/public/app/plugins/panel/graph/specs/graph_specs.ts
index b383a31a976..339b14edb3d 100644
--- a/public/app/plugins/panel/graph/specs/graph_specs.ts
+++ b/public/app/plugins/panel/graph/specs/graph_specs.ts
@@ -166,15 +166,38 @@ describe('grafanaGraph', function() {
   });
 
   graphScenario('when logBase is log 10', function(ctx) {
-    ctx.setup(function(ctrl) {
+    ctx.setup(function(ctrl, data) {
       ctrl.panel.yaxes[0].logBase = 10;
+      data[0] = new TimeSeries({
+        datapoints: [[2000,1],[0.002,2],[0,3],[-1,4]],
+        alias: 'seriesAutoscale',
+      });
+      data[0].yaxis = 1;
+      ctrl.panel.yaxes[1].logBase = 10;
+      ctrl.panel.yaxes[1].min = 0.05;
+      ctrl.panel.yaxes[1].max = 1500;
+      data[1] = new TimeSeries({
+        datapoints: [[2000,1],[0.002,2],[0,3],[-1,4]],
+        alias: 'seriesFixedscale',
+      });
+      data[1].yaxis = 2;
     });
 
-    it('should apply axis transform and ticks', function() {
-      var axis = ctx.plotOptions.yaxes[0];
-      expect(axis.transform(100)).to.be(Math.log(100)/Math.log(10));
-      expect(axis.ticks[0]).to.be(0.01);
-      expect(axis.ticks[1]).to.be(0.1);
+    it('should apply axis transform, autoscaling (if necessary) and ticks', function() {
+      var axisAutoscale = ctx.plotOptions.yaxes[0];
+      expect(axisAutoscale.transform(100)).to.be(2);
+      expect(axisAutoscale.inverseTransform(-3)).to.be(0.001);
+      expect(axisAutoscale.min).to.be(0.001);
+      expect(axisAutoscale.max).to.be(10000);
+      expect(axisAutoscale.ticks.length).to.be(8);
+      expect(axisAutoscale.ticks[0]).to.be(0.001);
+      expect(axisAutoscale.ticks[7]).to.be(10000);
+      var axisFixedscale = ctx.plotOptions.yaxes[1];
+      expect(axisFixedscale.min).to.be(0.05);
+      expect(axisFixedscale.max).to.be(1500);
+      expect(axisFixedscale.ticks.length).to.be(5);
+      expect(axisFixedscale.ticks[0]).to.be(0.1);
+      expect(axisFixedscale.ticks[4]).to.be(1000);
     });
   });
 

From 513fcdeeb8bb3c9889fc364843a8e1905aa2780d Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 31 Jan 2017 10:10:25 +0100
Subject: [PATCH 004/301] tech(build): prepare for tag builds

---
 scripts/build/build.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index 26acabe6304..d16a5edec69 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -24,11 +24,11 @@ fi
 echo "current dir: $(pwd)"
 
 if [ "$CIRCLE_TAG" != "" ]; then
-  echo "Building incremental build for master"
-  go run build.go build
-else
-  echo "Building a release"
+  echo "Building a release from tag $CIRCLE_TAG"
   go run build.go -includeBuildNumber=false build
+else
+  echo "Building incremental build for $CIRCLE_BRANCH"
+  go run build.go build
 fi
 
 yarn install --pure-lockfile
@@ -41,11 +41,11 @@ gem install fpm -v 1.4
 echo "current dir: $(pwd)"
 
 if [ "$CIRCLE_TAG" != "" ]; then
-  echo "Building incremental build for master"
-  go run build.go package latest
-else
-  echo "Building a release"
+  echo "Packaging a release from tag $CIRCLE_TAG"
   go run build.go -includeBuildNumber=false package latest
+else
+  echo "Packaging incremental build for $CIRCLE_BRANCH"
+  go run build.go package latest
 fi
 
 cp dist/* /tmp/dist/

From 0e892e9f86349c8431d89b7be52c14758f208ab7 Mon Sep 17 00:00:00 2001
From: Stanislav Vetlovskiy <mrerliz@gmail.com>
Date: Tue, 31 Jan 2017 16:47:14 +0300
Subject: [PATCH 005/301] Add image url to telegram alert notifier

If public image url of alert is exist add it to the telegram message
---
 pkg/services/alerting/notifiers/telegram.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go
index 0c3e3bd3c61..f70d299bc6c 100644
--- a/pkg/services/alerting/notifiers/telegram.go
+++ b/pkg/services/alerting/notifiers/telegram.go
@@ -93,6 +93,9 @@ func (this *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error {
 	if err == nil {
 		message = message + fmt.Sprintf("URL: %s\n", ruleUrl)
 	}
+	if evalContext.ImagePublicUrl != "" {
+		message = message + fmt.Sprintf("Image: %s\n", evalContext.ImagePublicUrl)
+	}
 	bodyJSON.Set("text", message)
 
 	url := fmt.Sprintf(telegeramApiUrl, this.BotToken, "sendMessage")

From 0c46def1a0ad38270db261767f1a016676a3bf24 Mon Sep 17 00:00:00 2001
From: Kevin Bowling <kevin.bowling@kev009.com>
Date: Tue, 31 Jan 2017 06:54:53 -0700
Subject: [PATCH 006/301] Add an idiomatic plugin path for FreeBSD (#7410)

---
 pkg/cmd/grafana-cli/utils/grafana_path.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/cmd/grafana-cli/utils/grafana_path.go b/pkg/cmd/grafana-cli/utils/grafana_path.go
index fa6dc46d783..afb622bbb93 100644
--- a/pkg/cmd/grafana-cli/utils/grafana_path.go
+++ b/pkg/cmd/grafana-cli/utils/grafana_path.go
@@ -40,6 +40,8 @@ func returnOsDefault(currentOs string) string {
 		return "../data/plugins"
 	case "darwin":
 		return "/usr/local/var/lib/grafana/plugins"
+	case "freebsd":
+		return "/var/db/grafana/plugins"
 	default: //"linux"
 		return "/var/lib/grafana/plugins"
 	}

From 91999851cba8630ab3985a6cd80fa1a05394f5aa Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Tue, 31 Jan 2017 23:21:53 +0900
Subject: [PATCH 007/301] support regex expansion in templating "Regex" field
 (#6565)

---
 public/app/features/templating/query_variable.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index 92b150f2f15..7dfcb854194 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -136,7 +136,7 @@ export class QueryVariable implements Variable {
     options = [];
 
     if (this.regex) {
-      regex = kbn.stringToJsRegex(this.templateSrv.replace(this.regex));
+      regex = kbn.stringToJsRegex(this.templateSrv.replace(this.regex, {}, 'regex'));
     }
 
     for (i = 0; i < metricNames.length; i++) {

From b600e1c50bfb5f0c9c6680fb1d5372499aeab0f7 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 31 Jan 2017 15:22:38 +0100
Subject: [PATCH 008/301] docs(changelog): adds note about closing #7417

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd9cb6d797e..943bb32b07d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,10 @@
 * **SingleStat**: Implements diff aggregation method for singlestat [#7234](https://github.com/grafana/grafana/issues/7234), thx [@oliverpool](https://github.com/oliverpool)
 * **Dataproxy**: Added setting to enable more verbose logging in dataproxy [#7209](https://github.com/grafana/grafana/pull/7209), thx [@Ricky-N](https://github.com/Ricky-N)
 * **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
-* **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [#huydx](https://github.com/huydx)
-* **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [#lpic10](https://github.com/lpic10)
-* **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [#FFalcon](https://github.com/FFalcon)
+* **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
+* **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [@lpic10](https://github.com/lpic10)
+* **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
+* **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 
 ## Tech
 

From 18f20a335746a74cd4b3891beca7b91359deec5c Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 31 Jan 2017 18:37:33 +0100
Subject: [PATCH 009/301] tech(build): deploy to new s3 buckets

---
 appveyor.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8b4a16d19cb..0d087e23dac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,6 +23,12 @@ install:
   - go env
   - go run build.go setup
 
+before_build:
+  - cmd: if NOT "%buildTag%"=="" echo Building tag! %buildTag%
+  - cmd: if NOT "%buildTag%"=="" git fetch
+  - cmd: if NOT "%buildTag%"=="" git checkout %buildTag%
+  - cmd: echo Building tag? %buildTag%
+
 build_script:
   - go run build.go build
   - grunt release
@@ -32,7 +38,17 @@ build_script:
 artifacts:
   - path: grafana-*windows-*.*
     name: binzip
+    type: zip
 
 deploy:
   - provider: Environment
-    name: GrafanaBuildsS3
+    name: GrafanaReleaseMaster
+    on:
+      buildType: master
+
+  - provider: Environment
+    name: GrafanaReleaseRelease
+    on:
+      buildType: release
+
+

From afd135944a778d76b4c61849688c28c8e00ba922 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 31 Jan 2017 20:57:34 +0100
Subject: [PATCH 010/301] tech(build): upgrade golang to 1.7.4

---
 appveyor.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0d087e23dac..30ccabb38d7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,6 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
 environment:
   nodejs_version: "6"
   GOPATH: c:\gopath
+  GOVERSION: 1.7.4
 
 install:
   # install nodejs and npm
@@ -14,6 +15,8 @@ install:
   - npm install -g yarn
   - yarn install --pure-lockfile
   - npm install -g grunt-cli
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.zip
+  - 7z x go%GOVERSION%.windows-amd64.zip -y -oC:\ > NUL
   # install gcc (needed for sqlite3)
   - choco install -y --limit-output mingw
   - set PATH=C:\tools\mingw64\bin;%PATH%
@@ -23,12 +26,6 @@ install:
   - go env
   - go run build.go setup
 
-before_build:
-  - cmd: if NOT "%buildTag%"=="" echo Building tag! %buildTag%
-  - cmd: if NOT "%buildTag%"=="" git fetch
-  - cmd: if NOT "%buildTag%"=="" git checkout %buildTag%
-  - cmd: echo Building tag? %buildTag%
-
 build_script:
   - go run build.go build
   - grunt release

From 74c5c5368cde1f492fd80fa4c9865b0147565997 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 31 Jan 2017 21:36:52 +0100
Subject: [PATCH 011/301] tech(build): update windows trigger

---
 scripts/trigger_windows_build.sh | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/scripts/trigger_windows_build.sh b/scripts/trigger_windows_build.sh
index 521a365a299..624509588fb 100755
--- a/scripts/trigger_windows_build.sh
+++ b/scripts/trigger_windows_build.sh
@@ -1,9 +1,28 @@
 #!/bin/bash
 
 _token=$1
+_commit=$2
+_buildType=$3
+
+post_data=$(cat <<EOF
+{
+  "accountName": "Torkeldegaard",
+  "projectSlug": "grafana",
+  "branch": "master",
+  "commitId": "${_commit}",
+  "environmentVariables": {
+    "buildType": "${_buildType}"
+  }
+}
+EOF
+)
+
+echo ${post_data}
 
 curl \
-  -H "Content-Type: application/json" \
-  -H "Authorization: Bearer ${_token}" \
-  -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "master","environmentVariables": {}}' \
-  https://ci.appveyor.com/api/builds
+--verbose \
+--header "Accept: application/json" \
+--header "Content-Type: application/json" \
+--header "Authorization: Bearer ${_token}" \
+--data "${post_data}" \
+--request POST https://ci.appveyor.com/api/builds

From ea6d996abc3e42f5fef3a4f21c0f77cfe54fb43c Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 31 Jan 2017 21:43:18 +0100
Subject: [PATCH 012/301] tech(build): enable windows build trigger

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index daa90305720..a72df78bd7e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -43,7 +43,7 @@ deployment:
       - ./scripts/build/sign_packages.sh
       - go run build.go sha1-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
-      #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
+      - ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN} ${CIRCLE_SHA1} master
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
     commands:
@@ -51,5 +51,5 @@ deployment:
       - ./scripts/build/sign_packages.sh
       - go run build.go sha1-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/release
-      #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
+      - ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN} ${CIRCLE_SHA1} release
 

From aef4195493a42060dc91e26e1673807d07e0d8b6 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 1 Feb 2017 07:09:36 +0100
Subject: [PATCH 013/301] tech(build): fixes invalid script file usage

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index a72df78bd7e..f4fe487dd77 100644
--- a/circle.yml
+++ b/circle.yml
@@ -43,7 +43,7 @@ deployment:
       - ./scripts/build/sign_packages.sh
       - go run build.go sha1-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
-      - ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN} ${CIRCLE_SHA1} master
+      - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
     commands:
@@ -51,5 +51,5 @@ deployment:
       - ./scripts/build/sign_packages.sh
       - go run build.go sha1-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/release
-      - ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN} ${CIRCLE_SHA1} release
+      - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release
 

From 30c334a2b81d03cd6472f36c94d668518c961ebd Mon Sep 17 00:00:00 2001
From: Alexander Menzhinsky <amenzhinsky@gmail.com>
Date: Wed, 1 Feb 2017 16:32:51 +0300
Subject: [PATCH 014/301] Add common type for oauth authorization errors

---
 pkg/api/login.go                          |  5 ++++
 pkg/api/login_oauth.go                    | 30 +++++++++++++++--------
 pkg/social/github_oauth.go                |  8 ++----
 pkg/social/social.go                      |  8 ++++++
 public/app/core/controllers/login_ctrl.js | 14 ++---------
 5 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/pkg/api/login.go b/pkg/api/login.go
index 8fbe414c08c..d664f65619b 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -35,6 +35,11 @@ func LoginView(c *middleware.Context) {
 	viewData.Settings["loginHint"] = setting.LoginHint
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
 
+	if loginError, ok := c.Session.Get("loginError").(string); ok {
+		c.Session.Set("loginError", "") // TODO: is there a proper way to delete a session var?
+		viewData.Settings["loginError"] = loginError
+	}
+
 	if !tryLoginUsingRememberCookie(c) {
 		c.HTML(200, VIEW_INDEX, viewData)
 		return
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 574d08af09f..9e356347bfd 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -22,6 +22,13 @@ import (
 	"github.com/grafana/grafana/pkg/social"
 )
 
+var (
+	ErrProviderDeniedRequest = errors.New("Login provider denied login request")
+	ErrEmailNotAllowed       = errors.New("Required email domain not fulfilled")
+	ErrSignUpNotAllowed      = errors.New("Signup is not allowed for this adapter")
+	ErrUsersQuotaReached     = errors.New("Users quota reached")
+)
+
 func GenStateString() string {
 	rnd := make([]byte, 32)
 	rand.Read(rnd)
@@ -44,8 +51,7 @@ func OAuthLogin(ctx *middleware.Context) {
 	error := ctx.Query("error")
 	if error != "" {
 		errorDesc := ctx.Query("error_description")
-		ctx.Logger.Info("OAuthLogin Failed", "error", error, "errorDesc", errorDesc)
-		ctx.Redirect(setting.AppSubUrl + "/login?failCode=1003")
+		redirectWithError(ctx, ErrProviderDeniedRequest, "error", error, "errorDesc", errorDesc)
 		return
 	}
 
@@ -117,10 +123,8 @@ func OAuthLogin(ctx *middleware.Context) {
 	// get user info
 	userInfo, err := connect.UserInfo(client)
 	if err != nil {
-		if err == social.ErrMissingTeamMembership {
-			ctx.Redirect(setting.AppSubUrl + "/login?failCode=1000")
-		} else if err == social.ErrMissingOrganizationMembership {
-			ctx.Redirect(setting.AppSubUrl + "/login?failCode=1001")
+		if sErr, ok := err.(*social.Error); ok {
+			redirectWithError(ctx, sErr)
 		} else {
 			ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err)
 		}
@@ -131,8 +135,7 @@ func OAuthLogin(ctx *middleware.Context) {
 
 	// validate that the email is allowed to login to grafana
 	if !connect.IsEmailAllowed(userInfo.Email) {
-		ctx.Logger.Info("OAuth login attempt with unallowed email", "email", userInfo.Email)
-		ctx.Redirect(setting.AppSubUrl + "/login?failCode=1002")
+		redirectWithError(ctx, ErrEmailNotAllowed)
 		return
 	}
 
@@ -142,7 +145,7 @@ func OAuthLogin(ctx *middleware.Context) {
 	// create account if missing
 	if err == m.ErrUserNotFound {
 		if !connect.IsSignupAllowed() {
-			ctx.Redirect(setting.AppSubUrl + "/login")
+			redirectWithError(ctx, ErrSignUpNotAllowed)
 			return
 		}
 		limitReached, err := middleware.QuotaReached(ctx, "user")
@@ -151,7 +154,7 @@ func OAuthLogin(ctx *middleware.Context) {
 			return
 		}
 		if limitReached {
-			ctx.Redirect(setting.AppSubUrl + "/login")
+			redirectWithError(ctx, ErrUsersQuotaReached)
 			return
 		}
 		cmd := m.CreateUserCommand{
@@ -179,3 +182,10 @@ func OAuthLogin(ctx *middleware.Context) {
 
 	ctx.Redirect(setting.AppSubUrl + "/")
 }
+
+func redirectWithError(ctx *middleware.Context, err error, v ...interface{}) {
+	ctx.Logger.Info(err.Error(), v...)
+	// TODO: we can use the flash storage here once it's implemented
+	ctx.Session.Set("loginError", err.Error())
+	ctx.Redirect(setting.AppSubUrl + "/login")
+}
diff --git a/pkg/social/github_oauth.go b/pkg/social/github_oauth.go
index 64ff1d86851..271a472be84 100644
--- a/pkg/social/github_oauth.go
+++ b/pkg/social/github_oauth.go
@@ -2,7 +2,6 @@ package social
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
 
@@ -21,11 +20,8 @@ type SocialGithub struct {
 }
 
 var (
-	ErrMissingTeamMembership = errors.New("User not a member of one of the required teams")
-)
-
-var (
-	ErrMissingOrganizationMembership = errors.New("User not a member of one of the required organizations")
+	ErrMissingTeamMembership         = &Error{"User not a member of one of the required teams"}
+	ErrMissingOrganizationMembership = &Error{"User not a member of one of the required organizations"}
 )
 
 func (s *SocialGithub) Type() int {
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 860d068957e..29c4b7ecbb4 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -29,6 +29,14 @@ type SocialConnector interface {
 	Client(ctx context.Context, t *oauth2.Token) *http.Client
 }
 
+type Error struct {
+	s string
+}
+
+func (e *Error) Error() string {
+	return e.s
+}
+
 var (
 	SocialBaseUrl = "/login/"
 	SocialMap     = make(map[string]SocialConnector)
diff --git a/public/app/core/controllers/login_ctrl.js b/public/app/core/controllers/login_ctrl.js
index fa3af3d10f0..54323711604 100644
--- a/public/app/core/controllers/login_ctrl.js
+++ b/public/app/core/controllers/login_ctrl.js
@@ -7,13 +7,6 @@ define([
 function (angular, _, coreModule, config) {
   'use strict';
 
-  var failCodes = {
-    "1000": "Required team membership not fulfilled",
-    "1001": "Required organization membership not fulfilled",
-    "1002": "Required email domain not fulfilled",
-    "1003": "Login provider denied login request",
-  };
-
   coreModule.default.controller('LoginCtrl', function($scope, backendSrv, contextSrv, $location) {
     $scope.formModel = {
       user: '',
@@ -36,11 +29,8 @@ function (angular, _, coreModule, config) {
     $scope.init = function() {
       $scope.$watch("loginMode", $scope.loginModeChanged);
 
-      var params = $location.search();
-      if (params.failCode) {
-        $scope.appEvent('alert-warning', ['Login Failed', failCodes[params.failCode]]);
-        delete params.failedMsg;
-        $location.search(params);
+      if (config.loginError) {
+        $scope.appEvent('alert-warning', ['Login Failed', config.loginError]);
       }
     };
 

From 3cbca80d3c0b7dc591ce048b287fb265c9b22c63 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Feb 2017 08:59:37 +0100
Subject: [PATCH 015/301] tech(build): starts docker build for latest build

---
 circle.yml                      |  1 +
 scripts/trigger_docker_build.sh | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100755 scripts/trigger_docker_build.sh

diff --git a/circle.yml b/circle.yml
index f4fe487dd77..8b3fe38550a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -44,6 +44,7 @@ deployment:
       - go run build.go sha1-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master
+      - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
     commands:
diff --git a/scripts/trigger_docker_build.sh b/scripts/trigger_docker_build.sh
new file mode 100755
index 00000000000..5ca9c0b88c8
--- /dev/null
+++ b/scripts/trigger_docker_build.sh
@@ -0,0 +1,23 @@
+  #!/bin/bash
+
+_circle_token=$1
+_grafana_version=$2
+
+trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/master?circle-token=${_circle_token}
+
+post_data=$(cat <<EOF
+{
+  "build_parameters": {
+    "GRAFANA_VERSION": "${_grafana_version}"
+  }
+}
+EOF
+)
+
+echo ${post_data}
+
+curl \
+--header "Accept: application/json" \
+--header "Content-Type: application/json" \
+--data "${post_data}" \
+--request POST ${trigger_build_url}

From 63aa4369970bbf16f74e5cadf42a9c2677c6726b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Feb 2017 11:33:34 +0100
Subject: [PATCH 016/301] tech(build): slimdown the size of the build container

---
 scripts/build/Dockerfile | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile
index c8df86a0bf1..e24470fc42b 100644
--- a/scripts/build/Dockerfile
+++ b/scripts/build/Dockerfile
@@ -1,34 +1,32 @@
 FROM centos:6.6
 
-RUN yum install -y yum-plugin-ovl initscripts curl tar gcc libc6-dev git gcc-c++ openssl-devel \
-    yum install -y g++ make automake autoconf curl-devel zlib-devel httpd-devel apr-devel apr-util-devel sqlite-devel \
-    yum install -y wget yum-utils bzip2 bzip2-devel \
-    yum install -y fontconfig freetype freetype-devel fontconfig-devel libstdc++ \
-    yum install -y rpm-build patch readline readline-devel libtool bison lzma \
+RUN yum install -y yum-plugin-ovl initscripts curl tar gcc libc6-dev git gcc-c++ openssl-devel && \
+    yum install -y g++ make automake autoconf curl-devel zlib-devel httpd-devel apr-devel apr-util-devel sqlite-devel && \
+    yum install -y wget yum-utils bzip2 bzip2-devel && \
+    yum install -y fontconfig freetype freetype-devel fontconfig-devel libstdc++ && \
+    yum install -y rpm-build patch readline readline-devel libtool bison lzma && \
     yum install -y which tar
 
 # Install RUBY 1.9.3
 # install necessary utilities
 # RUN yum install -y which tar
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-RUN curl -sSl https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
-RUN source /etc/profile.d/rvm.sh
-RUN /bin/bash -l -c "rvm requirements"
-RUN /bin/bash -l -c "rvm install 2.1.9"
-RUN /bin/bash -l -c "rvm use 2.1.9 --default"
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && \
+    curl -sSl https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable && \
+    source /etc/profile.d/rvm.sh && \
+    /bin/bash -l -c "rvm requirements" && \
+    /bin/bash -l -c "rvm install 2.1.9" && \
+    /bin/bash -l -c "rvm use 2.1.9 --default"
 
 # install nodejs
-RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash -
-RUN yum install -y nodejs --nogpgcheck
+RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
+    yum install -y nodejs --nogpgcheck
 
-RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo
-RUN yum install -y yarn --nogpgcheck
+RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
+    yum install -y yarn --nogpgcheck && \
+    wget https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.7.4.linux-amd64.tar.gz
 
 ENV GOLANG_VERSION 1.7.4
-
-RUN wget https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.7.4.linux-amd64.tar.gz
-
 ENV PATH /usr/local/go/bin:$PATH
 
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go

From a580113de4fea132a6b208b945bfc052dab1b8c8 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Feb 2017 12:05:44 +0100
Subject: [PATCH 017/301] feat(alerting): changes default timerange to 15min

---
 public/app/features/alerting/alert_def.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/alerting/alert_def.ts b/public/app/features/alerting/alert_def.ts
index fab612b5558..c65a35878e7 100644
--- a/public/app/features/alerting/alert_def.ts
+++ b/public/app/features/alerting/alert_def.ts
@@ -13,7 +13,7 @@ var alertQueryDef = new QueryPartDef({
     {name: "from", type: "string", options: ['1s', '10s', '1m', '5m', '10m', '15m', '1h', '24h', '48h']},
     {name: "to", type: "string", options: ['now']},
   ],
-  defaultParams: ['#A', '5m', 'now', 'avg']
+  defaultParams: ['#A', '15m', 'now', 'avg']
 });
 
 var conditionTypes = [

From 3e62b1b2d794ceabf9436b86fa02daf3cc402ac4 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Feb 2017 15:55:37 +0100
Subject: [PATCH 018/301] tech(build): use build number as iteration number

---
 build.go                | 8 +++++++-
 scripts/build/build.sh  | 8 ++++----
 scripts/build/deploy.sh | 1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.go b/build.go
index 78f73816ead..f525d798b76 100644
--- a/build.go
+++ b/build.go
@@ -38,6 +38,7 @@ var (
 	phjsToRelease         string
 	workingDir            string
 	includeBuildNumber    bool     = true
+	buildNumber           int      = 0
 	binaries              []string = []string{"grafana-server", "grafana-cli"}
 )
 
@@ -58,6 +59,7 @@ func main() {
 	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
 	flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name")
+	flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
 	flag.Parse()
 
 	readVersionFromPackageJson()
@@ -157,7 +159,11 @@ func readVersionFromPackageJson() {
 
 	// add timestamp to iteration
 	if includeBuildNumber {
-		linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
+		if buildNumber != 0 {
+			linuxPackageIteration = fmt.Sprintf("%d%s", buildNumber, linuxPackageIteration)
+		} else {
+			linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
+		}
 	}
 }
 
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index d16a5edec69..9674c8a0b8c 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -25,10 +25,10 @@ echo "current dir: $(pwd)"
 
 if [ "$CIRCLE_TAG" != "" ]; then
   echo "Building a release from tag $CIRCLE_TAG"
-  go run build.go -includeBuildNumber=false build
+  go run build.go -buildNumber=${CIRCLE_BUILD_NUM} -includeBuildNumber=false build
 else
   echo "Building incremental build for $CIRCLE_BRANCH"
-  go run build.go build
+  go run build.go -buildNumber=${CIRCLE_BUILD_NUM} build
 fi
 
 yarn install --pure-lockfile
@@ -42,10 +42,10 @@ echo "current dir: $(pwd)"
 
 if [ "$CIRCLE_TAG" != "" ]; then
   echo "Packaging a release from tag $CIRCLE_TAG"
-  go run build.go -includeBuildNumber=false package latest
+  go run build.go -buildNumber=${CIRCLE_BUILD_NUM} -includeBuildNumber=false package latest
 else
   echo "Packaging incremental build for $CIRCLE_BRANCH"
-  go run build.go package latest
+  go run build.go -buildNumber=${CIRCLE_BUILD_NUM} package latest
 fi
 
 cp dist/* /tmp/dist/
diff --git a/scripts/build/deploy.sh b/scripts/build/deploy.sh
index 4de3d3f3fb1..6c5661c5dfc 100755
--- a/scripts/build/deploy.sh
+++ b/scripts/build/deploy.sh
@@ -8,4 +8,5 @@ docker run -i -t --name gfbuild \
   -v $(pwd)/dist:/tmp/dist \
   -e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \
   -e "CIRCLE_TAG=${CIRCLE_TAG}" \
+  -e "CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM}"
   grafana/buildcontainer

From 65cf0d0e5c7e7998b2d513daeb6179ac58d7c800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 2 Feb 2017 16:29:11 +0100
Subject: [PATCH 019/301] fix(graph legend): fixed legend table mode scrollbar
 visible when it needs to to, fixes #6828

---
 public/sass/components/_panel_graph.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss
index 9e919072dce..7b44c29f8fa 100644
--- a/public/sass/components/_panel_graph.scss
+++ b/public/sass/components/_panel_graph.scss
@@ -89,6 +89,7 @@
     display: block;
     overflow-y: auto;
     overflow-x: hidden;
+    padding-bottom: 1px;
   }
 
   .graph-legend-series {

From 457d6c8f818c73c9e8e963538fd719cf09c19d0d Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Feb 2017 17:23:31 +0100
Subject: [PATCH 020/301] tech(build): fixes broken build

---
 scripts/build/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/deploy.sh b/scripts/build/deploy.sh
index 6c5661c5dfc..bfc735e4c79 100755
--- a/scripts/build/deploy.sh
+++ b/scripts/build/deploy.sh
@@ -8,5 +8,5 @@ docker run -i -t --name gfbuild \
   -v $(pwd)/dist:/tmp/dist \
   -e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \
   -e "CIRCLE_TAG=${CIRCLE_TAG}" \
-  -e "CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM}"
+  -e "CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM}" \
   grafana/buildcontainer

From 032ecad3b73b91393864466041b89967e24240fc Mon Sep 17 00:00:00 2001
From: lucapette <lucapette@gmail.com>
Date: Fri, 3 Feb 2017 12:10:22 +0100
Subject: [PATCH 021/301] Fix typo

---
 pkg/services/sqlstore/migrations/migrations.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index f0f69ee0e23..a88c1448bb7 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -5,7 +5,7 @@ import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 // --- Migration Guide line ---
 // 1. Never change a migration that is committed and pushed to master
 // 2. Always add new migrations (to change or undo previous migrations)
-// 3. Some migraitons are not yet written (rename column, table, drop table, index etc)
+// 3. Some migrations are not yet written (rename column, table, drop table, index etc)
 
 func AddMigrations(mg *Migrator) {
 	addMigrationLogMigrations(mg)

From d9b562812674382dac970a7dc45ee012b68769f8 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 3 Feb 2017 16:15:37 +0100
Subject: [PATCH 022/301] docs: update nodejs version requirement in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 14f5669d846..adf4270654a 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ go run build.go build
 
 ### Building frontend assets
 
-To build less to css for the frontend you will need a recent version of **node (v4+)**,
+To build less to css for the frontend you will need a recent version of **node (v6+)**,
 npm (v2.5.0) and grunt (v0.4.5). Run the following:
 
 ```bash

From 220b65afd244e21eade8da55d5f3d1b2b1c1b68f Mon Sep 17 00:00:00 2001
From: Grzegorz Pietrusza <gpietrusza@gmail.com>
Date: Sat, 4 Feb 2017 14:10:40 +0000
Subject: [PATCH 023/301] implement panels loading on scroll

---
 .../app/features/panel/metrics_panel_ctrl.ts  | 15 ++++++++++
 public/app/features/panel/panel_directive.ts  | 28 +++++++++++++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index d37a3f5db41..de6e331e8a1 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -12,6 +12,8 @@ import * as dateMath from 'app/core/utils/datemath';
 import {Subject} from 'vendor/npm/rxjs/Subject';
 
 class MetricsPanelCtrl extends PanelCtrl {
+  scope: any;
+  needsRefresh: boolean;
   loading: boolean;
   datasource: any;
   datasourceName: any;
@@ -40,6 +42,8 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.datasourceSrv = $injector.get('datasourceSrv');
     this.timeSrv = $injector.get('timeSrv');
     this.templateSrv = $injector.get('templateSrv');
+    this.scope = $scope;
+    this.needsRefresh = false;
 
     if (!this.panel.targets) {
       this.panel.targets = [{}];
@@ -50,6 +54,10 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.events.on('panel-teardown', this.onPanelTearDown.bind(this));
   }
 
+  private isRenderGraph () {
+    return window.location.href.indexOf("/dashboard-solo/") === 0;
+  }
+
   private onPanelTearDown() {
     if (this.dataSubscription) {
       this.dataSubscription.unsubscribe();
@@ -66,6 +74,13 @@ class MetricsPanelCtrl extends PanelCtrl {
     // ignore fetching data if another panel is in fullscreen
     if (this.otherPanelInFullscreenMode()) { return; }
 
+    if (!this.scope.$$childHead || (!this.scope.$$childHead.isVisible() && !this.isRenderGraph())) {
+      this.scope.$$childHead.needsRefresh = true;
+      return;
+    }
+
+    this.scope.$$childHead.needsRefresh = false;
+
     // if we have snapshot data use that
     if (this.panel.snapshotData) {
       this.updateTimeRange();
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 24977bd386c..8c51c8795d5 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -1,9 +1,8 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import angular from 'angular';
-import $ from 'jquery';
-import _ from 'lodash';
-import Drop from 'tether-drop';
+import angular from "angular";
+import $ from "jquery";
+import Drop from "tether-drop";
 
 var module = angular.module('grafana.directives');
 
@@ -57,7 +56,7 @@ var panelTemplate = `
   </div>
 `;
 
-module.directive('grafanaPanel', function($rootScope) {
+module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
   return {
     restrict: 'E',
     template: panelTemplate,
@@ -183,6 +182,25 @@ module.directive('grafanaPanel', function($rootScope) {
           infoDrop.destroy();
         }
       });
+
+      var getDataPromise = null;
+      scope.needsRefresh = false;
+
+      scope.isVisible = function () {
+        var position = panelContainer[0].getBoundingClientRect();
+        return (0 < position.top) && (position.top < window.innerHeight);
+      };
+
+      $document.bind('scroll', function () {
+        if (getDataPromise) {
+          $timeout.cancel(getDataPromise);
+        }
+        if (scope.needsRefresh) {
+          getDataPromise = $timeout(function () {
+            scope.ctrl.refresh();
+          }, 250);
+        }
+      });
     }
   };
 });

From a3019a9789caa8c3433e8659cfe963be899638d4 Mon Sep 17 00:00:00 2001
From: Grzegorz Pietrusza <gpietrusza@gmail.com>
Date: Sat, 4 Feb 2017 14:30:24 +0000
Subject: [PATCH 024/301] cleanup

---
 public/app/features/panel/panel_directive.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 8c51c8795d5..637facb50c1 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -1,8 +1,9 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import angular from "angular";
-import $ from "jquery";
-import Drop from "tether-drop";
+import angular from 'angular';
+import $ from 'jquery';
+import _ from 'lodash';
+import Drop from 'tether-drop';
 
 var module = angular.module('grafana.directives');
 

From c05bc0cb17bfbcc11f5ec8b2f7f6800ce7069f67 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Sun, 5 Feb 2017 21:19:39 +0100
Subject: [PATCH 025/301] chore(vet): fixes invalid fmt.Sprintf format

---
 pkg/services/alerting/conditions/query.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
index eafb233a60b..32bcf6a5cb5 100644
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -78,7 +78,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio
 
 		if context.IsTestRun {
 			context.Logs = append(context.Logs, &alerting.ResultLogEntry{
-				Message: fmt.Sprintf("Condition[%d]: Eval: %v, Query Returned No Series (reduced to null/no value)", evalMatch),
+				Message: fmt.Sprintf("Condition: Eval: %v, Query Returned No Series (reduced to null/no value)", evalMatch),
 			})
 		}
 

From a36b1d9dcebd46db88bc46f83c7c71fa8b874391 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Sun, 5 Feb 2017 21:21:05 +0100
Subject: [PATCH 026/301] tech(build): require go vet to pass

---
 scripts/circle-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index d2ff10f5f07..6dce8d540a6 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -20,7 +20,7 @@ exit_if_fail npm test
 
 exit_if_fail test -z "$(gofmt -s -l ./pkg | tee /dev/stderr)"
 exit_if_fail go run build.go build
-exit_if_fail go vet ./pkg/...
+exit_if_fail test -z "$(go vet ./pkg/... | tee /dev/stderr)"
 exit_if_fail go test -v ./pkg/...
 
 

From 9e7df648b5cc7dfe9812bcef6f368ca617ec6f5b Mon Sep 17 00:00:00 2001
From: jifwin <jifwin@users.noreply.github.com>
Date: Mon, 6 Feb 2017 06:42:26 +0100
Subject: [PATCH 027/301] Fix requests cancelling (#7457)

* fix backendSrv request cancelling

* revert imports

* formatting
---
 public/app/core/services/backend_srv.ts | 30 +++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 9a5ec5d219b..ba4f4dc2fb9 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -94,6 +94,21 @@ export class BackendSrv {
     });
   };
 
+  addCanceler(requestId, canceler) {
+    if (requestId in this.inFlightRequests) {
+      this.inFlightRequests[requestId].push(canceler);
+    } else {
+      this.inFlightRequests[requestId] = [canceler];
+    }
+  }
+
+  resolveCancelerIfExists(requestId) {
+    var cancelers = this.inFlightRequests[requestId];
+    if (!_.isUndefined(cancelers) && cancelers.length) {
+      cancelers[0].resolve();
+    }
+  }
+
   datasourceRequest(options) {
     options.retry = options.retry || 0;
 
@@ -101,16 +116,13 @@ export class BackendSrv {
     // particular query. If the requestID exists, the promise it is keyed to
     // is canceled, canceling the previous datasource request if it is still
     // in-flight.
-    var canceler;
-    if (options.requestId) {
-      canceler = this.inFlightRequests[options.requestId];
-      if (canceler) {
-        canceler.resolve();
-      }
+    var requestId = options.requestId;
+    if (requestId) {
+      this.resolveCancelerIfExists(requestId);
       // create new canceler
-      canceler = this.$q.defer();
+      var canceler = this.$q.defer();
       options.timeout = canceler.promise;
-      this.inFlightRequests[options.requestId] = canceler;
+      this.addCanceler(requestId, canceler);
     }
 
     var requestIsLocal = options.url.indexOf('/') === 0;
@@ -158,7 +170,7 @@ export class BackendSrv {
     }).finally(() => {
       // clean up
       if (options.requestId) {
-        delete this.inFlightRequests[options.requestId];
+        this.inFlightRequests[options.requestId].shift();
       }
     });
   };

From 982dc276d3e8ce0427afbfe78d17e3e22e7701d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 6 Feb 2017 10:19:47 +0100
Subject: [PATCH 028/301] Update building docs readme

---
 docs/README.md | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 65bd5714615..ea3f8394ace 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -6,14 +6,13 @@ and the [mkdocs](http://www.mkdocs.org/) tool.
 
 **Prepare the Docker Image**:
 
-Build the `grafana/docs-base:latest` image. Run these commands in the
-same directory this file is in. **Note** that you may require ``sudo``
+Git clone `grafana/grafana.org` repo. Run these commands in the root of that repo. **Note** that you may require ``sudo``
 when running ``make docs-build`` depending on how your system's docker
 service is configured):
 
 ```
-$ git clone https://github.com/grafana/docs-base
-$ cd docs-base
+$ git clone https://github.com/grafana/grafana.org
+$ cd grafana.org
 $ make docs-build
 ```
 
@@ -31,31 +30,6 @@ This command will not return control of the shell to the user. Instead
 the command is now running a new docker container built from the image
 we created in the previous step.
 
-Open [localhost:8180](http://localhost:8180) to view the docs.
-
-**Note** that after running ``make docs`` you may notice a message
-like this in the console output
-
-> Running at: http://0.0.0.0:8000/
-
-This is misleading. That is **not** the port the documentation is
-served from. You must browse to port **8180** to view the new
-documentation.
+Open [localhost:3004](http://localhost:3004) to view the docs.
 
 
-# Adding a New Page
-
-Adding a new page requires updating the ``mkdocs.yml`` file which is
-located in this directory.
-
-For example, if you are adding documentation for a new HTTP API called
-``preferences`` you would:
-
-1. Create the file ``docs/sources/http_api/preferences.md``
-1. Add a reference to it in ``docs/sources/http_api/overview.md``
-1. Update the list under the **pages** key in the ``docs/mkdocs.yml`` file with a reference to your new page:
-
-
-```yaml
-- ['http_api/preferences.md', 'API', 'Preferences API']
-```

From 3827c0a69c23f892ac5491022b5e840263b275ff Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 6 Feb 2017 14:59:29 +0100
Subject: [PATCH 029/301] tech(alerting): adds tags to alerting data model

---
 pkg/services/alerting/conditions/query.go | 1 +
 pkg/tsdb/models.go                        | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
index 32bcf6a5cb5..e0a6035355d 100644
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -67,6 +67,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio
 			matches = append(matches, &alerting.EvalMatch{
 				Metric: series.Name,
 				Value:  reducedValue,
+				Tags:   series.Tags,
 			})
 		}
 	}
diff --git a/pkg/tsdb/models.go b/pkg/tsdb/models.go
index 68f26a68d50..ade9b1c75f2 100644
--- a/pkg/tsdb/models.go
+++ b/pkg/tsdb/models.go
@@ -51,8 +51,9 @@ type QueryResult struct {
 }
 
 type TimeSeries struct {
-	Name   string           `json:"name"`
-	Points TimeSeriesPoints `json:"points"`
+	Name   string            `json:"name"`
+	Points TimeSeriesPoints  `json:"points"`
+	Tags   map[string]string `json:"tags"`
 }
 
 type TimePoint [2]null.Float

From 69566a23fc0302741f43a8078860ee822bda4b85 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Mon, 6 Feb 2017 00:08:35 +0900
Subject: [PATCH 030/301] improve security of Prometheus datasource

---
 pkg/api/dataproxy.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go
index dfdc867d4a4..bc286743533 100644
--- a/pkg/api/dataproxy.go
+++ b/pkg/api/dataproxy.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/grafana/grafana/pkg/api/cloudwatch"
@@ -107,6 +108,13 @@ func ProxyDataSourceRequest(c *middleware.Context) {
 
 	proxyPath := c.Params("*")
 
+	if ds.Type == m.DS_PROMETHEUS {
+		if !(c.Req.Request.Method == "GET" && strings.Index(proxyPath, "api/") == 0) {
+			c.JsonApiErr(403, "GET is only allowed on proxied Prometheus datasource", nil)
+			return
+		}
+	}
+
 	if ds.Type == m.DS_ES {
 		if c.Req.Request.Method == "DELETE" {
 			c.JsonApiErr(403, "Deletes not allowed on proxied Elasticsearch datasource", nil)

From 80b92335bb0c74a18fa8ef959275d40d2a01beae Mon Sep 17 00:00:00 2001
From: "r.khavronenko" <r.khavronenko@vertamedia.com>
Date: Mon, 6 Feb 2017 16:22:09 +0200
Subject: [PATCH 031/301] allow setting basic auth headers for prometheus
 datasource

---
 pkg/tsdb/prometheus/prometheus.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index f3704c2a430..c73e166138d 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -22,6 +22,18 @@ type PrometheusExecutor struct {
 	Transport *http.Transport
 }
 
+type basicAuthTransport struct {
+	*http.Transport
+
+	username string
+	password string
+}
+
+func (bat basicAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	req.SetBasicAuth(bat.username, bat.password)
+	return http.DefaultTransport.RoundTrip(req)
+}
+
 func NewPrometheusExecutor(dsInfo *models.DataSource) (tsdb.Executor, error) {
 	transport, err := dsInfo.GetHttpTransport()
 	if err != nil {
@@ -51,6 +63,14 @@ func (e *PrometheusExecutor) getClient() (prometheus.QueryAPI, error) {
 		Transport: e.Transport,
 	}
 
+	if e.BasicAuth {
+		cfg.Transport = basicAuthTransport{
+			Transport: e.Transport,
+			username: e.BasicAuthUser,
+			password: e.BasicAuthPassword,
+		}
+	}
+
 	client, err := prometheus.New(cfg)
 	if err != nil {
 		return nil, err

From 57d36b3d421c1f3aee9fcaaa5a5acaa4f1c2d6ff Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 6 Feb 2017 15:25:15 +0100
Subject: [PATCH 032/301] feat(alerting): transform labels into tags for
 prometheus tsdb

---
 pkg/tsdb/prometheus/prometheus.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index f3704c2a430..2e7099e0bb9 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -157,6 +157,11 @@ func parseResponse(value pmodel.Value, query *PrometheusQuery) (map[string]*tsdb
 	for _, v := range data {
 		series := tsdb.TimeSeries{
 			Name: formatLegend(v.Metric, query),
+			Tags: map[string]string{},
+		}
+
+		for k, v := range v.Metric {
+			series.Tags[string(k)] = string(v)
 		}
 
 		for _, k := range v.Values {

From 5a7abe365cc3a72ec0ee07ad2a0ad3db681463a6 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 6 Feb 2017 15:55:22 +0100
Subject: [PATCH 033/301] tech(build): echo before running go fmt/vet

---
 scripts/circle-test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 6dce8d540a6..726ba528363 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -18,9 +18,13 @@ yarn install --pure-lockfile
 
 exit_if_fail npm test
 
+echo "running go fmt"
 exit_if_fail test -z "$(gofmt -s -l ./pkg | tee /dev/stderr)"
-exit_if_fail go run build.go build
+
+echo "running go vet"
 exit_if_fail test -z "$(go vet ./pkg/... | tee /dev/stderr)"
+
+exit_if_fail go run build.go build
 exit_if_fail go test -v ./pkg/...
 
 

From 25be602dce04942c6e30f960febd7c3f4018f939 Mon Sep 17 00:00:00 2001
From: "r.khavronenko" <r.khavronenko@vertamedia.com>
Date: Mon, 6 Feb 2017 17:17:16 +0200
Subject: [PATCH 034/301] go fmt

---
 pkg/tsdb/prometheus/prometheus.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index c73e166138d..efe8e2fc528 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -66,8 +66,8 @@ func (e *PrometheusExecutor) getClient() (prometheus.QueryAPI, error) {
 	if e.BasicAuth {
 		cfg.Transport = basicAuthTransport{
 			Transport: e.Transport,
-			username: e.BasicAuthUser,
-			password: e.BasicAuthPassword,
+			username:  e.BasicAuthUser,
+			password:  e.BasicAuthPassword,
 		}
 	}
 

From 3398c28ab2acabede7ffbb05569577659d5e672c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 6 Feb 2017 18:04:34 +0100
Subject: [PATCH 035/301] docs(): fixing redirects for moved doc pages,
 updating links to point to new urls

---
 docs/sources/administration/cli.md            |  7 ++-
 docs/sources/alerting/rules.md                |  2 +-
 .../features/datasources/cloudwatch.md        |  1 +
 .../features/datasources/elasticsearch.md     |  1 +
 docs/sources/features/datasources/graphite.md |  1 +
 docs/sources/features/datasources/influxdb.md |  1 +
 docs/sources/features/datasources/kairosdb.md | 52 -------------------
 docs/sources/features/datasources/opentsdb.md |  1 +
 .../features/datasources/plugin_api.md        | 34 ------------
 .../features/datasources/prometheus.md        |  3 +-
 docs/sources/features/datasources/testdata.md | 28 +++++-----
 docs/sources/guides/basic_concepts.md         |  2 +-
 docs/sources/index.md                         |  8 +--
 docs/sources/installation/debian.md           |  8 +--
 docs/sources/installation/rpm.md              |  8 +--
 15 files changed, 40 insertions(+), 117 deletions(-)
 delete mode 100644 docs/sources/features/datasources/kairosdb.md
 delete mode 100644 docs/sources/features/datasources/plugin_api.md

diff --git a/docs/sources/administration/cli.md b/docs/sources/administration/cli.md
index 99446fb5f1b..ebe910503aa 100644
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -10,11 +10,14 @@ weight = 8
 
 # Grafana CLI
 
-Grafana cli is a small executable that is bundled with grafana server and is suppose to be executed on the same machine as grafana runs. 
+Grafana cli is a small executable that is bundled with grafana server and is suppose to be
+executed on the same machine as grafana runs.
 
 ## Plugins
 
-The CLI helps you install, upgrade and manage your plugins on the same machine it CLI is running. You can find more information about how to install and manage your plugins at the [plugin page] ({{< relref "/installation.md" >}})
+The CLI helps you install, upgrade and manage your plugins on the same machine it CLI is running.
+You can find more information about how to install and manage your plugins at the
+[plugin page]({{< relref "plugins/installation.md" >}}).
 
 ## Admin
 
diff --git a/docs/sources/alerting/rules.md b/docs/sources/alerting/rules.md
index af3cfecfdb8..a2688de3100 100644
--- a/docs/sources/alerting/rules.md
+++ b/docs/sources/alerting/rules.md
@@ -33,7 +33,7 @@ of core Grafana. Only some data soures are supported right now. They include `Gr
 ### Clustering
 
 We have not implemented clustering yet. So if you run multiple instances of grafana-server
-you have to make sure [execute_alerts]({{< relref "/installation/configuration.md#alerting" >}})
+you have to make sure [execute_alerts]({{< relref "installation/configuration.md#alerting" >}})
 is true on only one instance or otherwise you will get duplicated notifications.
 
 <div class="clearfix"></div>
diff --git a/docs/sources/features/datasources/cloudwatch.md b/docs/sources/features/datasources/cloudwatch.md
index b4ad0b3288e..c2896c5b172 100644
--- a/docs/sources/features/datasources/cloudwatch.md
+++ b/docs/sources/features/datasources/cloudwatch.md
@@ -3,6 +3,7 @@ title = "AWS CloudWatch"
 description = "Guide for using CloudWatch in Grafana"
 keywords = ["grafana", "cloudwatch", "guide"]
 type = "docs"
+aliases = ["/datasources/cloudwatch"]
 [menu.docs]
 name = "AWS Cloudwatch"
 identifier = "cloudwatch"
diff --git a/docs/sources/features/datasources/elasticsearch.md b/docs/sources/features/datasources/elasticsearch.md
index 345f68a9220..4f8bfaf968c 100644
--- a/docs/sources/features/datasources/elasticsearch.md
+++ b/docs/sources/features/datasources/elasticsearch.md
@@ -3,6 +3,7 @@ title = "Using Elasticsearch in Grafana"
 description = "Guide for using Elasticsearch in Grafana"
 keywords = ["grafana", "elasticsearch", "guide"]
 type = "docs"
+aliases = ["/datasources/elasticsearch"]
 [menu.docs]
 name = "Elasticsearch"
 parent = "datasources"
diff --git a/docs/sources/features/datasources/graphite.md b/docs/sources/features/datasources/graphite.md
index 44a4dff3761..11e15ab503e 100644
--- a/docs/sources/features/datasources/graphite.md
+++ b/docs/sources/features/datasources/graphite.md
@@ -3,6 +3,7 @@ title = "Using Graphite in Grafana"
 description = "Guide for using graphite in Grafana"
 keywords = ["grafana", "graphite", "guide"]
 type = "docs"
+aliases = ["/datasources/graphite"]
 [menu.docs]
 name = "Graphite"
 identifier = "graphite"
diff --git a/docs/sources/features/datasources/influxdb.md b/docs/sources/features/datasources/influxdb.md
index c6afdfdc8d4..c271571aa31 100644
--- a/docs/sources/features/datasources/influxdb.md
+++ b/docs/sources/features/datasources/influxdb.md
@@ -3,6 +3,7 @@ title = "Using InfluxDB in Grafana"
 description = "Guide for using InfluxDB in Grafana"
 keywords = ["grafana", "influxdb", "guide"]
 type = "docs"
+aliases = ["/datasources/influxdb"]
 [menu.docs]
 name = "InfluxDB"
 parent = "datasources"
diff --git a/docs/sources/features/datasources/kairosdb.md b/docs/sources/features/datasources/kairosdb.md
deleted file mode 100644
index d27105d0ee1..00000000000
--- a/docs/sources/features/datasources/kairosdb.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-page_title: KairosDB Guide
-page_description: KairosDB guide for Grafana
-page_keywords: grafana, kairosdb, documentation
----
-
-# KairosDB Guide
-Grafana v2.1 brings initial support for KairosDB Datasources. While the process of adding the datasource is similar to adding a Graphite or OpenTSDB datasource type, Kairos DB does have a few different options for building queries.
-
-## Adding the data source to Grafana
-![](/img/v2/add_KairosDB.jpg)
-
-1. Open the side menu by clicking the the Grafana icon in the top header.
-2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
-
-    > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
-
-3. Click the `Add new` link in the top header.
-4. Select `KairosDB` from the dropdown.
-
-
-
-Name | Description
------------- | -------------
-Name | The data source name, important that this is the same as in Grafana v1.x if you plan to import old dashboards.
-Default | Default data source means that it will be pre-selected for new panels.
-Url | The http protocol, ip and port of your kairosdb server (default port is usually 8080)
-Access | Proxy = access via Grafana backend, Direct = access directly from browser.
-
-## Query editor
-Open a graph in edit mode by click the title.
-
-![](/img/v2/kairos_query_editor.jpg)
-
-For details on KairosDB metric queries checkout the official.
-- [Query Metrics - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/QueryMetrics.html).
-
-## Templated queries
-KairosDB Datasource Plugin provides following functions in `Variables values query` field in Templating Editor to query `metric names`, `tag names`, and `tag values` to kairosdb server.
-
-Name | Description
-| ------- | --------|
-`metrics(query)`  | Returns a list of metric names matching `query`. If nothing is given, returns a list of all metric names.
-`tag_names(query)` | Returns a list of tag names matching `query`. If nothing is given, returns a list of all tag names.
-`tag_values(metric,tag)` | Returns a list of values for `tag` from the given `metric`.
-
-For details of `metric names`, `tag names`, and `tag values`, please refer to the KairosDB documentations.
-
-- [List Metric Names - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListMetricNames.html)
-- [List Tag Names - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListTagNames.html)
-- [List Tag Values - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListTagValues.html)
-- [Query Metrics - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/QueryMetrics.html).
diff --git a/docs/sources/features/datasources/opentsdb.md b/docs/sources/features/datasources/opentsdb.md
index 7e81ebe1483..435852137a5 100644
--- a/docs/sources/features/datasources/opentsdb.md
+++ b/docs/sources/features/datasources/opentsdb.md
@@ -3,6 +3,7 @@ title = "Using OpenTSDB in Grafana"
 description = "Guide for using OpenTSDB in Grafana"
 keywords = ["grafana", "opentsdb", "guide"]
 type = "docs"
+aliases = ["/datasources/opentsdb"]
 [menu.docs]
 name = "OpenTSDB"
 parent = "datasources"
diff --git a/docs/sources/features/datasources/plugin_api.md b/docs/sources/features/datasources/plugin_api.md
deleted file mode 100644
index 2e2121ed21a..00000000000
--- a/docs/sources/features/datasources/plugin_api.md
+++ /dev/null
@@ -1,34 +0,0 @@
-----
-page_title: Data source Plugin API
-page_description: Data Source Plugin Description
-page_keywords: grafana, data source, plugin, api, docs
----
-
-# Data source plugin API
-
-All data sources in Grafana are implemented as plugins.
-
-## Breaking change in 2.2
-
-In Grafana 2.2 a breaking change was introduced for how data source query editors
-are structured, defined and loaded. This was in order to support mixing multiple data sources
-in the same panel.
-
-In Grafana 2.2, the query editor is no longer defined using the partials section in
-`plugin.json`, but defined via an angular directive named using convention naming
-scheme like `metricQueryEditor<data source type name>`. For example
-
-Graphite defines a directive like this:
-
-```javascript
-module.directive('metricQueryEditorGraphite', function() {
-  return {controller: 'GraphiteQueryCtrl', templateUrl: 'app/plugins/datasource/graphite/partials/query.editor.html'};
-});
-```
-
-Even though the data source type name is with lowercase `g`, the directive uses capital `G` in `Graphite` because
-that is how angular directives needs to be named in order to match an element with name `<metric-query-editor-graphite />`.
-You also specify the query controller here instead of in the query.editor.html partial like before.
-
-
-
diff --git a/docs/sources/features/datasources/prometheus.md b/docs/sources/features/datasources/prometheus.md
index 2a35bb615cb..ee272f6b4c6 100644
--- a/docs/sources/features/datasources/prometheus.md
+++ b/docs/sources/features/datasources/prometheus.md
@@ -3,6 +3,7 @@ title = "Using Prometheus in Grafana"
 description = "Guide for using Prometheus in Grafana"
 keywords = ["grafana", "prometheus", "guide"]
 type = "docs"
+aliases = ["/datasources/prometheus"]
 [menu.docs]
 name = "Prometheus"
 parent = "datasources"
@@ -74,7 +75,7 @@ You can also use raw queries & regular expressions to extract anything you might
 
 ### Using templated variables in queries
 
-When the `Include All` option or `Multi-Value` option is enabled, Grafana converts the labels from plain text to a regex compatible string. 
+When the `Include All` option or `Multi-Value` option is enabled, Grafana converts the labels from plain text to a regex compatible string.
 Which means you have to use `=~` instead of `=` in your Prometheus queries. For example `ALERTS{instance=~$instance}` instead of `ALERTS{instance=$instance}`.
 
 ![](/img/v2/prometheus_templating.png)
diff --git a/docs/sources/features/datasources/testdata.md b/docs/sources/features/datasources/testdata.md
index 02e99f7dd8a..3e3f0909700 100644
--- a/docs/sources/features/datasources/testdata.md
+++ b/docs/sources/features/datasources/testdata.md
@@ -1,23 +1,23 @@
 +++
-title = "Grafana TestData"
+title = "TestData"
 keywords = ["grafana", "dashboard", "documentation", "panels", "testdata"]
 type = "docs"
 [menu.docs]
-name = "Grafana TestData"
+name = "TestData"
 parent = "datasources"
-weight = 2
+weight = 20
 +++
 
 
-# Grafana TestData 
+# Grafana TestData
 
-    > NOTE: This plugin is disable by default. 
+    > NOTE: This plugin is disable by default.
 
-The purpose of this data sources is to make it easier to create fake data for any panel. 
-Using `Grafana TestData` you can build your own time series and have any panel render it. 
-This make is much easier to verify functionally since the data can be shared very 
+The purpose of this data sources is to make it easier to create fake data for any panel.
+Using `Grafana TestData` you can build your own time series and have any panel render it.
+This make is much easier to verify functionally since the data can be shared very
 
-## Enable 
+## Enable
 
 `Grafana TestData` is not enabled by default. To enable it you have to go to `/plugins/testdata/edit` and click the enable button to enable it for each server.
 
@@ -33,8 +33,8 @@ You can now choose different scenario that you want rendered in the drop down me
 
 ## CSV
 
-The comma separated values scenario is the most powerful one since it lets you create any kind of graph you like. 
-Once you provided the numbers `Grafana TestData` will distribute them evenly based on the time range of your query. 
+The comma separated values scenario is the most powerful one since it lets you create any kind of graph you like.
+Once you provided the numbers `Grafana TestData` will distribute them evenly based on the time range of your query.
 
 ![](/img/docs/v41/test_data_csv_example.png)
 
@@ -45,10 +45,10 @@ Once you provided the numbers `Grafana TestData` will distribute them evenly bas
 
 ### Commit updates to the dashboards
 
-If you want to submit a change to one of the current dashboards bundled with `Grafana TestData` you have to update the revision property. 
+If you want to submit a change to one of the current dashboards bundled with `Grafana TestData` you have to update the revision property.
 Otherwise the dashboard will not be updated automatically for other Grafana users.
 
 ## Using test data in issues
 
-If you post an issue on github regarding time series data or rendering of time series data we strongly advice you to use this data source to replicate the data. 
-That makes it much easier for the developers to replicate and solve the issue you have. 
+If you post an issue on github regarding time series data or rendering of time series data we strongly advice you to use this data source to replicate the data.
+That makes it much easier for the developers to replicate and solve the issue you have.
diff --git a/docs/sources/guides/basic_concepts.md b/docs/sources/guides/basic_concepts.md
index bbb1cb53728..112b004ec92 100644
--- a/docs/sources/guides/basic_concepts.md
+++ b/docs/sources/guides/basic_concepts.md
@@ -16,7 +16,7 @@ This document is a “bottom up” introduction to basic concepts in Grafana, an
 ### Data Source
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
-The following datasources are officially supported: [Graphite](/datasources/graphite/), [InfluxDB](/datasources/influxdb/), [OpenTSDB](/datasources/opentsdb/), [Prometheus](/datasources/prometheus/), [Elasticsearch](/datasources/elasticsearch/), [CloudWatch](/datasources/cloudwatch/), and [KairosDB](/datasources/kairosdb)
+The following datasources are officially supported: [Graphite]({{< relref "features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "features/datasources/cloudwatch.md" >}}).
 
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
diff --git a/docs/sources/index.md b/docs/sources/index.md
index 0324bf888ad..daf1bd34c36 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -42,9 +42,9 @@ those options.
 
 ## Data sources guides
 
-- [Graphite](datasources/graphite)
-- [Elasticsearch](datasources/elasticsearch)
-- [InfluxDB](datasources/influxdb)
-- [OpenTSDB](datasources/opentsdb)
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
 
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 088f7d14461..9c6140c0c6d 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -114,10 +114,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ## Installing from binary tar file
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 8be68232011..63181fc535d 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -121,10 +121,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ### Server side image rendering
 

From abd9233f86fead3dd1d931a5370ad2304511f0c1 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 7 Feb 2017 07:48:01 +0100
Subject: [PATCH 036/301] Docs for developing plugins (#7475)

* docs(plugins): new developing plugins section

Creates new section called Developing Plugins in
the plugin section of the docs.

1. Some changes to the Development guide page
2. Converted defaults/editor mode blog post
to new page
3. Converted snapshots blog post to new page
4. Adds new code styleguide page
5. Updates to apps and datasources pages
6. Adds plugin.json schema

* docs(links): fixes broken links

Fixes broken links to other pages as
well as broken image links.
---
 docs/sources/administration/cli.md            |   3 +-
 docs/sources/alerting/metrics.md              |   2 +-
 docs/sources/features/datasources/index.md    |   3 +
 .../features/datasources/prometheus.md        |  10 +-
 docs/sources/guides/basic_concepts.md         |   3 +
 docs/sources/guides/getting_started.md        |   6 +-
 docs/sources/http_api/auth.md                 |   2 +-
 docs/sources/plugins/apps.md                  |  24 ---
 docs/sources/plugins/developing/apps.md       |  63 ++++++
 .../plugins/developing/code-styleguide.md     | 182 ++++++++++++++++++
 .../plugins/{ => developing}/datasources.md   |  50 +++--
 .../developing/defaults-and-editor-mode.md    | 128 ++++++++++++
 .../sources/plugins/developing/development.md | 120 ++++++++++++
 docs/sources/plugins/developing/index.md      |   8 +
 .../plugins/{ => developing}/panels.md        |   2 +-
 .../sources/plugins/developing/plugin.json.md |  28 +++
 .../plugins/developing/snapshot-mode.md       |  79 ++++++++
 docs/sources/plugins/development.md           |  60 ------
 docs/sources/plugins/plugin.json.md           |  10 -
 docs/sources/reference/dashboard.md           |  18 +-
 docs/sources/reference/playlist.md            |   2 +-
 docs/sources/tutorials/hubot_howto.md         |  12 +-
 22 files changed, 683 insertions(+), 132 deletions(-)
 delete mode 100644 docs/sources/plugins/apps.md
 create mode 100644 docs/sources/plugins/developing/apps.md
 create mode 100644 docs/sources/plugins/developing/code-styleguide.md
 rename docs/sources/plugins/{ => developing}/datasources.md (69%)
 create mode 100644 docs/sources/plugins/developing/defaults-and-editor-mode.md
 create mode 100644 docs/sources/plugins/developing/development.md
 create mode 100644 docs/sources/plugins/developing/index.md
 rename docs/sources/plugins/{ => developing}/panels.md (95%)
 create mode 100644 docs/sources/plugins/developing/plugin.json.md
 create mode 100644 docs/sources/plugins/developing/snapshot-mode.md
 delete mode 100644 docs/sources/plugins/development.md
 delete mode 100644 docs/sources/plugins/plugin.json.md

diff --git a/docs/sources/administration/cli.md b/docs/sources/administration/cli.md
index ebe910503aa..8c7755506e8 100644
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -10,8 +10,7 @@ weight = 8
 
 # Grafana CLI
 
-Grafana cli is a small executable that is bundled with grafana server and is suppose to be
-executed on the same machine as grafana runs.
+Grafana cli is a small executable that is bundled with grafana server and is suppose to be executed on the same machine as grafana runs.
 
 ## Plugins
 
diff --git a/docs/sources/alerting/metrics.md b/docs/sources/alerting/metrics.md
index b0bf5c9f4fc..02fee6a718a 100644
--- a/docs/sources/alerting/metrics.md
+++ b/docs/sources/alerting/metrics.md
@@ -13,7 +13,7 @@ weight = 2
 
 > Alerting is only available in Grafana v4.0 and above.
 
-The alert engine publish some internal metrics about itself. You can read more about how Grafana published [interal metrics](/installation/configuration/#metrics)
+The alert engine publishes some internal metrics about itself. You can read more about how Grafana published [internal metrics](/installation/configuration/#metrics).
 
 Description | Type | Metric name
 ---------- | ----------- | ----------
diff --git a/docs/sources/features/datasources/index.md b/docs/sources/features/datasources/index.md
index af0062ddc51..fcef3370455 100644
--- a/docs/sources/features/datasources/index.md
+++ b/docs/sources/features/datasources/index.md
@@ -9,13 +9,16 @@ weight = 5
 +++
 
 # Data Source Overview
+
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
 
 ## Querying
+
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
 ## Supported Data Sources
+
 The following datasources are officially supported:
 
 * [Graphite]({{< relref "graphite.md" >}})
diff --git a/docs/sources/features/datasources/prometheus.md b/docs/sources/features/datasources/prometheus.md
index ee272f6b4c6..947d7426230 100644
--- a/docs/sources/features/datasources/prometheus.md
+++ b/docs/sources/features/datasources/prometheus.md
@@ -16,7 +16,8 @@ weight = 2
 Grafana includes support for Prometheus Datasources. While the process of adding the datasource is similar to adding a Graphite or OpenTSDB datasource type, Prometheus does have a few different options for building queries.
 
 ## Adding the data source to Grafana
-![](/img/v2/add_Prometheus.png)
+
+![](/img/docs/v2/add_Prometheus.png)
 
 1. Open the side menu by clicking the the Grafana icon in the top header.
 2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
@@ -49,6 +50,7 @@ For details on Prometheus metric queries check out the Prometheus documentation
 - [Query Metrics - Prometheus documentation](http://prometheus.io/docs/querying/basics/).
 
 ## Templated queries
+
 Prometheus Datasource Plugin provides the following functions in `Variables values query` field in Templating Editor to query `metric names` and `labels names` on the Prometheus server.
 
 Name | Description
@@ -65,8 +67,8 @@ For details of `metric names` & `label names`, and `label values`, please refer
 You can create a template variable in Grafana and have that variable filled with values from any Prometheus metric exploration query.
 You can then use this variable in your Prometheus metric queries.
 
-For example you can have a variable that contains all values for label `hostname` if you specify a query like this
-in the templating edit view.
+For example you can have a variable that contains all values for label `hostname` if you specify a query like this in the templating edit view.
+
 ```sql
 label_values(hostname)
 ```
@@ -78,4 +80,4 @@ You can also use raw queries & regular expressions to extract anything you might
 When the `Include All` option or `Multi-Value` option is enabled, Grafana converts the labels from plain text to a regex compatible string.
 Which means you have to use `=~` instead of `=` in your Prometheus queries. For example `ALERTS{instance=~$instance}` instead of `ALERTS{instance=$instance}`.
 
-![](/img/v2/prometheus_templating.png)
+![](/img/docs/v2/prometheus_templating.png)
diff --git a/docs/sources/guides/basic_concepts.md b/docs/sources/guides/basic_concepts.md
index 112b004ec92..cb64b105349 100644
--- a/docs/sources/guides/basic_concepts.md
+++ b/docs/sources/guides/basic_concepts.md
@@ -14,6 +14,7 @@ parent = "guides"
 This document is a “bottom up” introduction to basic concepts in Grafana, and can be used as a starting point to get familiar with core features.
 
 ### Data Source
+
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
 The following datasources are officially supported: [Graphite]({{< relref "features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "features/datasources/cloudwatch.md" >}}).
@@ -21,6 +22,7 @@ The following datasources are officially supported: [Graphite]({{< relref "featu
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
 ### Organization
+
 Grafana supports multiple organizations in order to support a wide variety of deployment models, including using a single Grafana instance to provide service to multiple potentially untrusted Organizations.
 
 In many cases, Grafana will be deployed with a single Organization.
@@ -34,6 +36,7 @@ All Dashboards are owned by a particular Organization.
 For more details on the user model for Grafana, please refer to [Admin](/reference/admin/)
 
 ### User
+
 A User is a named account in Grafana. A user can belong to one or more Organizations, and can be assigned different levels of privileges through roles.
 
 Grafana supports a wide variety of internal and external ways for Users to authenticate themselves. These include from its own integrated database, from an external SQL server, or from an external LDAP server.
diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md
index 3f039f97ae4..dde8283e79d 100644
--- a/docs/sources/guides/getting_started.md
+++ b/docs/sources/guides/getting_started.md
@@ -10,12 +10,15 @@ parent = "guides"
 +++
 
 # Getting started
-This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/datasources/overview).
+
+This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/features/datasources/).
 
 ## Beginner guides
+
 Watch the 10min [beginners guide to building dashboards](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) to get a quick intro to setting up Dashboards and Panels.
 
 ## Basic Concepts
+
 Read the [Basic Concepts](/guides/basic_concepts) document to get a crash course in key Grafana concepts.
 
 ### Top header
@@ -34,6 +37,7 @@ The image above shows you the top header for a Dashboard.
 6. Settings: Manage Dashboard settings and features such as Templating and Annotations.
 
 ## Dashboards, Panels, Rows, the building blocks of Grafana...
+
 Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, and KairosDB). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
 
 
diff --git a/docs/sources/http_api/auth.md b/docs/sources/http_api/auth.md
index aaeda1105b1..ef62f271715 100644
--- a/docs/sources/http_api/auth.md
+++ b/docs/sources/http_api/auth.md
@@ -30,7 +30,7 @@ curl example:
 
 Open the sidemenu and click the organization dropdown and select the `API Keys` option.
 
-![](/img/v2/orgdropdown_api_keys.png)
+![](/img/docs/v2/orgdropdown_api_keys.png)
 
 You use the token in all requests in the `Authorization` header, like this:
 
diff --git a/docs/sources/plugins/apps.md b/docs/sources/plugins/apps.md
deleted file mode 100644
index 74038a9feb9..00000000000
--- a/docs/sources/plugins/apps.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-page_title: App plugin
-page_description: App plugin for Grafana
-page_keywords: grafana, plugins, documentation
----
-
-
-# Apps
-
-App plugins is a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enables the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests.
-
-Datasource and panel plugins will show up like normal plugins. The app pages will be available in the main menu.
-
-<img class="no-shadow" src="/img/v3/app-in-main-menu.png">
-
-## Enabling app plugins
-After installing an app it have to be enabled before it show up as an datasource or panel. You can do that on the app page in the config tab.
-
-### Develop your own App
-
-> Our goal is not to have a very extensive documentation but rather have actual
-> code that people can look at. An example implementation of an app can be found
-> in this [example app repo](https://github.com/grafana/example-app)
-
diff --git a/docs/sources/plugins/developing/apps.md b/docs/sources/plugins/developing/apps.md
new file mode 100644
index 00000000000..a3fc35066f6
--- /dev/null
+++ b/docs/sources/plugins/developing/apps.md
@@ -0,0 +1,63 @@
++++
+title = "Developing App Plugins"
+keywords = ["grafana", "plugins", "documentation"]
+type = "docs"
+[menu.docs]
+name = "Developing App Plugins"
+parent = "developing"
+weight = 6
++++
+
+# Grafana Apps
+
+App plugins are a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enable the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests.
+
+Datasource and panel plugins will show up like normal plugins. The app pages will be available in the main menu.
+
+{{< imgbox img="/img/docs/v3/app-in-main-menu.png" caption="App in Main Menu" >}}
+
+## Enabling app plugins
+
+After installing an app, it has to be enabled before it shows up as a datasource or panel. You can do that on the app page in the config tab.
+
+## Developing an App Plugin
+
+An App is a bundle of panels, dashboards and/or data source(s). There is nothing different about developing panels and data sources for an app.
+
+Apps have to be enabled in Grafana and should import any included dashboards when the user enables it. A ConfigCtrl class should be created and the dashboards imported in the postUpdate hook. See example below:
+
+```javascript
+export class ConfigCtrl {
+  /** @ngInject */
+  constructor($scope, $injector, $q) {
+    this.$q = $q;
+    this.enabled = false;
+    this.appEditCtrl.setPostUpdateHook(this.postUpdate.bind(this));
+  }
+
+  postUpdate() {
+    if (!this.appModel.enabled) {
+      return this.$q.resolve();
+    }
+    return this.appEditCtrl.importDashboards().then(() => {
+      this.enabled = true;
+      return {
+        url: "plugins/raintank-kubernetes-app/page/clusters",
+        message: "Kubernetes App enabled!"
+      };
+    });
+  }
+}
+ConfigCtrl.templateUrl = 'components/config/config.html';
+```
+
+If possible a link to a dashboard or custom page should be shown after enabling the app to guide the user to the appropriate place.
+
+{{< imgbox img="/img/docs/app_plugin_after_enable.png" caption="After enabling" >}}
+
+### Develop your own App
+
+> Our goal is not to have a very extensive documentation but rather have actual
+> code that people can look at. An example implementation of an app can be found
+> in this [example app repo](https://github.com/grafana/example-app)
+
diff --git a/docs/sources/plugins/developing/code-styleguide.md b/docs/sources/plugins/developing/code-styleguide.md
new file mode 100644
index 00000000000..99d9f565c7d
--- /dev/null
+++ b/docs/sources/plugins/developing/code-styleguide.md
@@ -0,0 +1,182 @@
++++
+title = "Plugin Code Styleguide"
+type = "docs"
+[menu.docs]
+name = "Plugin Code Styleguide"
+parent = "developing"
+weight = 2
++++
+
+# Grafana Plugin Code Styleguide
+
+This guide has two parts. The first part describes the metadata and the second part is a styleguide for HTML/CSS and JavaScript in Grafana plugins and applies if you are using ES6 in your plugin. If using TypeScript then the [Angular TypeScript styleguide](https://angular.io/styleguide) is recommended.
+
+## Metadata
+
+The plugin metadata consists of a plugin.json file and the README.md file. These two files are used by Grafana and Grafana.net.
+
+### Plugin.json (mandatory)
+
+The plugin.json file is the same concept as the package.json file for an npm package. When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless the folder contains a subfolder named `dist`. In that case grafana will mount the `dist` folder instead.
+
+The most important fields are the first three, especially the id. The convention for the plugin id is **[github username/org]-[plugin name]-[datasource|app|panel]** and it has to be unique.
+
+Examples:
+
+```
+raintank-worldping-app
+grafana-simple-json-datasource
+grafana-piechart-panel
+mtanda-histogram-panel
+```
+
+The full file format for plugin.json is described [here]({{< relref "plugin.json.md" >}}).
+
+Minimal plugin.json:
+
+```javascript
+{
+  "type": "panel",
+  "name": "Clock",
+  "id": "yourorg-clock-panel",
+
+  "info": {
+    "description": "Clock panel for grafana",
+    "author": {
+      "name": "Raintank Inc.",
+      "url": "http://raintank.io"
+    },
+    "keywords": ["clock", "panel"],
+    "version": "1.0.0",
+    "updated": "2015-03-24"
+  },
+
+  "dependencies": {
+    "grafanaVersion": "3.x.x",
+    "plugins": [ ]
+  }
+}
+```
+
+### README.md
+
+The README.md file is rendered both on Grafana.net and in the plugins section in Grafana. The only difference from how GitHub renders markdown is that html is not allowed.
+
+## File and Directory Structure Conventions
+
+Here is a typical directory structure for a plugin.
+
+```
+johnnyb-awesome-datasource
+|-- dist
+|-- spec
+|   |-- datasource_spec.js
+|   |-- query_ctrl_spec.js
+|   |-- test-main.js
+|-- src
+|   |-- img
+|   |   |-- logo.svg
+|   |-- partials
+|   |   |-- annotations.editor.html
+|   |   |-- config.html
+|   |   |-- query.editor.html
+|   |-- datasource.js
+|   |-- module.js
+|   |-- plugin.json
+|   |-- query_ctrl.js
+|-- Gruntfile.js
+|-- LICENSE
+|-- package.json
+|-- README.md
+```
+
+Most JavaScript projects have a build step and most Grafana plugins are built using Babel and ES6. The generated JavaScript should be placed in the `dist` directory and the source code in the `src` directory. We recommend that the plugin.json file be placed in the src directory and then copied over to the dist directory when building. The `README.md` can be placed in the root or in the dist directory.
+
+Directories:
+
+- `src/` contains plugin source files.
+- `src/partials` contains html templates.
+- `src/img` contains plugin logos and other images.
+- `spec/` contains tests (optional).
+- `dist/` contains built content.
+
+## HTML and CSS
+
+For the HTML on editor tabs, we recommend using the inbuilt Grafana styles rather than defining your own. This makes plugins feel like a more natural part of Grafana. If done correctly, the html will also be responsive and adapt to smaller screens. The `gf-form` css classes should be used for labels and inputs.
+
+Below is a minimal example of an editor row with one form group and two fields, a dropdown and a text input:
+
+```html
+<div class="editor-row">
+  <div class="section gf-form-group">
+    <h5 class="section-heading">My Plugin Options</h5>
+    <div class="gf-form">
+      <label class="gf-form-label width-10">Label1</label>
+      <div class="gf-form-select-wrapper max-width-10">
+        <select class="input-small gf-form-input" ng-model="ctrl.panel.mySelectProperty" ng-options="t for t in ['option1', 'option2', 'option3']" ng-change="ctrl.onSelectChange()"></select>
+      </div>
+      <div class="gf-form">
+        <label class="gf-form-label width-10">Label2</label>
+        <input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.myProperty" ng-change="ctrl.onFieldChange()" placeholder="suggestion for user" ng-model-onblur />
+      </div>
+    </div>
+  </div>
+</div>
+```
+
+Use the `width-x` and `max-width-x` classes to control the width of your labels and input fields. Try to get labels and input fields to line up neatly by having the same width for all the labels in a group and the same width for all inputs in a group if possible.
+
+## Build Scripts
+
+Our recommendation is to use whatever you usually use - Grunt, Gulp or npm scripts. Most plugins seems to use Grunt so that is probably the easiest to get started with if you do not have a preferred build system. The only requirement is that it supports systemjs which is required by Grafana to load plugins.
+
+## Linting
+
+We recommend that you use a linter for your JavaScript. For ES6, the standard linter is [eslint](http://eslint.org/). Rules for linting are described in an .eslintrc that is placed in the root directory. [Here is an example](https://github.com/grafana/worldmap-panel/blob/master/.eslintrc) of linting rules in a plugin.
+
+### ES6 features
+
+1. Use `const` if a variable is not going to be reassigned.
+2. Prefer to use `let` instead `var` ([Exploring ES6](http://exploringjs.com/es6/ch_core-features.html#_from-var-to-letconst))
+3. Use arrow functions, which don’t shadow `this` ([Exploring ES6](http://exploringjs.com/es6/ch_core-features.html#_from-function-expressions-to-arrow-functions)):
+
+    ```js
+    testDatasource() {
+      return this.getServerStatus()
+      .then(status => {
+        return this.doSomething(status);
+      })
+    }
+    ```
+
+    better than
+
+    ```js
+    testDatasource() {
+      var self = this;
+      return this.getServerStatus()
+      .then(function(status) {
+        return self.doSomething(status);
+      })
+    }
+    ```
+4. Use native _Promise_ object:
+
+    ```js
+    metricFindQuery(query) {
+      if (!query) {
+        return Promise.resolve([]);
+      }
+    }
+    ```
+
+    better than
+
+    ```js
+    metricFindQuery(query) {
+      if (!query) {
+        return this.$q.when([]);
+      }
+    }
+    ```
+5. If using Lodash, then be consequent and prefer that to the native ES6 array functions.
diff --git a/docs/sources/plugins/datasources.md b/docs/sources/plugins/developing/datasources.md
similarity index 69%
rename from docs/sources/plugins/datasources.md
rename to docs/sources/plugins/developing/datasources.md
index 332629aa5d8..612a0786976 100644
--- a/docs/sources/plugins/datasources.md
+++ b/docs/sources/plugins/developing/datasources.md
@@ -1,3 +1,12 @@
++++
+title = "Developing Datasource Plugins"
+keywords = ["grafana", "plugins", "documentation"]
+type = "docs"
+[menu.docs]
+name = "Developing Datasource Plugins"
+parent = "developing"
+weight = 6
++++
 
 # Datasources
 
@@ -31,9 +40,11 @@ There are two datasource specific settings for the plugin.json
 These settings indicates what kind of data the plugin can deliver. At least one of them have to be true
 
 ## Datasource
+
 The javascript object that communicates with the database and transforms data to times series.
 
-The Datasource should contain the following functions.
+The Datasource should contain the following functions:
+
 ```
 query(options) //used by panels to get data
 testDatasource() //used by datasource configuration page to make sure the connection is working
@@ -41,9 +52,14 @@ annotationQuery(options) // used by dashboards to get annotations
 metricFindQuery(options) // used by query editor to get metric suggestions.
 ```
 
+### testDatasource
+
+When a user clicks on the *Save & Test* button when adding a new data source, the details are first saved to the database and then the `testDatasource` function that is defined in your data source plugin will be called. It is recommended that this function makes a query to the data source that will also test that the authentication details are correct. This is so the data source is correctly configured when the user tries to write a query in a new dashboard.
+
 ### Query
 
-Request object passed to datasource.query function
+Request object passed to datasource.query function:
+
 ```json
 {
   "range": { "from": "2015-12-22T03:06:13.851Z", "to": "2015-12-22T06:48:24.137Z" },
@@ -57,11 +73,12 @@ Request object passed to datasource.query function
 }
 ```
 
-There are two different kind of results for datasources.
-Time series and table. Time series is the most common format and is supported by all datasources and panels. Table format is only support by the Influxdb datasource and table panel. But we might see more of this in the future.
+There are two different kinds of results for datasources;
+time series and table. Time series is the most common format and is supported by all datasources and panels. Table format is only supported by the InfluxDB datasource and table panel. But we might see more of this in the future.
+
+Time series response from datasource.query.
+An array of:
 
-Time series response from datasource.query
-An array of
 ```json
 [
   {
@@ -81,8 +98,9 @@ An array of
 ]
 ```
 
-Table response from datasource.query
-An array of
+Table response from datasource.query.
+An array of:
+
 ```json
 [
   {
@@ -119,7 +137,8 @@ An array of
 
 ### Annotation Query
 
-Request object passed to datasource.annotationQuery function
+Request object passed to datasource.annotationQuery function:
+
 ```json
 {
   "range": { "from": "2016-03-04T04:07:55.144Z", "to": "2016-03-04T07:07:55.144Z" },
@@ -132,7 +151,8 @@ Request object passed to datasource.annotationQuery function
 }
 ```
 
-Expected result from datasource.annotationQuery
+Expected result from datasource.annotationQuery:
+
 ```json
 [
   {
@@ -152,24 +172,24 @@ Expected result from datasource.annotationQuery
 
 ## QueryCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This class have to inherit from the app/plugins/sdk.QueryCtrl class.
+A JavaScript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This class has to inherit from the app/plugins/sdk.QueryCtrl class.
 
 Requires a static template or templateUrl variable which will be rendered as the view for this controller.
 
 ## ConfigCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when a user tries to edit or create a new datasource of this type.
+A JavaScript class that will be instantiated and treated as an Angular controller when a user tries to edit or create a new datasource of this type.
 
 Requires a static template or templateUrl variable which will be rendered as the view for this controller.
 
 ## QueryOptionsCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This controller is responsible for handling panel wide settings for the datasource. Such as interval, rate and aggregations if needed.
+A JavaScript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This controller is responsible for handling panel wide settings for the datasource, such as interval, rate and aggregations if needed.
 
 Requires a static template or templateUrl variable which will be rendered as the view for this controller.
 
 ## AnnotationsQueryCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when the user choose this type of datasource in the templating menu in the dashboard.
+A JavaScript class that will be instantiated and treated as an Angular controller when the user choose this type of datasource in the templating menu in the dashboard.
 
-Requires a static template or templateUrl variable which will be rendered as the view for this controller. The fields that are bound to this controller is then sent to the Database objects annotationQuery function.
+Requires a static template or templateUrl variable which will be rendered as the view for this controller. The fields that are bound to this controller are then sent to the Database objects annotationQuery function.
diff --git a/docs/sources/plugins/developing/defaults-and-editor-mode.md b/docs/sources/plugins/developing/defaults-and-editor-mode.md
new file mode 100644
index 00000000000..f40aaa90396
--- /dev/null
+++ b/docs/sources/plugins/developing/defaults-and-editor-mode.md
@@ -0,0 +1,128 @@
++++
+title = "Plugin Defaults and Editor Mode"
+type = "docs"
+[menu.docs]
+name = "Plugin Defaults and Editor Mode"
+parent = "developing"
+weight = 3
++++
+
+# Plugin Defaults and Editor Mode
+
+Most plugins allow users to customize the behavior by changing settings on an editor tab. These setting fields are saved in the dashboard json.
+
+## Defaults
+
+We define fields to be saved in Grafana by creating values on the panel object of the controller. You can see these values for any panel by choosing View JSON from the settings menu in Grafana. Here is an excerpt from the clock panel json (with some fields removed), the panel data is saved in the panels array:
+
+```json
+{
+  "id": 4,
+  "title": "Clock",
+...
+  "rows": [
+    {
+...
+      "panels": [
+        {
+          "bgColor": "rgb(132, 151, 130)",
+          "clockType": "24 hour",
+```
+
+You can define panel data by first creating a variable with default values for the fields and then setting them on the panel object:
+
+```javascript
+const panelDefaults = {
+  clockType: '24 hour',
+  fontSize: '60px',
+  fontWeight: 'normal',
+  bgColor: null
+};
+
+constructor($scope, $injector) {
+  super($scope, $injector);
+  _.defaults(this.panel, panelDefaults);
+
+  this.updateClock();
+}
+```
+
+The Lodash function [defaults](https://lodash.com/docs/4.17.4#defaults), which is called in the code above: `_.defaults`, sets a default value only if the value is not already set. This way values that have been changed by the user will not be overwritten.
+
+These panel fields can be used in the controller or module.html template:
+
+```html
+<h2 style="font-size: {{ctrl.panel.fontSize}};">{{ctrl.time}}</h2>
+```
+
+If you want your users to be able to change these panel values then you need to expose them in the Grafana editor.
+
+## Editor Mode
+
+Editor mode is when a user clicks Edit on a panel. Every panel has a general tab where you change the title and width and some panels have more inbuilt tabs like the Metrics tab or Time Range tab. A panel plugin can add its own tab(s) so that a user can customize the panel. 
+
+Grafana conventions mean all you need to do is to hook up an Angular template with input fields and Grafana will automatically save the values to the dashboard json and load them on dashboard load.
+
+## Using Events
+
+To add an editor tab you need to hook into the event model so that the tab is added when the *init-edit-mode* event is triggered. The following code should be added to the constructor of the plugin Ctrl class:
+
+```javascript
+this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
+```
+
+Then you need to create a handler function that is bound to the event. In the example above, the handler is called onInitEditMode. The tab is added by calling the controller function, *addEditorTab*. This function has three parameters; the tab name, the path to a html template for the new editor tab and the tab number. It can be a bit tricky to figure out the path, the path name will be based on the id that is specified in the plugin.json file - for example **grafana-clock-panel**. The code below hooks up an Angular template called editor.html that is located in the `src/partials` directory.
+
+```javascript
+onInitEditMode() {
+  this.addEditorTab('Options', 'public/plugins/grafana-clock-panel/editor.html', 2);
+}
+```
+
+## Editor HTML and CSS
+
+For editor tabs html, it is best to use Grafana css styles rather than custom styles. This is to preserve the look and feel of other tabs in Grafana.
+
+Most editor tabs should use the [gf-form css class](https://github.com/grafana/grafana/blob/master/public/sass/components/_gf-form.scss) from Grafana. The example below has one row with a couple of columns and each column is wrapped in a div like this:
+
+```html
+<div class="section gf-form-group">
+ ```
+
+Then each pair, label and field is wrapped in a div with a gf-form class.
+
+```html
+<div class="gf-form">
+  <label class="gf-form-label width-8">Font Size</label>
+  <input type="text" class="gf-form-input width-4" ng-model="ctrl.panel.fontSize" ng-change="ctrl.render()" ng-model-onblur>
+</div>
+```
+
+Note that there are some Angular attributes here. *ng-model* will update the panel data. *ng-change* will render the panel when you change the value. This change will occur on the onblur event due to the *ng-model-onblur* attribute. This means you can see the effect of your changes on the panel while editing.
+
+{{< imgbox img="/assets/img/blog/clock-panel-editor.png" caption="Panel Editor" >}}
+
+On the editor tab we use a drop down for 12/24 hour clock, an input field for font size and a color picker for the background color.
+
+The drop down/select has its own *gf-form-select-wrapper* css class and looks like this:
+
+```html
+<div class="gf-form">
+  <label class="gf-form-label width-9">12 or 24 hour</label>
+  <div class="gf-form-select-wrapper max-width-9">
+    <select class="input-small gf-form-input" ng-model="ctrl.panel.clockType" ng-options="t for t in ['12 hour', '24 hour', 'custom']" ng-change="ctrl.render()"></select>
+  </div>
+</div>
+```
+
+The color picker (or spectrum picker) is a component that already exists in Grafana. We use it like this for the background color:
+
+```html
+<spectrum-picker class="gf-form-input" ng-model="ctrl.panel.bgColor" ng-change="ctrl.render()" ></spectrum-picker>
+```
+
+## Editor Tab Finished
+
+To reiterate, this all ties together quite neatly. We specify properties and panel defaults in the constructor for the panel controller and these can then be changed in the editor. Grafana takes care of saving the changes.
+
+One thing to be aware of  is that panel defaults are used the first time a panel is created to set the initial values of the panel properties. After the panel is saved then the saved value will be used instead. So beware if you update panel defaults they will not automatically update the property in an existing panel. For example, if you set the default font size to 60px first and then in version 2 of the plugin change it to 50px, existing panels will still have 60px and only new panels will get the new 50px value.
diff --git a/docs/sources/plugins/developing/development.md b/docs/sources/plugins/developing/development.md
new file mode 100644
index 00000000000..2c2bc445411
--- /dev/null
+++ b/docs/sources/plugins/developing/development.md
@@ -0,0 +1,120 @@
++++
+title = "Developer Guide"
+type = "docs"
+aliases = ["/plugins/development/", "/plugins/datasources/", "/plugins/apps/", "/plugins/panels/"]
+[menu.docs]
+name = "Developer Guide"
+parent = "developing"
+weight = 1
++++
+
+# Developer Guide
+
+From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.
+
+There are two blog posts about authoring a plugin that might also be of interest to any plugin authors, [Timing is Everything. Writing the Clock Panel Plugin for Grafana 3.0- part 1](http://grafana.org/blog/2016/04/08/timing-is-everything.-writing-the-clock-panel-plugin-for-grafana-3.0/) and [Timing is Everything. Editor Mode in Grafana 3.0 for the Clock Panel Plugin](http://grafana.org/blog/2016/04/15/timing-is-everything.-editor-mode-in-grafana-3.0-for-the-clock-panel-plugin/).
+
+## Short version
+
+1. [Setup grafana](http://docs.grafana.org/project/building_from_source/)
+2. Clone an example plugin into ```/var/lib/grafana/plugins```  or `data/plugins` (relative to grafana git repo if your running development version from source dir)
+3. Code away!
+
+## What languages?
+
+Since everything turns into javascript it's up to you to choose which language you want. That said it's probably a good idea to choose es6 or typescript since we use es6 classes in Grafana. So it's easier to get inspiration from the Grafana repo is you choose one of those languages.
+
+## Buildscript
+
+You can use any build system you like that support systemjs. All the built content should end up in a folder named ```dist``` and committed to the repository.By committing the dist folder the person who installs your plugin does not have to run any buildscript.
+
+All our example plugins have build scripted configured.
+
+## Metadata
+
+See the [coding styleguide]({{< relref "code-styleguide.md" >}}) for details on the metadata.
+
+## module.(js|ts)
+
+This is the entry point for every plugin. This is the place where you should export
+your plugin implementation. Depending on what kind of plugin you are developing you
+will be expected to export different things. You can find what's expected for [datasource]({{< relref "datasources.md" >}}), [panels]({{< relref "panels.md" >}})
+and [apps]({{< relref "apps.md" >}}) plugins in the documentation.
+
+The Grafana SDK is quite small so far and can be found here:
+
+- [SDK file in Grafana](https://github.com/grafana/grafana/blob/master/public/app/plugins/sdk.ts)
+- [SDK Readme](https://github.com/grafana/grafana/blob/master/public/app/plugins/plugin_api.md)
+
+The SDK contains three different plugin classes: PanelCtrl, MetricsPanelCtrl and QueryCtrl. For plugins of the panel type, the module.js file should export one of these. There are some extra classes for [data sources]({{< relref "datasources.md" >}}).
+
+Example:
+
+```javascript
+import {ClockCtrl} from './clock_ctrl';
+
+export {
+  ClockCtrl as PanelCtrl
+};
+```
+
+The module class is also where css for the dark and light themes is imported:
+
+```javascript
+import {loadPluginCss} from 'app/plugins/sdk';
+import WorldmapCtrl from './worldmap_ctrl';
+
+loadPluginCss({
+  dark: 'plugins/grafana-worldmap-panel/css/worldmap.dark.css',
+  light: 'plugins/grafana-worldmap-panel/css/worldmap.light.css'
+});
+
+export {
+  WorldmapCtrl as PanelCtrl
+};
+```
+
+## Start developing your plugin
+
+There are three ways that you can start developing a Grafana plugin.
+
+1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
+2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](/installation/configuration). By default this is `/var/lib/grafana/plugins` on Linux systems.
+3. Place your plugin directory anywhere you like and specify it grafana.ini.
+
+We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.
+
+When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless
+the folder contains a subfolder named dist. In that case grafana will mount the dist folder instead.
+This makes it possible to have both built and src content in the same plugin git repo.
+
+## Grafana Events
+
+There are a number of Grafana events that a plugin can hook into:
+
+- `init-edit-mode` can be used to add tabs when editing a panel
+- `panel-teardown` can be used for clean up
+- `data-received` is an event in that is triggered on data refresh and can be hooked into
+- `data-snapshot-load` is an event triggered to load data when in snapshot mode.
+- `data-error` is used to handle errors on dashboard refresh.
+
+If a panel receives data and hooks into the `data-received` event then it should handle snapshot mode too. Otherwise the panel will not work if saved as a snapshot. [Getting Plugins to work in Snapshot Mode]({{< relref "snapshot-mode.md" >}}) describes how to add support for this.
+
+## Examples
+
+We currently have three different examples that you can fork/download to get started developing your grafana plugin.
+
+ - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for querying json data from backends)
+ - [example-app](https://github.com/grafana/example-app)
+ - [clock-panel](https://github.com/grafana/clock-panel)
+ - [singlestat-panel](https://github.com/grafana/grafana/blob/master/public/app/plugins/panel/singlestat/module.ts)
+ - [piechart-panel](https://github.com/grafana/piechart-panel)
+
+## Other Articles
+
+- [Getting Plugins to work in Snapshot Mode]({{< relref "snapshot-mode.md" >}})
+- [Plugin Defaults and Editor Mode]({{< relref "defaults-and-editor-mode.md" >}})
+- [Grafana Plugin Code Styleguide]({{< relref "code-styleguide.md" >}})
+- [Grafana Apps]({{< relref "apps.md" >}})
+- [Grafana Datasources]({{< relref "datasources.md" >}})
+- [plugin.json Schema]({{< relref "plugin.json.md" >}})
diff --git a/docs/sources/plugins/developing/index.md b/docs/sources/plugins/developing/index.md
new file mode 100644
index 00000000000..c9a78fbb39a
--- /dev/null
+++ b/docs/sources/plugins/developing/index.md
@@ -0,0 +1,8 @@
++++
+title = "Developing Plugins"
+type = "docs"
+[menu.docs]
+parent = "plugins"
+identifier = "developing"
+weight = 3
++++
diff --git a/docs/sources/plugins/panels.md b/docs/sources/plugins/developing/panels.md
similarity index 95%
rename from docs/sources/plugins/panels.md
rename to docs/sources/plugins/developing/panels.md
index 168d1320ca5..26db69c7c94 100644
--- a/docs/sources/plugins/panels.md
+++ b/docs/sources/plugins/developing/panels.md
@@ -9,7 +9,7 @@ page_keywords: grafana, plugins, documentation
 title = "Installing Plugins"
 type = "docs"
 [menu.docs]
-parent = "plugins"
+parent = "developing"
 weight = 1
 +++
 
diff --git a/docs/sources/plugins/developing/plugin.json.md b/docs/sources/plugins/developing/plugin.json.md
new file mode 100644
index 00000000000..8d94ca93af5
--- /dev/null
+++ b/docs/sources/plugins/developing/plugin.json.md
@@ -0,0 +1,28 @@
++++
+title = "plugin.json Schema"
+keywords = ["grafana", "plugins", "documentation"]
+type = "docs"
+[menu.docs]
+name = "plugin.json Schema"
+parent = "developing"
+weight = 6
++++
+
+# Plugin.json
+
+The plugin.json file is mandatory for all plugins. When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless the folder contains a subfolder named `dist`. In that case grafana will mount the `dist` folder instead.
+
+## Plugin JSON Schema
+
+| Property | Description |
+| ------------- |-------------|
+| id | unique name of the plugin - [conventions described in styleguide]({{< relref "code-styleguide.md" >}}) |
+| type | panel/datasource/app |
+| name | Human readable name of the plugin |
+| info.description | Description of plugin. Used for searching grafana net plugins |
+| info.author | |
+| info.keywords | plugin keywords. Used for search on grafana net|
+| info.logos | link to project logos |
+| info.version | project version of this commit. Must be semver |
+| dependencies.grafanaVersion | Required grafana backend version for this plugin |
+| dependencies.plugins | required plugins for this plugin. |
diff --git a/docs/sources/plugins/developing/snapshot-mode.md b/docs/sources/plugins/developing/snapshot-mode.md
new file mode 100644
index 00000000000..dd47b93851a
--- /dev/null
+++ b/docs/sources/plugins/developing/snapshot-mode.md
@@ -0,0 +1,79 @@
++++
+title = "Snapshot Mode"
+type = "docs"
+[menu.docs]
+name = "Snapshot Mode"
+parent = "developing"
+weight = 6
++++
+
+# Getting Plugins to work in Snapshot Mode
+
+{{< imgbox img="/img/docs/Grafana-snapshot-example.png" caption="A dashboard using snapshot data and not live data." >}}
+
+Grafana has this great feature where you can [save a snapshot of your dashboard](http://docs.grafana.org/reference/sharing/). Instead of sending a screenshot of a dashboard to someone, you can send them a working, interactive Grafana dashboard with the snapshot data embedded inside it. The snapshot can be saved on your Grafana server and is available to all your co-workers. Raintank also hosts a [snapshot server](http://snapshot.raintank.io/) if you want to send the snapshot to someone who does not have access to your Grafana server.
+
+{{< imgbox img="/img/docs/animated_gifs/snapshots.gif" caption="Selecting a snapshot" >}}
+
+This all works because Grafana saves a snapshot of the current data in the dashboard json instead of fetching the data from a data source. However, if you are building a custom panel plugin then this will not work straight out of the box. You will need to make some small (and easy!) changes first.
+
+## Enabling support for loading snapshot data
+
+Grafana automatically saves data from data sources in the dashboard json when the snapshot is created so we do not have to write any code for that. Enabling snapshot support for reading time series data is very simple. First in the constructor, we need to add an event handler for `data-snapshot-load`. This event is triggered by Grafana when the snapshot data is loaded from the dashboard json.
+
+```javascript
+constructor($scope, $injector, contextSrv) {
+    super($scope, $injector);
+    ...
+    this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
+    this.events.on('data-received', this.onDataReceived.bind(this));
+    this.events.on('panel-teardown', this.onPanelTeardown.bind(this));
+    this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
+```
+
+Then we need to create a simple event handler that just forwards the data on to our regular `data-received` handler:
+
+```javascript
+onDataSnapshotLoad(snapshotData) {
+  this.onDataReceived(snapshotData);
+}
+```
+
+This will cover most use cases for snapshot support. Sometimes you will want to save data that is not time series data from a Grafana data source and then you have to do a bit more work to get snapshot support.
+
+## Saving custom data for snapshots
+
+Data that is not time series data from a Grafana data source is not saved automatically by Grafana. Saving custom data for snapshot mode has to be done manually.
+
+{{< imgbox img="/img/docs/Grafana-save-snapshot.png" caption="Save snapshot" >}}
+
+Grafana gives us a chance to save data to the dashboard json when it is creating a snapshot. In the 'data-received' event handler, you can check the snapshot flag on the dashboard object. If this is true, then Grafana is creating a snapshot and you can manually save custom data to the panel json. In the example, a new field called snapshotLocationData in the panel json is initialized with a snapshot of the custom data.
+
+```javascript
+onDataReceived(dataList) {
+  if (!dataList) return;
+
+  if (this.dashboard.snapshot && this.locations) {
+    this.panel.snapshotLocationData = this.locations;
+  }
+```
+
+Now the location data is saved in the dashboard json but we will have to load it manually as well.
+
+## Loading custom data for snapshots
+
+The example below shows a function that loads the custom data. The data source for the custom data (an external api in this case) is not available in snapshot mode so a guard check is made to see if there is any snapshot data available first. If there is, then the snapshot data is used instead of trying to load the data from the external api.
+
+```javascript
+loadLocationDataFromFile(reload) {
+  if (this.map && !reload) return;
+
+  if (this.panel.snapshotLocationData) {
+    this.locations = this.panel.snapshotLocationData;
+    return;
+  }
+```
+
+It is really easy to forget to add this support but it enables a great feature and can be used to demo your panel.
+
+If there is a panel plugin that you would like to be installed on the Raintank Snapshot server then please contact us via [Slack](https://raintank.slack.com) or [GitHub](https://github.com/grafana/grafana).
diff --git a/docs/sources/plugins/development.md b/docs/sources/plugins/development.md
deleted file mode 100644
index 9b2a3fb8668..00000000000
--- a/docs/sources/plugins/development.md
+++ /dev/null
@@ -1,60 +0,0 @@
-+++
-title = "Developer Guide"
-type = "docs"
-aliases = ["/plugins/datasources/", "/plugins/apps/", "/plugins/panels/"]
-[menu.docs]
-name = "Developer Guide"
-parent = "plugins"
-weight = 5
-+++
-
-# Developer Guide
-
-From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.
-
-## Short version
-
-1. [Setup grafana](http://docs.grafana.org/project/building_from_source/)
-2. Clone an example plugin into ```/var/lib/grafana/plugins```  or `data/plugins` (relative to grafana git repo if your running development version from source dir)
-3. Code away!
-
-## What languages?
-
-Since everything turns into javascript it's up to you to choose which language you want. That said it's probably a good idea to choose es6 or typescript since we use es6 classes in Grafana. So it's easier to get inspiration from the Grafana repo is you choose one of those languages.
-
-## Buildscript
-
-You can use any build system you like that support systemjs. All the built content should end up in a folder named ```dist``` and committed to the repository.By committing the dist folder the person who installs your plugin does not have to run any buildscript.
-
-All our example plugins have build scripted configured.
-
-## module.(js|ts)
-
-This is the entry point for every plugin. This is the place where you should export
-your plugin implementation. Depending on what kind of plugin you are developing you
-will be expected to export different things. You can find what's expected for [datasource](./datasources.md), [panels](./panels.md)
-and [apps](./apps.md) plugins in the documentation.
-
-## Start developing your plugin
-
-There are three ways that you can start developing a Grafana plugin.
-
-1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
-2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](../installation/configuration.md). By default this is `/var/lib/grafana/plugins` on Linux systems.
-3. Place your plugin directory anywhere you like and specify it grafana.ini.
-
-We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.
-
-When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless
-the folder contains a subfolder named dist. In that case grafana will mount the dist folder instead.
-This makes it possible to have both built and src content in the same plugin git repo.
-
-## Examples
-
-We currently have three different examples that you can fork/download to get started developing your grafana plugin.
-
- - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for querying json data from backends)
- - [example-app](https://github.com/grafana/example-app)
- - [clock-panel](https://github.com/grafana/clock-panel)
- - [singlestat-panel](https://github.com/grafana/grafana/blob/master/public/app/plugins/panel/singlestat/module.ts)
- - [piechart-panel](https://github.com/grafana/piechart-panel)
diff --git a/docs/sources/plugins/plugin.json.md b/docs/sources/plugins/plugin.json.md
deleted file mode 100644
index dd4f2f58560..00000000000
--- a/docs/sources/plugins/plugin.json.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-page_title: Plugin json file
-page_description: Plugin json for Grafana
-page_keywords: grafana, plugins, documentation
----
-
-# Plugin.json
-
-TODO
-
diff --git a/docs/sources/reference/dashboard.md b/docs/sources/reference/dashboard.md
index c1c574ce917..595a10e5081 100644
--- a/docs/sources/reference/dashboard.md
+++ b/docs/sources/reference/dashboard.md
@@ -66,11 +66,11 @@ Each field in the dashboard JSON is explained below with its usage:
 | **editable** | whether a dashboard is editable or not |
 | **hideControls** | whether row controls on the left in green are hidden or not |
 | **graphTooltip** | TODO |
-| **rows** | row metadata, see [rows section](/docs/sources/reference/dashboard.md/#rows) for details |
+| **rows** | row metadata, see [rows section](#rows) for details |
 | **time** | time range for dashboard, i.e. last 6 hours, last 7 days, etc |
-| **timepicker** | timepicker metadata, see [timepicker section](/docs/sources/reference/dashboard.md/#timepicker) for details |
-| **templating** | templating metadata, see [templating section](/docs/sources/reference/dashboard.md/#templating) for details |
-| **annotations** | annotations metadata, see [annotations section](/docs/sources/reference/dashboard.md/#annotations) for details |
+| **timepicker** | timepicker metadata, see [timepicker section](#timepicker) for details |
+| **templating** | templating metadata, see [templating section](#templating) for details |
+| **annotations** | annotations metadata, see [annotations section](#annotations) for details |
 | **schemaVersion** | TODO |
 | **version** | TODO |
 | **links** | TODO |
@@ -79,7 +79,7 @@ Each field in the dashboard JSON is explained below with its usage:
 
 `rows` field consists of an array of JSON object representing each row in a dashboard, such as shown below:
 
-```
+```json
  "rows": [
     {
       "collapse": false,
@@ -105,14 +105,14 @@ Usage of the fields is explained below:
 | **collapse** | whether row is collapsed or not |
 | **editable** | whether a row is editable or not |
 | **height** | height of the row in pixels |
-| **panels** | panels metadata, see [panels section](/docs/sources/reference/dashboard.md/#panels) for details |
+| **panels** | panels metadata, see [panels section](#panels) for details |
 | **title** | title of row |
 
 #### panels
 
 Panels are the building blocks a dashboard. It consists of datasource queries, type of graphs, aliases, etc. Panel JSON consists of an array of JSON objects, each representing a different panel in a row. Most of the fields are common for all panels but some fields depends on the panel type. Following is an example of panel JSON representing a `graph` panel type:
 
-```
+```json
 "panels": [
         {
           "aliasColors": {},
@@ -276,7 +276,7 @@ Usage of each field is explained below:
 
 Description: TODO
 
-```
+```json
 "timepicker": {
     "collapse": false,
     "enable": true,
@@ -330,7 +330,7 @@ Usage of the fields is explained below:
 
 `templating` fields contains array of template variables with their saved values along with some other metadata, for example:
 
-```
+```json
  "templating": {
     "enable": true,
     "list": [
diff --git a/docs/sources/reference/playlist.md b/docs/sources/reference/playlist.md
index 359a5d8f3bd..e2d59bc322d 100644
--- a/docs/sources/reference/playlist.md
+++ b/docs/sources/reference/playlist.md
@@ -16,7 +16,7 @@ Since Grafana automatically scales Dashboards to any resolution they're perfect
 
 ## Creating a Playlist
 
-{{< docs-imagebox img="img/docs/v3/playlist.png" max-width="25rem" >}}
+{{< docs-imagebox img="/img/docs/v3/playlist.png" max-width="25rem" >}}
 
 The Playlist feature can be accessed from Grafana's sidemenu, in the Dashboard submenu.
 
diff --git a/docs/sources/tutorials/hubot_howto.md b/docs/sources/tutorials/hubot_howto.md
index 17658fbaecd..2c886b94f29 100644
--- a/docs/sources/tutorials/hubot_howto.md
+++ b/docs/sources/tutorials/hubot_howto.md
@@ -22,15 +22,17 @@ take you to the graph.
 > is so Hipchat and Slack can show them reliably (they require the image to be publicly available).
 
 <div class="text-center">
-  <img src="/img/tutorials/hubot_grafana.png" class="center"></a>
+  <img src="/img/docs/tutorials/hubot_grafana.png" class="center"></a>
 </div>
 
 ## What is Hubot?
+
 [Hubot](https://hubot.github.com/) is an universal and extensible chat bot that can be used with many chat
 services and has a huge library of third party plugins that allow you to automate anything from your
 chat rooms.
 
 ## Install Hubot
+
 Hubot is very easy to install and host. If you do not already have a bot up and running please
 read the official [Getting Started With Hubot](https://hubot.github.com/docs/) guide.
 
@@ -63,6 +65,7 @@ The `hubot-grafana` plugin requires a number of environment variables to be set
     export HUBOT_GRAFANA_S3_REGION=us-standard
 
 ### Grafana server side rendering
+
 The hubot plugin will take advantage of the Grafana server side rendering feature that can
 render any panel on the server using phantomjs. Grafana ships with a phantomjs binary (linux only).
 
@@ -70,11 +73,13 @@ To verify that this feature works try the `Direct link to rendered image` link i
 If you do not get an image when opening this link verify that the required font packages are installed for phantomjs to work.
 
 ### Grafana API Key
-<img src="/img/v2/orgdropdown_api_keys.png" style="width: 150px" class="right"></img>
+
+<img src="/img/docs/v2/orgdropdown_api_keys.png" style="width: 150px" class="right"></img>
 You need to set the environment variable `HUBOT_GRAFANA_API_KEY` to a Grafana API Key.
 You can add these from the API Keys page which you find in the Organization dropdown.
 
 ### Amazon S3
+
 The `S3` options are optional but for the images to work properly in services like Slack and Hipchat they need
 to publicly available. By specifying the `S3` options the hubot-grafana script will publish the rendered
 panel to `S3` and it will use that URL when it posts to Slack or Hipchat.
@@ -99,6 +104,7 @@ panel to `S3` and it will use that URL when it posts to Slack or Hipchat.
     - Get a templated dashboard with the `$host` parameter set to `carbon-a`
 
 ## Aliases
+
 Some of the hubot commands above can lengthy and you might have to remember the dashboard slug (url id).
 If you have a few favorite graphs you want to be able check up on often (let's say from your mobile) you
 can create hubot command aliases with the hubot script `hubot-alias`.
@@ -115,7 +121,7 @@ Now you can add an alias like this:
 
 <div class="text-center">
   Using the alias:<br>
-  <img src="/img/tutorials/hubot_grafana2.png" class="center"></a>
+  <img src="/img/docs/tutorials/hubot_grafana2.png" class="center"></a>
 </div>
 
 ## Summary

From 8a92861133e13d27dd3f1adf0cac358b9512838a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 7 Feb 2017 09:09:51 +0100
Subject: [PATCH 037/301] docs(): fixes for rebranded docs site

---
 docs/Dockerfile                       |  4 +-
 docs/Makefile                         | 49 ++++++-------------
 docs/config.toml                      | 70 ---------------------------
 docs/sources/administration/cli.md    |  2 +-
 docs/sources/alerting/rules.md        |  2 +-
 docs/sources/guides/basic_concepts.md |  2 +-
 docs/sources/index.md                 | 18 +++----
 docs/sources/installation/debian.md   |  8 +--
 docs/sources/installation/rpm.md      |  8 +--
 docs/sources/plugins/development.md   |  2 +-
 10 files changed, 39 insertions(+), 126 deletions(-)
 delete mode 100644 docs/config.toml

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 7652cbd3e3f..7aa9ff1ad6e 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -3,9 +3,9 @@ FROM grafana/docs-base:latest
 # to get the git info for this repo
 # COPY config.toml /site
 
-RUN rm -rf /site/content/*
+# RUN rm -rf /site/content/*
 
-COPY ./sources /site/content/
+# COPY ./sources /site/content/docs/
 
 COPY awsconfig /site
 
diff --git a/docs/Makefile b/docs/Makefile
index 718c4b52be7..d3268fc6873 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,50 +1,33 @@
 .PHONY: all default docs docs-build docs-shell shell test
-# to allow `make DOCSDIR=1 docs-shell` (to create a bind mount in docs)
-DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR):/docs/content/grafana/)
 
 # to allow `make DOCSPORT=9000 docs`
 DOCSPORT := 3004
 
-# Get the IP ADDRESS
-DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
-HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
-HUGO_BIND_IP=0.0.0.0
-
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
-GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 DOCKER_DOCS_IMAGE := grafana/grafana-docs
 
-DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
 SOURCES_HOST_DIR := "$(shell pwd)/sources"
 
-# for some docs workarounds (see below in "docs-build" target)
-GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
+DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content/docs
+
+DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e NOCACHE -p 3004:3004 -p 3005:3005
+
 
 default: docs
 
 docs: docs-build
-	$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt && grunt connect --port=3004"
-
-docs-watch: docs-build
-	$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -v $(SOURCES_HOST_DIR):/site/content -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
-
-docs-watch-mac: docs-build
-	$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -v $(SOURCES_HOST_DIR):/site/content -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs-mac && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs-mac"
-
-publish: docs-build
-	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs v3.1"
-
-publish-prod: docs-build
-	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
-
-docs-draft: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
-
-docs-shell: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt && grunt connect --port=3004"
 
 test: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "ls -la /site/content/docs"
+
+docs-watch: docs-build
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
+
+publish: docs-build
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs v3.1"
+
+publish-prod: docs-build
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
 
 docs-build:
-	docker build -t "$(DOCKER_DOCS_IMAGE)" .
+	docker build -t "$(DOCKER_DOCS_IMAGE)" --no-cache .
diff --git a/docs/config.toml b/docs/config.toml
deleted file mode 100644
index c8d093a81d7..00000000000
--- a/docs/config.toml
+++ /dev/null
@@ -1,70 +0,0 @@
-baseurl = "http://localhost:3002/"
-languageCode = "en-us"
-title = "Grafana Docs"
-canonifyurls = false
-relativeURLs = false
-verbose = true
-enableRobotsTXT = true
-disableSitemap = false
-disableRSS = true
-
-[[menu.top]]
-  name = "Docs"
-  url = ""
-  weight = 1
-
-[[menu.top]]
-  name = "Community"
-  url = "/community"
-  weight = 2
-
-[[menu.top]]
-  name = "Support"
-  url = "/support"
-  weight = 3
-
-[[menu.top]]
-  name = "Plugins"
-  url = "https://grafana.net/plugins"
-  weight = 4
-
-[[menu.top]]
-  name = "Dashboards"
-  url = "https://grafana.net/dashboards"
-  weight = 5
-
-[[menu.top]]
-  name = "Hosting"
-  url = "/hosting"
-  weight = 6
-
-[[menu.top]]
-  name = "Github"
-  url = "https://github.com/grafana/grafana"
-  weight = 7
-
-## Main
-[[menu.main]]
-  name = "Feature Gallery"
-  url = "/features"
-  weight = 1
-
-[[menu.main]]
-  name = "Live Demo"
-  url = "http://play.grafana.org"
-  weight = 2
-
-[[menu.main]]
-  name = "Download"
-  url = "/download"
-  weight = 3
-
-[[menu.main]]
-  name = "Blog"
-  url = "/blog"
-  weight = 4
-
-
-
-
-
diff --git a/docs/sources/administration/cli.md b/docs/sources/administration/cli.md
index ebe910503aa..4f2bbde3606 100644
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -17,7 +17,7 @@ executed on the same machine as grafana runs.
 
 The CLI helps you install, upgrade and manage your plugins on the same machine it CLI is running.
 You can find more information about how to install and manage your plugins at the
-[plugin page]({{< relref "plugins/installation.md" >}}).
+[plugin page]({{< relref "docs/plugins/installation.md" >}}).
 
 ## Admin
 
diff --git a/docs/sources/alerting/rules.md b/docs/sources/alerting/rules.md
index a2688de3100..aa38367b4aa 100644
--- a/docs/sources/alerting/rules.md
+++ b/docs/sources/alerting/rules.md
@@ -33,7 +33,7 @@ of core Grafana. Only some data soures are supported right now. They include `Gr
 ### Clustering
 
 We have not implemented clustering yet. So if you run multiple instances of grafana-server
-you have to make sure [execute_alerts]({{< relref "installation/configuration.md#alerting" >}})
+you have to make sure [execute_alerts]({{< relref "docs/installation/configuration.md#alerting" >}})
 is true on only one instance or otherwise you will get duplicated notifications.
 
 <div class="clearfix"></div>
diff --git a/docs/sources/guides/basic_concepts.md b/docs/sources/guides/basic_concepts.md
index 112b004ec92..0411db6caf2 100644
--- a/docs/sources/guides/basic_concepts.md
+++ b/docs/sources/guides/basic_concepts.md
@@ -16,7 +16,7 @@ This document is a “bottom up” introduction to basic concepts in Grafana, an
 ### Data Source
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
-The following datasources are officially supported: [Graphite]({{< relref "features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "features/datasources/cloudwatch.md" >}}).
+The following datasources are officially supported: [Graphite]({{< relref "docs/features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "docs/features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "docs/features/datasources/cloudwatch.md" >}}).
 
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
diff --git a/docs/sources/index.md b/docs/sources/index.md
index daf1bd34c36..ab2e0f882b8 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -24,27 +24,27 @@ other domains including industrial sensors, home automation, weather, and proces
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
 - [Nightly Builds](http://grafana.org/builds)
 
-For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
+For other platforms Read the [build from source]({{< relref "docs/project/building_from_source.md" >}})
 instructions for more information.
 
 ## Configuring Grafana
 
 The back-end web server has a number of configuration options. Go the
-[Configuration](/installation/configuration) page for details on all
+[Configuration]({{< relref "docs/installation/configuration.md" >}}) page for details on all
 those options.
 
 
 ## Getting started
 
-- [Getting Started](guides/getting_started)
-- [Basic Concepts](guides/basic_concepts)
-- [Screencasts](tutorials/screencasts)
+- [Getting Started]({{< relref "docs/guides/getting_started.md" >}})
+- [Basic Concepts]({{< relref "docs/guides/basic_concepts.md" >}})
+- [Screencasts]({{< relref "docs/tutorials/screencasts.md" >}})
 
 ## Data sources guides
 
-- [Graphite]({{< relref "features/datasources/graphite.md" >}})
-- [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}})
-- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
+- [Elasticsearch]({{< relref "docs/features/datasources/elasticsearch.md" >}})
+- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
 
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 9c6140c0c6d..7dd97e69810 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -114,10 +114,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "features/datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
+- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}})
 
 ## Installing from binary tar file
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 63181fc535d..561cff69b46 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -121,10 +121,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "features/datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
+- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}})
 
 ### Server side image rendering
 
diff --git a/docs/sources/plugins/development.md b/docs/sources/plugins/development.md
index 9b2a3fb8668..edb959e97bc 100644
--- a/docs/sources/plugins/development.md
+++ b/docs/sources/plugins/development.md
@@ -40,7 +40,7 @@ and [apps](./apps.md) plugins in the documentation.
 There are three ways that you can start developing a Grafana plugin.
 
 1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
-2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](../installation/configuration.md). By default this is `/var/lib/grafana/plugins` on Linux systems.
+2. Install Grafana and place your plugin in the plugins directory which is set in your [config file]({{< relref "docs/installation/configuration.md" >}}). By default this is `/var/lib/grafana/plugins` on Linux systems.
 3. Place your plugin directory anywhere you like and specify it grafana.ini.
 
 We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.

From 285918caf6c836676b43e6d141a62fe2fcd3aa1a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 6 Feb 2017 16:21:09 +0100
Subject: [PATCH 038/301] tech(build): switch to golang 1.8rc3

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 8b3fe38550a..6d61acd6f6a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.7.4.linux-amd64.tar.gz"
+    GODIST: "go1.8rc3.linux-amd64.tar.gz"
   post:
     - mkdir -p ~/download
     - mkdir -p ~/docker

From 5e9653f9359779e95ddc62cdd540f26ffe86a664 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 7 Feb 2017 10:21:46 +0100
Subject: [PATCH 039/301] docs(): adds missing index pages + link fix

---
 docs/sources/installation/configuration.md | 4 +++-
 docs/sources/project/index.md              | 7 +++++++
 docs/sources/reference/index.md            | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 docs/sources/project/index.md
 create mode 100644 docs/sources/reference/index.md

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index e222f8b5f4f..4d22d12dd9b 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -55,6 +55,7 @@ Then you can override them using:
 <hr />
 
 ## instance_name
+
 Set the name of the grafana-server instance. Used in logging and internal metrics and in
 clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
 environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use
@@ -145,6 +146,7 @@ things). By default it is configured to use `sqlite3` which is an
 embedded database (included in the main Grafana binary).
 
 ### url
+
 Use either URL or or the other fields below to configure the database
 Example: `mysql://user:secret@host:port/database`
 
@@ -231,7 +233,7 @@ Default is `false`.
 
 Set to `false` to prohibit users from being able to sign up / create
 user accounts. Defaults to `true`.  The admin user can still create
-users from the [Grafana Admin Pages](../reference/admin.md)
+users from the [Grafana Admin Pages](../../reference/admin)
 
 ### allow_org_create
 
diff --git a/docs/sources/project/index.md b/docs/sources/project/index.md
new file mode 100644
index 00000000000..513ec911d93
--- /dev/null
+++ b/docs/sources/project/index.md
@@ -0,0 +1,7 @@
++++
+title = "Project"
+type = "docs"
+identifier = "project"
+weight = 6
++++
+
diff --git a/docs/sources/reference/index.md b/docs/sources/reference/index.md
new file mode 100644
index 00000000000..a1ea21c60d1
--- /dev/null
+++ b/docs/sources/reference/index.md
@@ -0,0 +1,7 @@
++++
+title = "reference"
+type = "docs"
+identifier = "reference"
+weight = 6
++++
+

From a1e835884b64854e8d0ec2550c92f3ccc0ed036b Mon Sep 17 00:00:00 2001
From: hagen1778 <hagen1778@gmail.com>
Date: Tue, 7 Feb 2017 11:56:59 +0200
Subject: [PATCH 040/301] use configured Transport instead of
 defaultHttpTransport

---
 pkg/tsdb/prometheus/prometheus.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index efe8e2fc528..a4a6d8da2eb 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -31,7 +31,7 @@ type basicAuthTransport struct {
 
 func (bat basicAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req.SetBasicAuth(bat.username, bat.password)
-	return http.DefaultTransport.RoundTrip(req)
+	return bat.Transport.RoundTrip(req)
 }
 
 func NewPrometheusExecutor(dsInfo *models.DataSource) (tsdb.Executor, error) {

From 9ece10ef248fc3ea4dc49e56814abc6d98c0fb76 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 7 Feb 2017 11:03:57 +0100
Subject: [PATCH 041/301] style(dataproxy): simplify expression

---
 pkg/api/dataproxy.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go
index bc286743533..b72f676dbbc 100644
--- a/pkg/api/dataproxy.go
+++ b/pkg/api/dataproxy.go
@@ -109,7 +109,7 @@ func ProxyDataSourceRequest(c *middleware.Context) {
 	proxyPath := c.Params("*")
 
 	if ds.Type == m.DS_PROMETHEUS {
-		if !(c.Req.Request.Method == "GET" && strings.Index(proxyPath, "api/") == 0) {
+		if c.Req.Request.Method != http.MethodGet || !strings.HasPrefix(proxyPath, "api/") {
 			c.JsonApiErr(403, "GET is only allowed on proxied Prometheus datasource", nil)
 			return
 		}

From d1a5d9c15c2c34b0eda902809853e11f372a37a9 Mon Sep 17 00:00:00 2001
From: Danilo Bargen <mail@dbrgn.ch>
Date: Tue, 7 Feb 2017 11:02:12 +0100
Subject: [PATCH 042/301] feat(alerting): Add Threema Gateway integration

This commit adds alerting support for Threema Gateway. It supports all
Simple IDs (managed by the Gateway server).

More information can be found on https://gateway.threema.ch/
---
 pkg/metrics/metrics.go                        |   2 +
 pkg/services/alerting/notifiers/threema.go    | 159 ++++++++++++++++++
 .../alerting/notifiers/threema_test.go        | 119 +++++++++++++
 3 files changed, 280 insertions(+)
 create mode 100644 pkg/services/alerting/notifiers/threema.go
 create mode 100644 pkg/services/alerting/notifiers/threema_test.go

diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index 1020f28f874..452e6884566 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -49,6 +49,7 @@ var (
 	M_Alerting_Notification_Sent_Victorops Counter
 	M_Alerting_Notification_Sent_OpsGenie  Counter
 	M_Alerting_Notification_Sent_Telegram  Counter
+	M_Alerting_Notification_Sent_Threema   Counter
 	M_Alerting_Notification_Sent_Sensu     Counter
 	M_Aws_CloudWatch_GetMetricStatistics   Counter
 	M_Aws_CloudWatch_ListMetrics           Counter
@@ -118,6 +119,7 @@ func initMetricVars(settings *MetricSettings) {
 	M_Alerting_Notification_Sent_Victorops = RegCounter("alerting.notifications_sent", "type", "victorops")
 	M_Alerting_Notification_Sent_OpsGenie = RegCounter("alerting.notifications_sent", "type", "opsgenie")
 	M_Alerting_Notification_Sent_Telegram = RegCounter("alerting.notifications_sent", "type", "telegram")
+	M_Alerting_Notification_Sent_Threema = RegCounter("alerting.notifications_sent", "type", "threema")
 	M_Alerting_Notification_Sent_Sensu = RegCounter("alerting.notifications_sent", "type", "sensu")
 	M_Alerting_Notification_Sent_LINE = RegCounter("alerting.notifications_sent", "type", "LINE")
 
diff --git a/pkg/services/alerting/notifiers/threema.go b/pkg/services/alerting/notifiers/threema.go
new file mode 100644
index 00000000000..f805bd24394
--- /dev/null
+++ b/pkg/services/alerting/notifiers/threema.go
@@ -0,0 +1,159 @@
+package notifiers
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/metrics"
+	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/alerting"
+)
+
+var (
+	threemaGwBaseURL = "https://msgapi.threema.ch/%s"
+)
+
+func init() {
+	alerting.RegisterNotifier(&alerting.NotifierPlugin{
+		Type:        "threema",
+		Name:        "Threema Gateway",
+		Description: "Sends notifications to Threema using the Threema Gateway",
+		Factory:     NewThreemaNotifier,
+		OptionsTemplate: `
+      <h3 class="page-heading">Threema Gateway settings</h3>
+      <p>
+        Notifications can be configured for any Threema Gateway ID of type
+        "Basic". End-to-End IDs are not currently supported.
+      </p>
+      <p>
+        The Threema Gateway ID can be set up at
+        <a href="https://gateway.threema.ch/" target="_blank" rel="noopener noreferrer">https://gateway.threema.ch/</a>.
+      </p>
+      <div class="gf-form">
+        <span class="gf-form-label width-14">Gateway ID</span>
+        <input type="text" required maxlength="8" pattern="\*[0-9A-Z]{7}"
+          class="gf-form-input max-width-14"
+          ng-model="ctrl.model.settings.gateway_id"
+          placeholder="*3MAGWID">
+        </input>
+        <info-popover mode="right-normal">
+          Your 8 character Threema Gateway ID (starting with a *)
+        </info-popover>
+      </div>
+      <div class="gf-form">
+        <span class="gf-form-label width-14">Recipient ID</span>
+        <input type="text" required maxlength="8" pattern="[0-9A-Z]{8}"
+          class="gf-form-input max-width-14"
+          ng-model="ctrl.model.settings.recipient_id"
+          placeholder="YOUR3MID">
+        </input>
+        <info-popover mode="right-normal">
+          The 8 character Threema ID that should receive the alerts
+        </info-popover>
+      </div>
+      <div class="gf-form">
+        <span class="gf-form-label width-14">API Secret</span>
+        <input type="text" required
+          class="gf-form-input max-width-24"
+          ng-model="ctrl.model.settings.api_secret">
+        </input>
+        <info-popover mode="right-normal">
+          Your Threema Gateway API secret
+        </info-popover>
+      </div>
+    `,
+	})
+
+}
+
+type ThreemaNotifier struct {
+	NotifierBase
+	GatewayID   string
+	RecipientID string
+	APISecret   string
+	log         log.Logger
+}
+
+func NewThreemaNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+	if model.Settings == nil {
+		return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
+	}
+
+	gatewayID := model.Settings.Get("gateway_id").MustString()
+	recipientID := model.Settings.Get("recipient_id").MustString()
+	apiSecret := model.Settings.Get("api_secret").MustString()
+
+	// Validation
+	if gatewayID == "" {
+		return nil, alerting.ValidationError{Reason: "Could not find Threema Gateway ID in settings"}
+	}
+	if !strings.HasPrefix(gatewayID, "*") {
+		return nil, alerting.ValidationError{Reason: "Invalid Threema Gateway ID: Must start with a *"}
+	}
+	if len(gatewayID) != 8 {
+		return nil, alerting.ValidationError{Reason: "Invalid Threema Gateway ID: Must be 8 characters long"}
+	}
+	if recipientID == "" {
+		return nil, alerting.ValidationError{Reason: "Could not find Threema Recipient ID in settings"}
+	}
+	if len(recipientID) != 8 {
+		return nil, alerting.ValidationError{Reason: "Invalid Threema Recipient ID: Must be 8 characters long"}
+	}
+	if apiSecret == "" {
+		return nil, alerting.ValidationError{Reason: "Could not find Threema API secret in settings"}
+	}
+
+	return &ThreemaNotifier{
+		NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+		GatewayID:    gatewayID,
+		RecipientID:  recipientID,
+		APISecret:    apiSecret,
+		log:          log.New("alerting.notifier.threema"),
+	}, nil
+}
+
+func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error {
+	notifier.log.Info("Sending alert notification from", "threema_id", notifier.GatewayID)
+	notifier.log.Info("Sending alert notification to", "threema_id", notifier.RecipientID)
+	metrics.M_Alerting_Notification_Sent_Threema.Inc(1)
+
+	// Set up basic API request data
+	data := url.Values{}
+	data.Set("from", notifier.GatewayID)
+	data.Set("to", notifier.RecipientID)
+	data.Set("secret", notifier.APISecret)
+
+	// Build message
+	message := fmt.Sprintf("%s\nState: %s\nMessage: %s\n",
+		evalContext.GetNotificationTitle(), evalContext.Rule.Name, evalContext.Rule.Message)
+	ruleURL, err := evalContext.GetRuleUrl()
+	if err == nil {
+		message = message + fmt.Sprintf("URL: %s\n", ruleURL)
+	}
+	if evalContext.ImagePublicUrl != "" {
+		message = message + fmt.Sprintf("Image: %s\n", evalContext.ImagePublicUrl)
+	}
+	data.Set("text", message)
+
+	// Prepare and send request
+	url := fmt.Sprintf(threemaGwBaseURL, "send_simple")
+	body := data.Encode()
+	headers := map[string]string{
+		"Content-Type": "application/x-www-form-urlencoded",
+	}
+	cmd := &m.SendWebhookSync{
+		Url:        url,
+		Body:       body,
+		HttpMethod: "POST",
+		HttpHeader: headers,
+	}
+	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+		notifier.log.Error("Failed to send webhook", "error", err, "webhook", notifier.Name)
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/services/alerting/notifiers/threema_test.go b/pkg/services/alerting/notifiers/threema_test.go
new file mode 100644
index 00000000000..3f23730a249
--- /dev/null
+++ b/pkg/services/alerting/notifiers/threema_test.go
@@ -0,0 +1,119 @@
+package notifiers
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/alerting"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestThreemaNotifier(t *testing.T) {
+	Convey("Threema notifier tests", t, func() {
+
+		Convey("Parsing alert notification from settings", func() {
+			Convey("empty settings should return error", func() {
+				json := `{ }`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "threema_testing",
+					Type:     "threema",
+					Settings: settingsJSON,
+				}
+
+				_, err := NewThreemaNotifier(model)
+				So(err, ShouldNotBeNil)
+			})
+
+			Convey("valid settings should be parsed successfully", func() {
+				json := `
+				{
+					"gateway_id": "*3MAGWID",
+					"recipient_id": "ECHOECHO",
+					"api_secret": "1234"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "threema_testing",
+					Type:     "threema",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewThreemaNotifier(model)
+				So(err, ShouldBeNil)
+				threemaNotifier := not.(*ThreemaNotifier)
+
+				So(err, ShouldBeNil)
+				So(threemaNotifier.Name, ShouldEqual, "threema_testing")
+				So(threemaNotifier.Type, ShouldEqual, "threema")
+				So(threemaNotifier.GatewayID, ShouldEqual, "*3MAGWID")
+				So(threemaNotifier.RecipientID, ShouldEqual, "ECHOECHO")
+				So(threemaNotifier.APISecret, ShouldEqual, "1234")
+			})
+
+			Convey("invalid Threema Gateway IDs should be rejected (prefix)", func() {
+				json := `
+				{
+					"gateway_id": "ECHOECHO",
+					"recipient_id": "ECHOECHO",
+					"api_secret": "1234"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "threema_testing",
+					Type:     "threema",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewThreemaNotifier(model)
+				So(not, ShouldBeNil)
+				So(err.(alerting.ValidationError).Reason, ShouldEqual, "Invalid Threema Gateway ID: Must start with a *")
+			})
+
+			Convey("invalid Threema Gateway IDs should be rejected (length)", func() {
+				json := `
+				{
+					"gateway_id": "*ECHOECHO",
+					"recipient_id": "ECHOECHO",
+					"api_secret": "1234"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "threema_testing",
+					Type:     "threema",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewThreemaNotifier(model)
+				So(not, ShouldBeNil)
+				So(err.(alerting.ValidationError).Reason, ShouldEqual, "Invalid Threema Gateway ID: Must be 8 characters long")
+			})
+
+			Convey("invalid Threema Recipient IDs should be rejected (length)", func() {
+				json := `
+				{
+					"gateway_id": "*3MAGWID",
+					"recipient_id": "ECHOECH",
+					"api_secret": "1234"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "threema_testing",
+					Type:     "threema",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewThreemaNotifier(model)
+				So(not, ShouldBeNil)
+				So(err.(alerting.ValidationError).Reason, ShouldEqual, "Invalid Threema Recipient ID: Must be 8 characters long")
+			})
+
+		})
+	})
+}

From 689f5cb686c6d74fe1ddf9d8fe8caf9286aebe73 Mon Sep 17 00:00:00 2001
From: Danilo Bargen <mail@dbrgn.ch>
Date: Tue, 7 Feb 2017 11:10:05 +0100
Subject: [PATCH 043/301] feat(alerting): Text formatting for Threema alert
 messages

---
 pkg/services/alerting/notifiers/threema.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/services/alerting/notifiers/threema.go b/pkg/services/alerting/notifiers/threema.go
index f805bd24394..a710d686d28 100644
--- a/pkg/services/alerting/notifiers/threema.go
+++ b/pkg/services/alerting/notifiers/threema.go
@@ -127,14 +127,14 @@ func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error
 	data.Set("secret", notifier.APISecret)
 
 	// Build message
-	message := fmt.Sprintf("%s\nState: %s\nMessage: %s\n",
+	message := fmt.Sprintf("%s\n\n*State:* %s\n*Message:* %s\n",
 		evalContext.GetNotificationTitle(), evalContext.Rule.Name, evalContext.Rule.Message)
 	ruleURL, err := evalContext.GetRuleUrl()
 	if err == nil {
-		message = message + fmt.Sprintf("URL: %s\n", ruleURL)
+		message = message + fmt.Sprintf("*URL:* %s\n", ruleURL)
 	}
 	if evalContext.ImagePublicUrl != "" {
-		message = message + fmt.Sprintf("Image: %s\n", evalContext.ImagePublicUrl)
+		message = message + fmt.Sprintf("*Image:* %s\n", evalContext.ImagePublicUrl)
 	}
 	data.Set("text", message)
 

From 8ca4afaf2254e4a311aad0ad9a05cd155105870b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 7 Feb 2017 11:17:20 +0100
Subject: [PATCH 044/301] docs(changelog): adds note about closing #7459

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 943bb32b07d..cabf9b4fd0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [@lpic10](https://github.com/lpic10)
 * **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
+* **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 
 ## Tech
 

From b3db5aae4b63bdc6d10b7d4a1c6bfceda302a251 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 7 Feb 2017 11:21:20 +0100
Subject: [PATCH 045/301] docs(changelog): adds note about closing #6799

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cabf9b4fd0b..a47b61b9673 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 
+
 ## Tech
 
 * **Library Upgrade**: Upgraded angularjs from 1.5.8 to 1.6.1 [#7274](https://github.com/grafana/grafana/issues/7274)
@@ -25,6 +26,7 @@
 * **Alertlist**: Only show scrollbar when required [#7269](https://github.com/grafana/grafana/issues/7269)
 * **SMTP**: Set LocalName to hostname [#7223](https://github.com/grafana/grafana/issues/7223)
 * **Sidemenu**: Disable sign out in sidemenu for AuthProxyEnabled [#7377](https://github.com/grafana/grafana/pull/7377), thx [@solugebefola](https://github.com/solugebefola)
+* **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
 
 # 4.1.2 (unreleased)
 

From 10e100b080f61a802f6c8cc6153aca86f53d3af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 7 Feb 2017 12:27:16 +0100
Subject: [PATCH 046/301] docs(): updates

---
 docs/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index d3268fc6873..0dc223c6130 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -7,7 +7,7 @@ DOCKER_DOCS_IMAGE := grafana/grafana-docs
 
 SOURCES_HOST_DIR := "$(shell pwd)/sources"
 
-DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content/docs
+DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content
 
 DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e NOCACHE -p 3004:3004 -p 3005:3005
 
@@ -15,16 +15,16 @@ DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e NOCACHE -p 3004:3004 -p
 default: docs
 
 docs: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt && grunt connect --port=3004"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004"
 
 test: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "ls -la /site/content/docs"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "ls -la /site/content"
 
 docs-watch: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
 
 publish: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs v3.1"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs v3.1"
 
 publish-prod: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"

From 5bba0c2a94092ba5393d63996575469ad97f00a2 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 7 Feb 2017 12:45:06 +0100
Subject: [PATCH 047/301] tech(build): upgrade dist builder to golang1.8rc3

---
 scripts/build/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile
index e24470fc42b..87a62a1a456 100644
--- a/scripts/build/Dockerfile
+++ b/scripts/build/Dockerfile
@@ -23,10 +23,10 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
 
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
     yum install -y yarn --nogpgcheck && \
-    wget https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.7.4.linux-amd64.tar.gz
+    wget https://storage.googleapis.com/golang/go1.8rc3.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.8rc3.linux-amd64.tar.gz
 
-ENV GOLANG_VERSION 1.7.4
+ENV GOLANG_VERSION 1.8rc3
 ENV PATH /usr/local/go/bin:$PATH
 
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go

From 53942f7987ee6b07f9fae21e535efaf8c7f9ea77 Mon Sep 17 00:00:00 2001
From: James Regovich <jregovic@rego.org>
Date: Tue, 7 Feb 2017 10:50:49 -0600
Subject: [PATCH 048/301] Adding HipChat Notifier

---
 pkg/services/alerting/notifiers/hipchat.go    | 151 ++++++++++++++++++
 .../alerting/notifiers/hipchat_test.go        |  81 ++++++++++
 2 files changed, 232 insertions(+)
 create mode 100644 pkg/services/alerting/notifiers/hipchat.go
 create mode 100644 pkg/services/alerting/notifiers/hipchat_test.go

diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go
new file mode 100644
index 00000000000..8517fa0c9b4
--- /dev/null
+++ b/pkg/services/alerting/notifiers/hipchat.go
@@ -0,0 +1,151 @@
+package notifiers
+
+import (
+	"encoding/json"
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
+	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/alerting"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func init() {
+	alerting.RegisterNotifier(&alerting.NotifierPlugin{
+		Type:        "hipchat",
+		Name:        "HipChat",
+		Description: "Sends notifications uto a HipChat Room",
+		Factory:     NewHipChatNotifier,
+		OptionsTemplate: `
+      <h3 class="page-heading">HipChat settings</h3>
+			      <div class="gf-form max-width-30">
+			        <span class="gf-form-label width-6">Hip Chat Url</span>
+			        <input type="text" required class="gf-form-input max-width-30" ng-model="ctrl.model.settings.url" placeholder="HipChat URL"></input>
+			      </div>
+      <div class="gf-form max-width-30">
+        <span class="gf-form-label width-6">API Key</span>
+        <input type="text" required class="gf-form-input max-width-30" ng-model="ctrl.model.settings.apikey" placeholder="HipChat API Key"></input>
+      </div>
+      <div class="gf-form max-width-30">
+        <span class="gf-form-label width-6">Room ID</span>
+        <input type="text"
+          class="gf-form-input max-width-30"
+          ng-model="ctrl.model.settings.roomid"
+          data-placement="right">
+        </input>
+      </div>
+    `,
+	})
+
+}
+
+func NewHipChatNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+	url := model.Settings.Get("url").MustString()
+	if strings.HasSuffix(url, "/") {
+		url = url[:len(url)-1]
+	}
+	if url == "" {
+		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
+	}
+
+	apikey := model.Settings.Get("apikey").MustString()
+	roomid := model.Settings.Get("roomid").MustString()
+
+	return &HipChatNotifier{
+		NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+		Url:          url,
+		ApiKey:       apikey,
+		RoomId:       roomid,
+		log:          log.New("alerting.notifier.hipchat"),
+	}, nil
+}
+
+type HipChatNotifier struct {
+	NotifierBase
+	Url    string
+	ApiKey string
+	RoomId string
+	log    log.Logger
+}
+
+func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
+	var message string
+	var color string
+
+	this.log.Info("Executing hipchat notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+
+	ruleUrl, err := evalContext.GetRuleUrl()
+	if err != nil {
+		this.log.Error("Failed get rule link", "error", err)
+		return err
+	}
+
+	message = evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text + "<br><a href=" + ruleUrl + ">Check Dasboard</a>"
+	fields := make([]map[string]interface{}, 0)
+	fieldLimitCount := 4
+	message += "<br>"
+	for index, evt := range evalContext.EvalMatches {
+		message += evt.Metric + " :: " + strconv.FormatFloat(evt.Value.Float64, 'f', -1, 64) + "<br>"
+		fields = append(fields, map[string]interface{}{
+			"title": evt.Metric,
+			"value": evt.Value,
+			"short": true,
+		})
+		if index > fieldLimitCount {
+			break
+		}
+	}
+
+	if evalContext.Error != nil {
+		fields = append(fields, map[string]interface{}{
+			"title": "Error message",
+			"value": evalContext.Error.Error(),
+			"short": false,
+		})
+	}
+
+	if evalContext.Rule.State != m.AlertStateOK { //dont add message when going back to alert state ok.
+		message += " " + evalContext.Rule.Message
+	}
+	//HipChat has a set list of colors
+	switch evalContext.Rule.State {
+	case m.AlertStateOK:
+		color = "green"
+	case m.AlertStateNoData:
+		color = "grey"
+	case m.AlertStateAlerting:
+		color = "red"
+	}
+
+	// Add a card with link to the dashboard
+	card := map[string]interface{}{
+		"style":       "link",
+		"url":         ruleUrl,
+		"id":          "1",
+		"title":       evalContext.GetNotificationTitle(),
+		"description": evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text,
+		"icon": map[string]interface{}{
+			"url": "http://grafana.org/assets/img/fav32.png",
+		},
+		"date": time.Now().Unix(),
+	}
+
+	body := map[string]interface{}{
+		"message":        message,
+		"notify":         "true",
+		"message_format": "html",
+		"color":          color,
+		"card":           card,
+	}
+	hipUrl := this.Url + "/v2/room/" + this.RoomId + "/notification?auth_token=" + this.ApiKey
+	data, _ := json.Marshal(&body)
+	cmd := &m.SendWebhookSync{Url: hipUrl, Body: string(data)}
+
+	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+		this.log.Error("Failed to send hipchat notification", "error", err, "webhook", this.Name)
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/services/alerting/notifiers/hipchat_test.go b/pkg/services/alerting/notifiers/hipchat_test.go
new file mode 100644
index 00000000000..1597be12eb8
--- /dev/null
+++ b/pkg/services/alerting/notifiers/hipchat_test.go
@@ -0,0 +1,81 @@
+package notifiers
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	m "github.com/grafana/grafana/pkg/models"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestHipChatNotifier(t *testing.T) {
+	Convey("HipChat notifier tests", t, func() {
+
+		Convey("Parsing alert notification from settings", func() {
+			Convey("empty settings should return error", func() {
+				json := `{ }`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "ops",
+					Type:     "hipchat",
+					Settings: settingsJSON,
+				}
+
+				_, err := NewHipChatNotifier(model)
+				So(err, ShouldNotBeNil)
+			})
+
+			Convey("from settings", func() {
+				json := `
+				{
+          "url": "http://google.com"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "ops",
+					Type:     "hipchat",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewHipChatNotifier(model)
+				hipchatNotifier := not.(*HipChatNotifier)
+
+				So(err, ShouldBeNil)
+				So(hipchatNotifier.Name, ShouldEqual, "ops")
+				So(hipchatNotifier.Type, ShouldEqual, "hipchat")
+				So(hipchatNotifier.Url, ShouldEqual, "http://google.com")
+				So(hipchatNotifier.ApiKey, ShouldEqual, "")
+				So(hipchatNotifier.RoomId, ShouldEqual, "")
+			})
+
+			Convey("from settings with Recipient and Mention", func() {
+				json := `
+				{
+          "url": "http://www.hipchat.com",
+          "apikey": "1234",
+          "roomid": "1234"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "ops",
+					Type:     "hipchat",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewHipChatNotifier(model)
+				hipchatNotifier := not.(*HipChatNotifier)
+
+				So(err, ShouldBeNil)
+				So(hipchatNotifier.Name, ShouldEqual, "ops")
+				So(hipchatNotifier.Type, ShouldEqual, "hipchat")
+				So(hipchatNotifier.Url, ShouldEqual, "http://www.hipchat.com")
+				So(hipchatNotifier.ApiKey, ShouldEqual, "1234")
+				So(hipchatNotifier.RoomId, ShouldEqual, "1234")
+			})
+
+		})
+	})
+}

From cbd1455c4208170afd0cc281df72449a8db73b45 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 7 Feb 2017 22:15:52 +0100
Subject: [PATCH 049/301] fix(api): case insensitive sort for datasources

The data source list is case sensitive when sorted. This changes the
sort to be case insensitive. The test only tests the handler, not the
routing or database query.
---
 pkg/api/datasources_test.go | 124 ++++++++++++++++++++++++++++++++++++
 pkg/api/dtos/models.go      |   2 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 pkg/api/datasources_test.go

diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
new file mode 100644
index 00000000000..f04eb6076b2
--- /dev/null
+++ b/pkg/api/datasources_test.go
@@ -0,0 +1,124 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"testing"
+
+	m "github.com/grafana/grafana/pkg/models"
+	macaron "gopkg.in/macaron.v1"
+
+	"github.com/go-macaron/session"
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/middleware"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+const (
+	TestOrgID  = 1
+	TestUserID = 1
+)
+
+func TestDataSourcesProxy(t *testing.T) {
+	Convey("Given a user is logged in", t, func() {
+		loggedInUserScenario("When calling GET on", "/api/datasources/", func(sc *scenarioContext) {
+
+			// Stubs the database query
+			bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error {
+				So(query.OrgId, ShouldEqual, TestOrgID)
+				query.Result = []*m.DataSource{
+					{Name: "mmm"},
+					{Name: "ZZZ"},
+					{Name: "BBB"},
+					{Name: "aaa"},
+				}
+				return nil
+			})
+
+			// handler func being tested
+			sc.handlerFunc = GetDataSources
+			sc.fakeReq("GET", "/api/datasources").exec()
+
+			respJSON := []map[string]interface{}{}
+			err := json.NewDecoder(sc.resp.Body).Decode(&respJSON)
+			So(err, ShouldBeNil)
+
+			Convey("should return list of datasources for org sorted alphabetically and case insensitively", func() {
+				So(respJSON[0]["name"], ShouldEqual, "aaa")
+				So(respJSON[1]["name"], ShouldEqual, "BBB")
+				So(respJSON[2]["name"], ShouldEqual, "mmm")
+				So(respJSON[3]["name"], ShouldEqual, "ZZZ")
+			})
+		})
+	})
+}
+
+func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
+	Convey(desc+" "+url, func() {
+		defer bus.ClearBusHandlers()
+
+		sc := &scenarioContext{}
+		viewsPath, _ := filepath.Abs("../../public/views")
+
+		sc.m = macaron.New()
+		sc.m.Use(macaron.Renderer(macaron.RenderOptions{
+			Directory: viewsPath,
+			Delims:    macaron.Delims{Left: "[[", Right: "]]"},
+		}))
+
+		sc.m.Use(middleware.GetContextHandler())
+		sc.m.Use(middleware.Sessioner(&session.Options{}))
+
+		sc.defaultHandler = func(c *middleware.Context) {
+			sc.context = c
+			sc.context.UserId = TestUserID
+			sc.context.OrgId = TestOrgID
+			sc.context.OrgRole = m.ROLE_EDITOR
+			if sc.handlerFunc != nil {
+				sc.handlerFunc(sc.context)
+			}
+		}
+		sc.m.SetAutoHead(true)
+		sc.m.Get(url, sc.defaultHandler)
+
+		fn(sc)
+	})
+}
+
+func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
+	sc.resp = httptest.NewRecorder()
+	req, err := http.NewRequest(method, url, nil)
+	So(err, ShouldBeNil)
+	sc.req = req
+
+	return sc
+}
+
+type scenarioContext struct {
+	m              *macaron.Macaron
+	context        *middleware.Context
+	resp           *httptest.ResponseRecorder
+	apiKey         string
+	authHeader     string
+	handlerFunc    handlerFunc
+	defaultHandler macaron.Handler
+
+	req *http.Request
+}
+
+func (sc *scenarioContext) exec() {
+	if sc.apiKey != "" {
+		sc.req.Header.Add("Authorization", "Bearer "+sc.apiKey)
+	}
+
+	if sc.authHeader != "" {
+		sc.req.Header.Add("Authorization", sc.authHeader)
+	}
+
+	sc.m.ServeHTTP(sc.resp, sc.req)
+}
+
+type scenarioFunc func(c *scenarioContext)
+type handlerFunc func(c *middleware.Context)
diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index 13dbe4ea32a..564d86a25bf 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -91,7 +91,7 @@ func (slice DataSourceList) Len() int {
 }
 
 func (slice DataSourceList) Less(i, j int) bool {
-	return slice[i].Name < slice[j].Name
+	return strings.ToLower(slice[i].Name) < strings.ToLower(slice[j].Name)
 }
 
 func (slice DataSourceList) Swap(i, j int) {

From 8aa5b62d6dfb45fd800d9c132f9c869e7d15fced Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Feb 2017 00:01:42 +0100
Subject: [PATCH 050/301] fix(panel): case insensitive sort metric sources

Sorts the list of metric sources that is used in dropdown for Panel
Data Source on the Metrics tab so that it is case insensitive and
so that the built data sources are last in the list.
---
 public/app/core/services/datasource_srv.js | 13 ++++-
 public/test/specs/datasource_srv_specs.js  | 58 ++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 public/test/specs/datasource_srv_specs.js

diff --git a/public/app/core/services/datasource_srv.js b/public/app/core/services/datasource_srv.js
index b8b94cd286d..7c876ebd941 100644
--- a/public/app/core/services/datasource_srv.js
+++ b/public/app/core/services/datasource_srv.js
@@ -97,10 +97,19 @@ function (angular, _, coreModule, config) {
       }
 
       metricSources.sort(function(a, b) {
-        if (a.meta.builtIn || a.name > b.name) {
+        if (a.meta.builtIn) {
           return 1;
         }
-        if (a.name < b.name) {
+
+        if (b.meta.builtIn) {
+          return -1;
+        }
+
+        if (a.name.toLowerCase() > b.name.toLowerCase()) {
+          return 1;
+        }
+
+        if (a.name.toLowerCase() < b.name.toLowerCase()) {
           return -1;
         }
         return 0;
diff --git a/public/test/specs/datasource_srv_specs.js b/public/test/specs/datasource_srv_specs.js
new file mode 100644
index 00000000000..be7c054acaa
--- /dev/null
+++ b/public/test/specs/datasource_srv_specs.js
@@ -0,0 +1,58 @@
+define([
+  'app/core/config',
+  'app/core/services/datasource_srv'
+], function(config) {
+  'use strict';
+
+  describe('datasource_srv', function() {
+    var _datasourceSrv;
+    var metricSources;
+    var templateSrv = {};
+
+    beforeEach(module('grafana.core'));
+    beforeEach(module(function($provide) {
+      $provide.value('templateSrv', templateSrv);
+    }));
+    beforeEach(module('grafana.services'));
+    beforeEach(inject(function(datasourceSrv) {
+      _datasourceSrv = datasourceSrv;
+    }));
+
+    describe('when loading metric sources', function() {
+      var unsortedDatasources = {
+        'mmm': {
+          type: 'test-db',
+          meta: { metrics: {m: 1} }
+        },
+        '--Mixed--': {
+          type: 'test-db',
+          meta: {builtIn: true, metrics: {m: 1} }
+        },
+        'ZZZ': {
+          type: 'test-db',
+          meta: {metrics: {m: 1} }
+        },
+        'aaa': {
+          type: 'test-db',
+          meta: { metrics: {m: 1} }
+        },
+        'BBB': {
+          type: 'test-db',
+          meta: { metrics: {m: 1} }
+        },
+      };
+      beforeEach(function() {
+        config.datasources = unsortedDatasources;
+        metricSources = _datasourceSrv.getMetricSources({skipVariables: true});
+      });
+
+      it('should return a list of sources sorted case insensitively with builtin sources last', function() {
+        expect(metricSources[0].name).to.be('aaa');
+        expect(metricSources[1].name).to.be('BBB');
+        expect(metricSources[2].name).to.be('mmm');
+        expect(metricSources[3].name).to.be('ZZZ');
+        expect(metricSources[4].name).to.be('--Mixed--');
+      });
+    });
+  });
+});

From 0a17217d59067af08bfc463fc73735bb4ba466be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 8 Feb 2017 08:23:12 +0100
Subject: [PATCH 051/301] docs(): updating links

---
 docs/Makefile                         |  2 +-
 docs/sources/alerting/rules.md        |  2 +-
 docs/sources/guides/basic_concepts.md |  2 +-
 docs/sources/index.md                 | 18 +++++++++---------
 docs/sources/installation/debian.md   |  8 ++++----
 docs/sources/installation/rpm.md      |  8 ++++----
 docs/sources/plugins/development.md   |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 0dc223c6130..e5c555f8019 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -24,7 +24,7 @@ docs-watch: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
 
 publish: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs v3.1"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs root"
 
 publish-prod: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
diff --git a/docs/sources/alerting/rules.md b/docs/sources/alerting/rules.md
index aa38367b4aa..a2688de3100 100644
--- a/docs/sources/alerting/rules.md
+++ b/docs/sources/alerting/rules.md
@@ -33,7 +33,7 @@ of core Grafana. Only some data soures are supported right now. They include `Gr
 ### Clustering
 
 We have not implemented clustering yet. So if you run multiple instances of grafana-server
-you have to make sure [execute_alerts]({{< relref "docs/installation/configuration.md#alerting" >}})
+you have to make sure [execute_alerts]({{< relref "installation/configuration.md#alerting" >}})
 is true on only one instance or otherwise you will get duplicated notifications.
 
 <div class="clearfix"></div>
diff --git a/docs/sources/guides/basic_concepts.md b/docs/sources/guides/basic_concepts.md
index 0411db6caf2..112b004ec92 100644
--- a/docs/sources/guides/basic_concepts.md
+++ b/docs/sources/guides/basic_concepts.md
@@ -16,7 +16,7 @@ This document is a “bottom up” introduction to basic concepts in Grafana, an
 ### Data Source
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
-The following datasources are officially supported: [Graphite]({{< relref "docs/features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "docs/features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "docs/features/datasources/cloudwatch.md" >}}).
+The following datasources are officially supported: [Graphite]({{< relref "features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "features/datasources/cloudwatch.md" >}}).
 
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
diff --git a/docs/sources/index.md b/docs/sources/index.md
index ab2e0f882b8..eb2c491d78e 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -24,27 +24,27 @@ other domains including industrial sensors, home automation, weather, and proces
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
 - [Nightly Builds](http://grafana.org/builds)
 
-For other platforms Read the [build from source]({{< relref "docs/project/building_from_source.md" >}})
+For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
 instructions for more information.
 
 ## Configuring Grafana
 
 The back-end web server has a number of configuration options. Go the
-[Configuration]({{< relref "docs/installation/configuration.md" >}}) page for details on all
+[Configuration]({{< relref "installation/configuration.md" >}}) page for details on all
 those options.
 
 
 ## Getting started
 
-- [Getting Started]({{< relref "docs/guides/getting_started.md" >}})
-- [Basic Concepts]({{< relref "docs/guides/basic_concepts.md" >}})
-- [Screencasts]({{< relref "docs/tutorials/screencasts.md" >}})
+- [Getting Started]({{< relref "guides/getting_started.md" >}})
+- [Basic Concepts]({{< relref "guides/basic_concepts.md" >}})
+- [Screencasts]({{< relref "tutorials/screencasts.md" >}})
 
 ## Data sources guides
 
-- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
-- [Elasticsearch]({{< relref "docs/features/datasources/elasticsearch.md" >}})
-- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
 
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 7dd97e69810..9c6140c0c6d 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -114,10 +114,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ## Installing from binary tar file
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 561cff69b46..63181fc535d 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -121,10 +121,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ### Server side image rendering
 
diff --git a/docs/sources/plugins/development.md b/docs/sources/plugins/development.md
index edb959e97bc..b4573743a39 100644
--- a/docs/sources/plugins/development.md
+++ b/docs/sources/plugins/development.md
@@ -40,7 +40,7 @@ and [apps](./apps.md) plugins in the documentation.
 There are three ways that you can start developing a Grafana plugin.
 
 1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
-2. Install Grafana and place your plugin in the plugins directory which is set in your [config file]({{< relref "docs/installation/configuration.md" >}}). By default this is `/var/lib/grafana/plugins` on Linux systems.
+2. Install Grafana and place your plugin in the plugins directory which is set in your [config file]({{< relref "installation/configuration.md" >}}). By default this is `/var/lib/grafana/plugins` on Linux systems.
 3. Place your plugin directory anywhere you like and specify it grafana.ini.
 
 We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.

From 00549f393cedbccf16deca310fc2f3e2a789f69a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 8 Feb 2017 11:24:49 +0100
Subject: [PATCH 052/301] style(hipchat): improves code style

---
 pkg/services/alerting/notifiers/hipchat.go    | 54 ++++++++++---------
 .../app/features/alerting/alert_tab_ctrl.ts   |  1 +
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go
index 8517fa0c9b4..ad649cb084d 100644
--- a/pkg/services/alerting/notifiers/hipchat.go
+++ b/pkg/services/alerting/notifiers/hipchat.go
@@ -2,13 +2,15 @@ package notifiers
 
 import (
 	"encoding/json"
-	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"strconv"
 	"strings"
-	"time"
+
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
 func init() {
@@ -20,15 +22,15 @@ func init() {
 		OptionsTemplate: `
       <h3 class="page-heading">HipChat settings</h3>
 			      <div class="gf-form max-width-30">
-			        <span class="gf-form-label width-6">Hip Chat Url</span>
-			        <input type="text" required class="gf-form-input max-width-30" ng-model="ctrl.model.settings.url" placeholder="HipChat URL"></input>
+			        <span class="gf-form-label width-8">Hip Chat Url</span>
+			        <input type="text" required class="gf-form-input max-width-30" ng-model="ctrl.model.settings.url" placeholder="HipChat URL (ex https://grafana.hipchat.com)"></input>
 			      </div>
       <div class="gf-form max-width-30">
-        <span class="gf-form-label width-6">API Key</span>
+        <span class="gf-form-label width-8">API Key</span>
         <input type="text" required class="gf-form-input max-width-30" ng-model="ctrl.model.settings.apikey" placeholder="HipChat API Key"></input>
       </div>
       <div class="gf-form max-width-30">
-        <span class="gf-form-label width-6">Room ID</span>
+        <span class="gf-form-label width-8">Room ID</span>
         <input type="text"
           class="gf-form-input max-width-30"
           ng-model="ctrl.model.settings.roomid"
@@ -40,7 +42,11 @@ func init() {
 
 }
 
-func NewHipChatNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+const (
+	maxFieldCount int = 4
+)
+
+func NewHipChatNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if strings.HasSuffix(url, "/") {
 		url = url[:len(url)-1]
@@ -50,13 +56,13 @@ func NewHipChatNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}
 
 	apikey := model.Settings.Get("apikey").MustString()
-	roomid := model.Settings.Get("roomid").MustString()
+	roomId := model.Settings.Get("roomid").MustString()
 
 	return &HipChatNotifier{
 		NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
 		Url:          url,
 		ApiKey:       apikey,
-		RoomId:       roomid,
+		RoomId:       roomId,
 		log:          log.New("alerting.notifier.hipchat"),
 	}, nil
 }
@@ -70,9 +76,6 @@ type HipChatNotifier struct {
 }
 
 func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
-	var message string
-	var color string
-
 	this.log.Info("Executing hipchat notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
 
 	ruleUrl, err := evalContext.GetRuleUrl()
@@ -81,9 +84,8 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		return err
 	}
 
-	message = evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text + "<br><a href=" + ruleUrl + ">Check Dasboard</a>"
+	message := evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text + "<br><a href=" + ruleUrl + ">Check Dasboard</a>"
 	fields := make([]map[string]interface{}, 0)
-	fieldLimitCount := 4
 	message += "<br>"
 	for index, evt := range evalContext.EvalMatches {
 		message += evt.Metric + " :: " + strconv.FormatFloat(evt.Value.Float64, 'f', -1, 64) + "<br>"
@@ -92,7 +94,7 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 			"value": evt.Value,
 			"short": true,
 		})
-		if index > fieldLimitCount {
+		if index > maxFieldCount {
 			break
 		}
 	}
@@ -105,16 +107,17 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		})
 	}
 
-	if evalContext.Rule.State != m.AlertStateOK { //dont add message when going back to alert state ok.
+	if evalContext.Rule.State != models.AlertStateOK { //dont add message when going back to alert state ok.
 		message += " " + evalContext.Rule.Message
 	}
 	//HipChat has a set list of colors
+	var color string
 	switch evalContext.Rule.State {
-	case m.AlertStateOK:
+	case models.AlertStateOK:
 		color = "green"
-	case m.AlertStateNoData:
+	case models.AlertStateNoData:
 		color = "grey"
-	case m.AlertStateAlerting:
+	case models.AlertStateAlerting:
 		color = "red"
 	}
 
@@ -128,7 +131,7 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"icon": map[string]interface{}{
 			"url": "http://grafana.org/assets/img/fav32.png",
 		},
-		"date": time.Now().Unix(),
+		"date": evalContext.EndTime.Unix(),
 	}
 
 	body := map[string]interface{}{
@@ -138,9 +141,10 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"color":          color,
 		"card":           card,
 	}
-	hipUrl := this.Url + "/v2/room/" + this.RoomId + "/notification?auth_token=" + this.ApiKey
+
+	hipUrl := fmt.Sprintf("%s/v2/room/%s/notification?auth_token=%s", this.Url, this.RoomId, this.ApiKey)
 	data, _ := json.Marshal(&body)
-	cmd := &m.SendWebhookSync{Url: hipUrl, Body: string(data)}
+	cmd := &models.SendWebhookSync{Url: hipUrl, Body: string(data)}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send hipchat notification", "error", err, "webhook", this.Name)
diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts
index 89b1c63372f..6be36380144 100644
--- a/public/app/features/alerting/alert_tab_ctrl.ts
+++ b/public/app/features/alerting/alert_tab_ctrl.ts
@@ -104,6 +104,7 @@ export class AlertTabCtrl {
       case "webhook": return "fa fa-cubes";
       case "pagerduty": return "fa fa-bullhorn";
       case "opsgenie": return "fa fa-bell";
+      case "hipchat": return "fa fa-mail-forward";
     }
   }
 

From 10508d02384bb12838ae92530a48e5b5d8e6a71f Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 8 Feb 2017 11:28:26 +0100
Subject: [PATCH 053/301] docs(changelog): adds note about closing #6451

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a47b61b9673..946fae9b946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 * **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
-
+* **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 
 ## Tech
 

From fbc3c3dd327fee330e7d77f3703d05c0d58b9526 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Feb 2017 11:57:05 +0100
Subject: [PATCH 054/301] api: removes import alias + some unused fields

---
 pkg/api/datasources_test.go | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index f04eb6076b2..aa3f6106afd 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	macaron "gopkg.in/macaron.v1"
 
 	"github.com/go-macaron/session"
@@ -26,9 +26,9 @@ func TestDataSourcesProxy(t *testing.T) {
 		loggedInUserScenario("When calling GET on", "/api/datasources/", func(sc *scenarioContext) {
 
 			// Stubs the database query
-			bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error {
+			bus.AddHandler("test", func(query *models.GetDataSourcesQuery) error {
 				So(query.OrgId, ShouldEqual, TestOrgID)
-				query.Result = []*m.DataSource{
+				query.Result = []*models.DataSource{
 					{Name: "mmm"},
 					{Name: "ZZZ"},
 					{Name: "BBB"},
@@ -75,7 +75,7 @@ func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
 			sc.context = c
 			sc.context.UserId = TestUserID
 			sc.context.OrgId = TestOrgID
-			sc.context.OrgRole = m.ROLE_EDITOR
+			sc.context.OrgRole = models.ROLE_EDITOR
 			if sc.handlerFunc != nil {
 				sc.handlerFunc(sc.context)
 			}
@@ -100,23 +100,12 @@ type scenarioContext struct {
 	m              *macaron.Macaron
 	context        *middleware.Context
 	resp           *httptest.ResponseRecorder
-	apiKey         string
-	authHeader     string
 	handlerFunc    handlerFunc
 	defaultHandler macaron.Handler
-
-	req *http.Request
+	req            *http.Request
 }
 
 func (sc *scenarioContext) exec() {
-	if sc.apiKey != "" {
-		sc.req.Header.Add("Authorization", "Bearer "+sc.apiKey)
-	}
-
-	if sc.authHeader != "" {
-		sc.req.Header.Add("Authorization", sc.authHeader)
-	}
-
 	sc.m.ServeHTTP(sc.resp, sc.req)
 }
 

From bccb6500109fa6ef34ac6731e50299a2fd2fa616 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Feb 2017 12:06:00 +0100
Subject: [PATCH 055/301] Adds Sorting for lists of data sources to 4.2.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 946fae9b946..9207be556e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+* **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
 
 ## Tech
 

From c05c6ee7a48c0fb6cce765e5ee87ad6830441939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 8 Feb 2017 20:00:39 +0100
Subject: [PATCH 056/301] docs(): minor fix

---
 docs/sources/administration/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/administration/cli.md b/docs/sources/administration/cli.md
index 4f2bbde3606..ebe910503aa 100644
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -17,7 +17,7 @@ executed on the same machine as grafana runs.
 
 The CLI helps you install, upgrade and manage your plugins on the same machine it CLI is running.
 You can find more information about how to install and manage your plugins at the
-[plugin page]({{< relref "docs/plugins/installation.md" >}}).
+[plugin page]({{< relref "plugins/installation.md" >}}).
 
 ## Admin
 

From aa7292fac61d328788e671935820a7a437d1c1b9 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 7 Feb 2017 17:45:36 +0100
Subject: [PATCH 057/301] mqe: adds support for wildcard and index aliases

---
 pkg/tsdb/mqe/httpClient.go           |   2 +-
 pkg/tsdb/mqe/mqe.go                  |   1 +
 pkg/tsdb/mqe/response_parser.go      | 100 +++++++++++++++++++++++----
 pkg/tsdb/mqe/response_parser_test.go |  68 ++++++++++++++++--
 pkg/tsdb/mqe/types.go                |   2 +
 5 files changed, 153 insertions(+), 20 deletions(-)

diff --git a/pkg/tsdb/mqe/httpClient.go b/pkg/tsdb/mqe/httpClient.go
index c4a7807f9cb..d8bf0888a35 100644
--- a/pkg/tsdb/mqe/httpClient.go
+++ b/pkg/tsdb/mqe/httpClient.go
@@ -86,7 +86,7 @@ func (e *apiClient) spawnWorker(ctx context.Context, id int, jobs chan QueryToSe
 			return
 		}
 
-		series, err := e.responseParser.Parse(resp, query.QueryRef)
+		series, err := e.responseParser.Parse(resp, query)
 		if err != nil {
 			errors <- err
 			return
diff --git a/pkg/tsdb/mqe/mqe.go b/pkg/tsdb/mqe/mqe.go
index 5d5f0950de5..ae828e95c20 100644
--- a/pkg/tsdb/mqe/mqe.go
+++ b/pkg/tsdb/mqe/mqe.go
@@ -40,6 +40,7 @@ func init() {
 
 type QueryToSend struct {
 	RawQuery string
+	Metric   Metric
 	QueryRef *Query
 }
 
diff --git a/pkg/tsdb/mqe/response_parser.go b/pkg/tsdb/mqe/response_parser.go
index d40106fc197..8cfa7d96cdd 100644
--- a/pkg/tsdb/mqe/response_parser.go
+++ b/pkg/tsdb/mqe/response_parser.go
@@ -4,9 +4,13 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"strconv"
+	"strings"
 
 	"fmt"
 
+	"regexp"
+
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/tsdb"
@@ -18,6 +22,16 @@ func NewResponseParser() *ResponseParser {
 	}
 }
 
+var (
+	indexAliasPattern    *regexp.Regexp
+	wildcardAliasPattern *regexp.Regexp
+)
+
+func init() {
+	indexAliasPattern = regexp.MustCompile(`\$(\d)`)
+	wildcardAliasPattern = regexp.MustCompile(`[*!]`)
+}
+
 type MQEResponse struct {
 	Success bool               `json:"success"`
 	Name    string             `json:"name"`
@@ -47,7 +61,7 @@ type ResponseParser struct {
 	log log.Logger
 }
 
-func (parser *ResponseParser) Parse(res *http.Response, queryRef *Query) ([]*tsdb.TimeSeries, error) {
+func (parser *ResponseParser) Parse(res *http.Response, queryRef QueryToSend) ([]*tsdb.TimeSeries, error) {
 	body, err := ioutil.ReadAll(res.Body)
 	defer res.Body.Close()
 	if err != nil {
@@ -73,22 +87,14 @@ func (parser *ResponseParser) Parse(res *http.Response, queryRef *Query) ([]*tsd
 	var series []*tsdb.TimeSeries
 	for _, body := range data.Body {
 		for _, mqeSerie := range body.Series {
-			namePrefix := ""
-
-			//append predefined tags to seriename
-			for key, value := range mqeSerie.Tagset {
-				if key == "cluster" && queryRef.AddClusterToAlias {
-					namePrefix += value + " "
-				}
+			serie := &tsdb.TimeSeries{
+				Tags: map[string]string{},
+				Name: parser.formatLegend(body, mqeSerie, queryRef),
 			}
 			for key, value := range mqeSerie.Tagset {
-				if key == "host" && queryRef.AddHostToAlias {
-					namePrefix += value + " "
-				}
+				serie.Tags[key] = value
 			}
 
-			serie := &tsdb.TimeSeries{Name: namePrefix + body.Name}
-
 			for i, value := range mqeSerie.Values {
 				timestamp := body.TimeRange.Start + int64(i)*body.TimeRange.Resolution
 				serie.Points = append(serie.Points, tsdb.NewTimePoint(value, float64(timestamp)))
@@ -100,3 +106,71 @@ func (parser *ResponseParser) Parse(res *http.Response, queryRef *Query) ([]*tsd
 
 	return series, nil
 }
+
+func (parser *ResponseParser) formatLegend(body MQEResponseSerie, mqeSerie MQESerie, queryToSend QueryToSend) string {
+	namePrefix := ""
+
+	//append predefined tags to seriename
+	for key, value := range mqeSerie.Tagset {
+		if key == "cluster" && queryToSend.QueryRef.AddClusterToAlias {
+			namePrefix += value + " "
+		}
+	}
+	for key, value := range mqeSerie.Tagset {
+		if key == "host" && queryToSend.QueryRef.AddHostToAlias {
+			namePrefix += value + " "
+		}
+	}
+
+	return namePrefix + parser.formatName(body, queryToSend)
+}
+
+func (parser *ResponseParser) formatName(body MQEResponseSerie, queryToSend QueryToSend) string {
+	if indexAliasPattern.MatchString(queryToSend.Metric.Alias) {
+		return parser.indexAlias(body, queryToSend)
+	}
+
+	if wildcardAliasPattern.MatchString(queryToSend.Metric.Metric) && wildcardAliasPattern.MatchString(queryToSend.Metric.Alias) {
+		return parser.wildcardAlias(body, queryToSend)
+	}
+
+	return body.Name
+}
+
+func (parser *ResponseParser) wildcardAlias(body MQEResponseSerie, queryToSend QueryToSend) string {
+	regString := strings.Replace(queryToSend.Metric.Metric, `*`, `(.*)`, 1)
+	reg, err := regexp.Compile(regString)
+	if err != nil {
+		return queryToSend.Metric.Alias
+	}
+
+	matches := reg.FindAllStringSubmatch(queryToSend.RawQuery, -1)
+
+	if len(matches) == 0 || len(matches[0]) < 2 {
+		return queryToSend.Metric.Alias
+	}
+
+	return matches[0][1]
+}
+
+func (parser *ResponseParser) indexAlias(body MQEResponseSerie, queryToSend QueryToSend) string {
+	queryNameParts := strings.Split(body.Name, `.`)
+	name := indexAliasPattern.ReplaceAllStringFunc(queryToSend.Metric.Alias, func(in string) string {
+		positionName := strings.TrimSpace(strings.Replace(in, "$", "", 1))
+
+		pos, err := strconv.Atoi(positionName)
+		if err != nil {
+			return ""
+		}
+
+		for i, part := range queryNameParts {
+			if i == pos-1 {
+				return strings.TrimSpace(part)
+			}
+		}
+
+		return ""
+	})
+
+	return strings.Replace(name, " ", ".", -1)
+}
diff --git a/pkg/tsdb/mqe/response_parser_test.go b/pkg/tsdb/mqe/response_parser_test.go
index 63761841d97..237c25aa8fc 100644
--- a/pkg/tsdb/mqe/response_parser_test.go
+++ b/pkg/tsdb/mqe/response_parser_test.go
@@ -8,11 +8,12 @@ import (
 
 	"io/ioutil"
 
+	"github.com/grafana/grafana/pkg/components/null"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
 var (
-	dummieJson string
+	testJson string
 )
 
 func TestMQEResponseParser(t *testing.T) {
@@ -20,14 +21,17 @@ func TestMQEResponseParser(t *testing.T) {
 		parser := NewResponseParser()
 
 		Convey("Can parse response", func() {
-			queryRef := &Query{
-				AddClusterToAlias: true,
-				AddHostToAlias:    true,
+			queryRef := QueryToSend{
+				QueryRef: &Query{
+					AddClusterToAlias: true,
+					AddHostToAlias:    true,
+				},
+				Metric: Metric{Alias: ""},
 			}
 
 			response := &http.Response{
 				StatusCode: 200,
-				Body:       ioutil.NopCloser(strings.NewReader(dummieJson)),
+				Body:       ioutil.NopCloser(strings.NewReader(testJson)),
 			}
 			res, err := parser.Parse(response, queryRef)
 			So(err, ShouldBeNil)
@@ -39,12 +43,64 @@ func TestMQEResponseParser(t *testing.T) {
 				So(res[0].Points[i][0].Float64, ShouldEqual, i+1)
 				So(res[0].Points[i][1].Float64, ShouldEqual, startTime+(i*30000))
 			}
+
+		})
+
+		Convey("Can format legend", func() {
+			mqeSerie := MQESerie{
+				Tagset: map[string]string{
+					"cluster": "demoapp",
+					"host":    "staples-lab-1",
+				},
+				Values: []null.Float{null.NewFloat(3, true)},
+			}
+
+			Convey("with empty alias", func() {
+				serie := MQEResponseSerie{Name: "os.disk.sda3.weighted_io_time"}
+				queryRef := QueryToSend{
+					QueryRef: &Query{
+						AddClusterToAlias: true,
+						AddHostToAlias:    true,
+					},
+					Metric: Metric{Alias: ""},
+				}
+				legend := parser.formatLegend(serie, mqeSerie, queryRef)
+				So(legend, ShouldEqual, "demoapp staples-lab-1 os.disk.sda3.weighted_io_time")
+			})
+
+			Convey("with index alias (ex $2 $3)", func() {
+				serie := MQEResponseSerie{Name: "os.disk.sda3.weighted_io_time"}
+				queryRef := QueryToSend{
+					QueryRef: &Query{
+						AddClusterToAlias: true,
+						AddHostToAlias:    true,
+					},
+					Metric: Metric{Alias: "$2 $3"},
+				}
+				legend := parser.formatLegend(serie, mqeSerie, queryRef)
+				So(legend, ShouldEqual, "demoapp staples-lab-1 disk.sda3")
+			})
+
+			Convey("with wildcard alias", func() {
+				serie := MQEResponseSerie{Name: "os.disk.sda3.weighted_io_time", Query: "os.disk.*"}
+
+				queryRef := QueryToSend{
+					QueryRef: &Query{
+						AddClusterToAlias: true,
+						AddHostToAlias:    true,
+					},
+					RawQuery: "os.disk.sda3.weighted_io_time",
+					Metric:   Metric{Alias: "*", Metric: "os.disk.*.weighted_io_time"},
+				}
+				legend := parser.formatLegend(serie, mqeSerie, queryRef)
+				So(legend, ShouldEqual, "demoapp staples-lab-1 sda3")
+			})
 		})
 	})
 }
 
 func init() {
-	dummieJson = `{
+	testJson = `{
     "success": true,
     "name": "select",
     "body": [
diff --git a/pkg/tsdb/mqe/types.go b/pkg/tsdb/mqe/types.go
index 4fa2c1d4e7f..0bd436ee9bd 100644
--- a/pkg/tsdb/mqe/types.go
+++ b/pkg/tsdb/mqe/types.go
@@ -53,6 +53,7 @@ func (q *Query) Build(availableSeries []string) ([]QueryToSend, error) {
 			queriesToSend = append(queriesToSend, QueryToSend{
 				RawQuery: rawQuery,
 				QueryRef: q,
+				Metric:   metric,
 			})
 		} else {
 			m := strings.Replace(metric.Metric, "*", ".*", -1)
@@ -70,6 +71,7 @@ func (q *Query) Build(availableSeries []string) ([]QueryToSend, error) {
 					queriesToSend = append(queriesToSend, QueryToSend{
 						RawQuery: rawQuery,
 						QueryRef: q,
+						Metric:   metric,
 					})
 				}
 			}

From c7febca447b5013014d710b04718ac933505a730 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 9 Feb 2017 16:43:57 +0100
Subject: [PATCH 058/301] mqe: fixes broken test for indexalias

---
 pkg/tsdb/mqe/response_parser.go      | 3 ++-
 pkg/tsdb/mqe/response_parser_test.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/tsdb/mqe/response_parser.go b/pkg/tsdb/mqe/response_parser.go
index 8cfa7d96cdd..f3fdb00f0aa 100644
--- a/pkg/tsdb/mqe/response_parser.go
+++ b/pkg/tsdb/mqe/response_parser.go
@@ -154,7 +154,8 @@ func (parser *ResponseParser) wildcardAlias(body MQEResponseSerie, queryToSend Q
 }
 
 func (parser *ResponseParser) indexAlias(body MQEResponseSerie, queryToSend QueryToSend) string {
-	queryNameParts := strings.Split(body.Name, `.`)
+	queryNameParts := strings.Split(queryToSend.Metric.Metric, `.`)
+
 	name := indexAliasPattern.ReplaceAllStringFunc(queryToSend.Metric.Alias, func(in string) string {
 		positionName := strings.TrimSpace(strings.Replace(in, "$", "", 1))
 
diff --git a/pkg/tsdb/mqe/response_parser_test.go b/pkg/tsdb/mqe/response_parser_test.go
index 237c25aa8fc..34259aaea48 100644
--- a/pkg/tsdb/mqe/response_parser_test.go
+++ b/pkg/tsdb/mqe/response_parser_test.go
@@ -75,7 +75,7 @@ func TestMQEResponseParser(t *testing.T) {
 						AddClusterToAlias: true,
 						AddHostToAlias:    true,
 					},
-					Metric: Metric{Alias: "$2 $3"},
+					Metric: Metric{Alias: "$2 $3", Metric: "os.disk.sda3.weighted_io_time"},
 				}
 				legend := parser.formatLegend(serie, mqeSerie, queryRef)
 				So(legend, ShouldEqual, "demoapp staples-lab-1 disk.sda3")

From b22881c71742f693874ae4c792c546b78e345298 Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@raintank.io>
Date: Thu, 9 Feb 2017 14:01:53 -0500
Subject: [PATCH 059/301] redirect user to requested url after login via oauth

---
 pkg/api/login_oauth.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 574d08af09f..2bf9c484803 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
@@ -177,5 +178,11 @@ func OAuthLogin(ctx *middleware.Context) {
 
 	metrics.M_Api_Login_OAuth.Inc(1)
 
+	if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
+		ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl+"/")
+		ctx.Redirect(redirectTo)
+		return
+	}
+
 	ctx.Redirect(setting.AppSubUrl + "/")
 }

From 5dd961c0f56f941d30a31b86268644fc3bb8c6df Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 07:39:26 +0100
Subject: [PATCH 060/301] settings: remove commented code

---
 pkg/setting/setting.go | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 9c2ba6ee13c..a5f46170db5 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -455,22 +455,6 @@ func validateStaticRootPath() error {
 	return fmt.Errorf("Failed to detect generated css or javascript files in static root (%s), have you executed default grunt task?", StaticRootPath)
 }
 
-// func readInstanceName() string {
-// 	hostname, _ := os.Hostname()
-// 	if hostname == "" {
-// 		hostname = "hostname_unknown"
-// 	}
-//
-// 	instanceName := Cfg.Section("").Key("instance_name").MustString("")
-// 	if instanceName = "" {
-// 		// set value as it might be used in other places
-// 		Cfg.Section("").Key("instance_name").SetValue(hostname)
-// 		instanceName = hostname
-// 	}
-//
-// 	return
-// }
-
 func NewConfigContext(args *CommandLineArgs) error {
 	setHomePath(args)
 	loadConfiguration(args)

From 38c29d2209508a3bed2e8f25c1c9318e242fa282 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 08:29:44 +0100
Subject: [PATCH 061/301] changelog: adds note about closing #7513

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9207be556e3..6e6464c9bda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 * **SMTP**: Set LocalName to hostname [#7223](https://github.com/grafana/grafana/issues/7223)
 * **Sidemenu**: Disable sign out in sidemenu for AuthProxyEnabled [#7377](https://github.com/grafana/grafana/pull/7377), thx [@solugebefola](https://github.com/solugebefola)
 * **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
+* **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
 
 # 4.1.2 (unreleased)
 

From 6eda5604d2d750af0423f129ef700dc0674730d7 Mon Sep 17 00:00:00 2001
From: Vladimir Kolobaev <kolobaev.v.l@gmail.com>
Date: Fri, 10 Feb 2017 11:31:51 +0400
Subject: [PATCH 062/301] Full metric description (#7493)

graph: add full metric description for graph-legend-alias title
---
 public/app/plugins/panel/graph/legend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js
index cf652950485..fd5abfb2db2 100644
--- a/public/app/plugins/panel/graph/legend.js
+++ b/public/app/plugins/panel/graph/legend.js
@@ -167,7 +167,7 @@ function (angular, _, $) {
             html += '<i class="fa fa-minus pointer" style="color:' + series.color + '"></i>';
             html += '</div>';
 
-            html += '<a class="graph-legend-alias pointer">' + _.escape(series.label) + '</a>';
+            html += '<a class="graph-legend-alias pointer" title="' + _.escape(series.label) + '">' + _.escape(series.label) + '</a>';
 
             if (panel.legend.values) {
               var avg = series.formatValue(series.stats.avg);

From 7bf570532f307f4a61ff24f5a70188e5b69f0b31 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 08:34:48 +0100
Subject: [PATCH 063/301] docs: adds note about closing #7493

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e6464c9bda..8373d237096 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 * **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
+* **Graph**: Add full serie name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
 
 ## Tech
 

From 3d4c3ff00d2cb1378138996e39cacfefe73b6a6b Mon Sep 17 00:00:00 2001
From: xginn8 <xginn8@users.noreply.github.com>
Date: Fri, 10 Feb 2017 02:54:00 -0500
Subject: [PATCH 064/301] return an empty message if table contains no data
 #6109 (#7487)

---
 public/app/plugins/panel/table/module.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/table/module.html b/public/app/plugins/panel/table/module.html
index 8d6f604dc56..9140a182541 100644
--- a/public/app/plugins/panel/table/module.html
+++ b/public/app/plugins/panel/table/module.html
@@ -1,6 +1,7 @@
+
 <div class="table-panel-container">
-	<div class="table-panel-header-bg"></div>
-	<div class="table-panel-scroll">
+        <div class="table-panel-header-bg" ng-show="ctrl.dataRaw.length>0"></div>
+	<div class="table-panel-scroll" ng-show="ctrl.dataRaw.length>0">
 		<table class="table-panel-table">
 			<thead>
 				<tr>
@@ -20,5 +21,10 @@
 		</table>
 	</div>
 </div>
+<div class="datapoints-warning" ng-show="ctrl.dataRaw.length===0">
+          <span class="small" >
+              No datapoints <tip>No datapoints returned from metric query</tip>
+          </span>
+</div>
 <div class="table-panel-footer">
 </div>

From dcf097a8b91f59d1f74dcad6cccabb0d8fe72277 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 08:57:36 +0100
Subject: [PATCH 065/301] changelog: adds note about closing #6109

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8373d237096..18b84f7c1d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 * **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
 * **Graph**: Add full serie name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
+* **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
 
 ## Tech
 

From 0d8cdf0ebebe48d16f5383b64f54a02e0e308761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 10 Feb 2017 08:58:45 +0100
Subject: [PATCH 066/301] docs(): rebrand updates

---
 docs/sources/project/cla.md | 85 -------------------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 docs/sources/project/cla.md

diff --git a/docs/sources/project/cla.md b/docs/sources/project/cla.md
deleted file mode 100644
index 4554300249d..00000000000
--- a/docs/sources/project/cla.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-page_title: Grafana CLA
-page_description: Grafana Contributor License Agreement
-page_keywords: grafana, cla, contribute, documentation
----
-
-# Grafana Contributor License Agreement
-
-## Why is this agreement necessary?
-We very much appreciate your wanting to contribute to Grafana,
-but we need to add you to the contributors list first.
-
-
-Note that the following agreement is not a transfer of copyright ownership,
-this simply is a license agreement for contributions. You also do not change
-your rights to use your own contributions for any other purpose.
-
-
-For some background on why contributor license agreements are necessary,
-you can read FAQs from many other open source projects:
-
-- [Django's excellent CLA FAQ](https://www.djangoproject.com/foundation/cla/faq/)
-- [A well-written chapter from Karl Fogel's Producing Open Source Software on CLAs](http://producingoss.com/en/copyright-assignment.html)
-- [The Wikipedia article on CLAs](http://en.wikipedia.org/wiki/Contributor_license_agreement)
-
-This is part of the legal framework of the open-source ecosystem that adds some red tape,
-but protects both the contributor and the company / foundation behind the project.
-It also gives us the option to relicense the code with a more permissive license in the future.
-
-
-If you have more questions, shoot us an [email](mailto:torkel@grafana.org) or drop by #grafana on IRC (freenode).
-
-Many thanks to [RethinkDB](http://rethinkdb.com) for permission to re-use their CLA!
-
-## Terms of the Agreement
-
-<hr>
-
-This Contributor License Agreement (“Agreement”) is entered into between Coding Instinct AB,
-a Swedish corporation (“Grafana,” “we” or “us” etc.) and you (as defined and further identified below).
-Accordingly, you hereby agree to the following terms for your past, present and future contributions
-submitted to Grafana:
-
-
-**1. Definitions:**
-<strong>(a)</strong> "You" (or "your") shall mean the contribution copyright owner (whether an individual or organization) or legal entity authorized by the copyright owner that is making this Agreement with Grafana.
-
-
-<strong>(b)</strong> "Contribution(s)" shall mean the code, documentation or other original works of authorship, including any modifications or additions to an existing work, submitted by you to Grafana for inclusion in, or documentation of, any of the products or projects owned or managed by Grafana (the "work(s)"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Grafana or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Grafana for the purpose of discussing and/or improving the work, but excluding communication that is conspicuously marked or otherwise designated in writing by you as "Not a Contribution."
-
-**2. Grant of Copyright License.**
-You hereby grant to Grafana and to recipients of software distributed by Grafana a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works.
-
-
-**3. Grant of Patent License.**
-With respect to any patents you own, or that you can license without payment to any third party, you hereby grant Grafana a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free license to: (i) make, have made, use, sell, offer to sell, import, and otherwise distribute and exploit your contributions in whole or in part, alone or in combination with or included in any product, work or materials arising out of or relating to the Works to which your contributions were submitted; and (ii) sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements.
-
-
-**4. Rights.**
-Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under this agreement are effective on the date you first submitted a contribution to us, even if your submission took place before the date you entered this agreement.
-
-
-**5. You represent and warrant that:**
-<strong>(i)</strong> the contributions are an original work and that you can legally grant the rights set out in this agreement;
-
-
-<strong>(ii)</strong> the contributions and Grafana’s exercise of any license rights granted hereunder, does not and will not, infringe the rights of any third party;
-
-
-<strong>(iii)</strong> you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions, including without limitation any claims or allegations that any or all of the contributions infringes, violates, or misappropriate the intellectual property rights of any third party (you further agree that you will notify Grafana immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges).
-
-
-**6. Employer Rights.**
-If your employer(s) has rights to intellectual property that you create that includes your contributions, you represent and warrant that your employer has waived such rights for your contributions to Grafana, or that you have received permission to make contributions on behalf of that employer and that you are authorized to execute this agreement on behalf of your employer.
-
-
-**7. Support.**
-You are not expected to provide support for your contributions, except to the extent you desire to provide support. You may provide support for free, for a fee, or not at all. Except as set forth herein, and unless required by applicable law or agreed to in writing, you provide your contributions on an "as is" basis, without warranties or conditions of any kind.
-
-
-**8. Enforcement.**
-The failure of either party to enforce its rights under this agreement for any period shall not be construed as a waiver of such rights. No changes or modifications or waivers to this Agreement will be effective unless in writing and signed by both parties. In the event that any provision of this agreement shall be determined to be illegal or unenforceable, that provision will be limited or eliminated to the minimum extent necessary so that this agreement shall otherwise remain in full force and effect and enforceable. This agreement shall be governed by and construed in accordance with the laws of the State of California in the United States without regard to the conflicts of laws provisions thereof. In any action or proceeding to enforce rights under this agreement, the prevailing party will be entitled to recover costs and attorneys’ fees.
-
-
-<iframe src="https://docs.google.com/forms/d/1iagLZBotC4IIrz7TXvEdPU5tCtFDk__C5Rs92afXpCE/viewform?embedded=true" width="800" height="820" frameborder="0" marginheight="0" marginwidth="0">Loading CLA...</iframe>
\ No newline at end of file

From 1e26a8e68acab4afe7fc919d6afb82a32832ab98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 10 Feb 2017 08:58:53 +0100
Subject: [PATCH 067/301] docs(): rebrand updates

---
 docs/sources/project/index.md   | 7 +++++++
 docs/sources/reference/index.md | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 docs/sources/project/index.md
 create mode 100644 docs/sources/reference/index.md

diff --git a/docs/sources/project/index.md b/docs/sources/project/index.md
new file mode 100644
index 00000000000..61c7604dcb5
--- /dev/null
+++ b/docs/sources/project/index.md
@@ -0,0 +1,7 @@
+---
+title: the grafana project
+description: grafana project
+type: docs
+---
+
+# Welcome to the grafana project
diff --git a/docs/sources/reference/index.md b/docs/sources/reference/index.md
new file mode 100644
index 00000000000..aaaabe89b4b
--- /dev/null
+++ b/docs/sources/reference/index.md
@@ -0,0 +1,7 @@
+---
+title: Reference Index
+description: Grafana docs reference
+type: docs
+---
+
+# Documentation

From 8083079eeaa0e0cd6faeafeadca077849d095c94 Mon Sep 17 00:00:00 2001
From: Vladimir Kolobaev <kolobaev.v.l@gmail.com>
Date: Fri, 10 Feb 2017 13:11:39 +0400
Subject: [PATCH 068/301] graph: set max width for legend tables.

ref #2385
---
 public/sass/components/_panel_graph.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss
index 7b44c29f8fa..179049ea220 100644
--- a/public/sass/components/_panel_graph.scss
+++ b/public/sass/components/_panel_graph.scss
@@ -133,6 +133,9 @@
     padding-left: 7px;
     text-align: left;
     width: 95%;
+    max-width: 650px;
+    text-overflow: ellipsis;
+    overflow: hidden;
   }
 
   .graph-legend-series:nth-child(odd) {
@@ -264,7 +267,10 @@
   .graph-tooltip-series-name {
     display: table-cell;
     padding: 0.15rem;
-  }
+    max-width: 650px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+   }
 
   .graph-tooltip-value {
     display: table-cell;

From 900230890f5b2a5fcbe374d29aecb196231a48b3 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 10:15:03 +0100
Subject: [PATCH 069/301] changelog: adds note about closing #2385

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18b84f7c1d5..0688790df2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,9 @@
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 * **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
-* **Graph**: Add full serie name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
+* **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
 * **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
+* **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
 
 ## Tech
 

From 1294b203e69976978402cccdfb3c5ccd7c6ddd74 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Feb 2017 14:20:07 +0100
Subject: [PATCH 070/301] admin: adds paging to global user list

Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.

Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.

Fixes #7469
---
 pkg/api/api.go                                |   3 +-
 pkg/api/datasources.go                        |   8 +-
 pkg/api/datasources_test.go                   |  31 ++++-
 pkg/api/user.go                               |  36 +++++-
 pkg/api/user_test.go                          | 109 ++++++++++++++++++
 pkg/models/user.go                            |   9 +-
 pkg/services/sqlstore/org_test.go             |   4 +-
 pkg/services/sqlstore/user.go                 |  15 ++-
 pkg/services/sqlstore/user_test.go            |  45 ++++++++
 public/app/core/routes/routes.ts              |   1 +
 public/app/features/admin/admin.ts            |   3 +-
 .../app/features/admin/adminListUsersCtrl.js  |  38 ------
 .../features/admin/admin_list_users_ctrl.ts   |  49 ++++++++
 public/app/features/admin/partials/users.html |  97 +++++++++-------
 public/sass/pages/_admin.scss                 |  12 ++
 15 files changed, 360 insertions(+), 100 deletions(-)
 create mode 100644 pkg/api/user_test.go
 create mode 100644 pkg/services/sqlstore/user_test.go
 delete mode 100644 public/app/features/admin/adminListUsersCtrl.js
 create mode 100644 public/app/features/admin/admin_list_users_ctrl.ts

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 7d3a5563892..2698a2fc001 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -123,6 +123,7 @@ func (hs *HttpServer) registerRoutes() {
 		// users (admin permission required)
 		r.Group("/users", func() {
 			r.Get("/", wrap(SearchUsers))
+			r.Get("/search", wrap(SearchUsersWithPaging))
 			r.Get("/:id", wrap(GetUserById))
 			r.Get("/:id/orgs", wrap(GetUserOrgList))
 			// query parameters /users/lookup?loginOrEmail=admin@example.com
@@ -195,7 +196,7 @@ func (hs *HttpServer) registerRoutes() {
 
 		// Data sources
 		r.Group("/datasources", func() {
-			r.Get("/", GetDataSources)
+			r.Get("/", wrap(GetDataSources))
 			r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
 			r.Delete("/:id", DeleteDataSource)
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 43f4d308ed6..54656d70e5d 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -11,12 +11,11 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-func GetDataSources(c *middleware.Context) {
+func GetDataSources(c *middleware.Context) Response {
 	query := m.GetDataSourcesQuery{OrgId: c.OrgId}
 
 	if err := bus.Dispatch(&query); err != nil {
-		c.JsonApiErr(500, "Failed to query datasources", err)
-		return
+		return ApiError(500, "Failed to query datasources", err)
 	}
 
 	result := make(dtos.DataSourceList, 0)
@@ -46,7 +45,8 @@ func GetDataSources(c *middleware.Context) {
 	}
 
 	sort.Sort(result)
-	c.JSON(200, result)
+
+	return Json(200, &result)
 }
 
 func GetDataSourceById(c *middleware.Context) Response {
diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index aa3f6106afd..5ae752bea91 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -59,7 +59,9 @@ func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
 	Convey(desc+" "+url, func() {
 		defer bus.ClearBusHandlers()
 
-		sc := &scenarioContext{}
+		sc := &scenarioContext{
+			url: url,
+		}
 		viewsPath, _ := filepath.Abs("../../public/views")
 
 		sc.m = macaron.New()
@@ -71,16 +73,18 @@ func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
 		sc.m.Use(middleware.GetContextHandler())
 		sc.m.Use(middleware.Sessioner(&session.Options{}))
 
-		sc.defaultHandler = func(c *middleware.Context) {
+		sc.defaultHandler = wrap(func(c *middleware.Context) Response {
 			sc.context = c
 			sc.context.UserId = TestUserID
 			sc.context.OrgId = TestOrgID
 			sc.context.OrgRole = models.ROLE_EDITOR
 			if sc.handlerFunc != nil {
-				sc.handlerFunc(sc.context)
+				return sc.handlerFunc(sc.context)
 			}
-		}
-		sc.m.SetAutoHead(true)
+
+			return nil
+		})
+
 		sc.m.Get(url, sc.defaultHandler)
 
 		fn(sc)
@@ -96,6 +100,20 @@ func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
 	return sc
 }
 
+func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
+	sc.resp = httptest.NewRecorder()
+	req, err := http.NewRequest(method, url, nil)
+	q := req.URL.Query()
+	for k, v := range queryParams {
+		q.Add(k, v)
+	}
+	req.URL.RawQuery = q.Encode()
+	So(err, ShouldBeNil)
+	sc.req = req
+
+	return sc
+}
+
 type scenarioContext struct {
 	m              *macaron.Macaron
 	context        *middleware.Context
@@ -103,6 +121,7 @@ type scenarioContext struct {
 	handlerFunc    handlerFunc
 	defaultHandler macaron.Handler
 	req            *http.Request
+	url            string
 }
 
 func (sc *scenarioContext) exec() {
@@ -110,4 +129,4 @@ func (sc *scenarioContext) exec() {
 }
 
 type scenarioFunc func(c *scenarioContext)
-type handlerFunc func(c *middleware.Context)
+type handlerFunc func(c *middleware.Context) Response
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 7bce599d692..9a978503761 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -210,14 +210,46 @@ func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand)
 
 // GET /api/users
 func SearchUsers(c *middleware.Context) Response {
-	query := m.SearchUsersQuery{Query: "", Page: 0, Limit: 1000}
-	if err := bus.Dispatch(&query); err != nil {
+	query, err := searchUser(c)
+	if err != nil {
+		return ApiError(500, "Failed to fetch users", err)
+	}
+
+	return Json(200, query.Result.Users)
+}
+
+// GET /api/paged-users
+func SearchUsersWithPaging(c *middleware.Context) Response {
+	query, err := searchUser(c)
+	if err != nil {
 		return ApiError(500, "Failed to fetch users", err)
 	}
 
 	return Json(200, query.Result)
 }
 
+func searchUser(c *middleware.Context) (*m.SearchUsersQuery, error) {
+	perPage := c.QueryInt("perpage")
+	if perPage <= 0 {
+		perPage = 1000
+	}
+	page := c.QueryInt("page")
+
+	if page < 1 {
+		page = 1
+	}
+
+	query := &m.SearchUsersQuery{Query: "", Page: page, Limit: perPage}
+	if err := bus.Dispatch(query); err != nil {
+		return nil, err
+	}
+
+	query.Result.Page = page
+	query.Result.PerPage = perPage
+
+	return query, nil
+}
+
 func SetHelpFlag(c *middleware.Context) Response {
 	flag := c.ParamsInt64(":id")
 
diff --git a/pkg/api/user_test.go b/pkg/api/user_test.go
new file mode 100644
index 00000000000..6aa9dd9adbf
--- /dev/null
+++ b/pkg/api/user_test.go
@@ -0,0 +1,109 @@
+package api
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/models"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUserApiEndpoint(t *testing.T) {
+	Convey("Given a user is logged in", t, func() {
+		mockResult := models.SearchUserQueryResult{
+			Users: []*models.UserSearchHitDTO{
+				{Name: "user1"},
+				{Name: "user2"},
+			},
+			TotalCount: 2,
+		}
+
+		loggedInUserScenario("When calling GET on", "/api/users", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsers
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+			So(sentLimit, ShouldEqual, 1000)
+			So(sendPage, ShouldEqual, 1)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+			So(len(respJSON.MustArray()), ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET with page and limit querystring parameters on", "/api/users", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsers
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
+
+			So(sentLimit, ShouldEqual, 10)
+			So(sendPage, ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET on", "/api/users/search", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsersWithPaging
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+			So(sentLimit, ShouldEqual, 1000)
+			So(sendPage, ShouldEqual, 1)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+
+			So(respJSON.Get("totalCount").MustInt(), ShouldEqual, 2)
+			So(len(respJSON.Get("users").MustArray()), ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET with page and perpage querystring parameters on", "/api/users/search", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsersWithPaging
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
+
+			So(sentLimit, ShouldEqual, 10)
+			So(sendPage, ShouldEqual, 2)
+		})
+	})
+}
diff --git a/pkg/models/user.go b/pkg/models/user.go
index e14f4486ba3..e0a36be8c0a 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -130,7 +130,14 @@ type SearchUsersQuery struct {
 	Page  int
 	Limit int
 
-	Result []*UserSearchHitDTO
+	Result SearchUserQueryResult
+}
+
+type SearchUserQueryResult struct {
+	TotalCount int64               `json:"totalCount"`
+	Users      []*UserSearchHitDTO `json:"users"`
+	Page       int                 `json:"page"`
+	PerPage    int                 `json:"perPage"`
 }
 
 type GetUserOrgListQuery struct {
diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go
index f52175c2e5c..e7c718fc9a8 100644
--- a/pkg/services/sqlstore/org_test.go
+++ b/pkg/services/sqlstore/org_test.go
@@ -63,8 +63,8 @@ func TestAccountDataAccess(t *testing.T) {
 				err := SearchUsers(&query)
 
 				So(err, ShouldBeNil)
-				So(query.Result[0].Email, ShouldEqual, "ac1@test.com")
-				So(query.Result[1].Email, ShouldEqual, "ac2@test.com")
+				So(query.Result.Users[0].Email, ShouldEqual, "ac1@test.com")
+				So(query.Result.Users[1].Email, ShouldEqual, "ac2@test.com")
 			})
 
 			Convey("Given an added org user", func() {
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index b26a9153f55..791a38f2d01 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -344,12 +344,21 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
 }
 
 func SearchUsers(query *m.SearchUsersQuery) error {
-	query.Result = make([]*m.UserSearchHitDTO, 0)
+	query.Result = m.SearchUserQueryResult{
+		Users: make([]*m.UserSearchHitDTO, 0),
+	}
 	sess := x.Table("user")
 	sess.Where("email LIKE ?", query.Query+"%")
-	sess.Limit(query.Limit, query.Limit*query.Page)
+	offset := query.Limit * (query.Page - 1)
+	sess.Limit(query.Limit, offset)
 	sess.Cols("id", "email", "name", "login", "is_admin")
-	err := sess.Find(&query.Result)
+	if err := sess.Find(&query.Result.Users); err != nil {
+		return err
+	}
+
+	user := m.User{}
+	count, err := x.Count(&user)
+	query.Result.TotalCount = count
 	return err
 }
 
diff --git a/pkg/services/sqlstore/user_test.go b/pkg/services/sqlstore/user_test.go
new file mode 100644
index 00000000000..53a50f9631c
--- /dev/null
+++ b/pkg/services/sqlstore/user_test.go
@@ -0,0 +1,45 @@
+package sqlstore
+
+import (
+	"fmt"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	"github.com/grafana/grafana/pkg/models"
+)
+
+func TestUserDataAccess(t *testing.T) {
+
+	Convey("Testing DB", t, func() {
+		InitTestDB(t)
+
+		var err error
+		for i := 0; i < 5; i++ {
+			err = CreateUser(&models.CreateUserCommand{
+				Email: fmt.Sprint("user", i, "@test.com"),
+				Name:  fmt.Sprint("user", i),
+				Login: fmt.Sprint("user", i),
+			})
+			So(err, ShouldBeNil)
+		}
+
+		Convey("Can return the first page of users and a total count", func() {
+			query := models.SearchUsersQuery{Query: "", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 3)
+			So(query.Result.TotalCount, ShouldEqual, 5)
+		})
+
+		Convey("Can return the second page of users and a total count", func() {
+			query := models.SearchUsersQuery{Query: "", Page: 2, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 2)
+			So(query.Result.TotalCount, ShouldEqual, 5)
+		})
+	})
+}
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index 28e1dcf1cd1..3ccf89bae01 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -113,6 +113,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
   .when('/admin/users', {
     templateUrl: 'public/app/features/admin/partials/users.html',
     controller : 'AdminListUsersCtrl',
+    controllerAs: 'ctrl',
     resolve: loadAdminBundle,
   })
   .when('/admin/users/create', {
diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts
index b93fd07a059..6809e4c54ab 100644
--- a/public/app/features/admin/admin.ts
+++ b/public/app/features/admin/admin.ts
@@ -1,4 +1,4 @@
-import  './adminListUsersCtrl';
+import  AdminListUsersCtrl from './admin_list_users_ctrl';
 import  './adminListOrgsCtrl';
 import  './adminEditOrgCtrl';
 import  './adminEditUserCtrl';
@@ -37,3 +37,4 @@ export class AdminStatsCtrl {
 coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl);
 coreModule.controller('AdminHomeCtrl', AdminHomeCtrl);
 coreModule.controller('AdminStatsCtrl', AdminStatsCtrl);
+coreModule.controller('AdminListUsersCtrl', AdminListUsersCtrl);
diff --git a/public/app/features/admin/adminListUsersCtrl.js b/public/app/features/admin/adminListUsersCtrl.js
deleted file mode 100644
index 721adcfb98c..00000000000
--- a/public/app/features/admin/adminListUsersCtrl.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
-
-  var module = angular.module('grafana.controllers');
-
-  module.controller('AdminListUsersCtrl', function($scope, backendSrv) {
-
-    $scope.init = function() {
-      $scope.getUsers();
-    };
-
-    $scope.getUsers = function() {
-      backendSrv.get('/api/users').then(function(users) {
-        $scope.users = users;
-      });
-    };
-
-    $scope.deleteUser = function(user) {
-      $scope.appEvent('confirm-modal', {
-        title: 'Delete',
-        text: 'Do you want to delete ' + user.login + '?',
-        icon: 'fa-trash',
-        yesText: 'Delete',
-        onConfirm: function() {
-          backendSrv.delete('/api/admin/users/' + user.id).then(function() {
-            $scope.getUsers();
-          });
-        }
-      });
-    };
-
-    $scope.init();
-
-  });
-});
diff --git a/public/app/features/admin/admin_list_users_ctrl.ts b/public/app/features/admin/admin_list_users_ctrl.ts
new file mode 100644
index 00000000000..1347457bc06
--- /dev/null
+++ b/public/app/features/admin/admin_list_users_ctrl.ts
@@ -0,0 +1,49 @@
+///<reference path="../../headers/common.d.ts" />
+
+export default class AdminListUsersCtrl {
+  users: any;
+  pages = [];
+  perPage = 1000;
+  page = 1;
+  totalPages: number;
+  showPaging = false;
+
+  /** @ngInject */
+  constructor(private $scope, private backendSrv) {
+    this.getUsers();
+  }
+
+  getUsers() {
+    this.backendSrv.get(`/api/users/search?perpage=${this.perPage}&page=${this.page}`).then((result) => {
+      this.users = result.users;
+      this.page = result.page;
+      this.perPage = result.perPage;
+      this.totalPages = Math.ceil(result.totalCount / result.perPage);
+      this.showPaging = this.totalPages > 1;
+      this.pages = [];
+
+      for (var i = 1; i < this.totalPages+1; i++) {
+        this.pages.push({ page: i, current: i === this.page});
+      }
+    });
+  }
+
+  navigateToPage(page) {
+    this.page = page.page;
+    this.getUsers();
+  }
+
+  deleteUser(user) {
+    this.$scope.appEvent('confirm-modal', {
+      title: 'Delete',
+      text: 'Do you want to delete ' + user.login + '?',
+      icon: 'fa-trash',
+      yesText: 'Delete',
+      onConfirm: () => {
+        this.backendSrv.delete('/api/admin/users/' + user.id).then(() => {
+          this.getUsers();
+        });
+      }
+    });
+  }
+}
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index a1c86391088..57714380c67 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -1,49 +1,62 @@
 <navbar icon="fa fa-fw fa-cogs" title="Admin" title-url="admin">
-	<a href="admin/users" class="navbar-page-btn">
-		<i class="icon-gf icon-gf-users"></i>
-		Users
-	</a>
+  <a href="admin/users" class="navbar-page-btn">
+    <i class="icon-gf icon-gf-users"></i>
+    Users
+  </a>
 </navbar>
 
 <div class="page-container">
-	<div class="page-header">
-		<h1>Users</h1>
+  <div class="page-header">
+    <h1>Users</h1>
 
-		<a class="btn btn-success" href="admin/users/create">
-			<i class="fa fa-plus"></i>
-			Add new user
-		</a>
-	</div>
+    <a class="btn btn-success" href="admin/users/create">
+      <i class="fa fa-plus"></i>
+      Add new user
+    </a>
+  </div>
+  <div class="admin-list-table">
+    <table class="filter-table form-inline">
+      <thead>
+        <tr>
+          <th>Id</th>
+          <th>Name</th>
+          <th>Login</th>
+          <th>Email</th>
+          <th style="white-space: nowrap">Grafana Admin</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr ng-repeat="user in ctrl.users">
+          <td>{{user.id}}</td>
+          <td>{{user.name}}</td>
+          <td>{{user.login}}</td>
+          <td>{{user.email}}</td>
+          <td>{{user.isAdmin}}</td>
+          <td class="text-right">
+            <a href="admin/users/edit/{{user.id}}" class="btn btn-inverse btn-small">
+              <i class="fa fa-edit"></i>
+              Edit
+            </a>
+            &nbsp;&nbsp;
+            <a ng-click="ctrl.deleteUser(user)" class="btn btn-danger btn-small">
+              <i class="fa fa-remove"></i>
+            </a>
+          </td>
+        </tr>
+      </tbody>
 
-	<table class="filter-table form-inline">
-		<thead>
-			<tr>
-				<th>Id</th>
-				<th>Name</th>
-				<th>Login</th>
-				<th>Email</th>
-				<th style="white-space: nowrap">Grafana Admin</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr ng-repeat="user in users">
-				<td>{{user.id}}</td>
-				<td>{{user.name}}</td>
-				<td>{{user.login}}</td>
-				<td>{{user.email}}</td>
-				<td>{{user.isAdmin}}</td>
-				<td class="text-right">
-					<a href="admin/users/edit/{{user.id}}" class="btn btn-inverse btn-small">
-						<i class="fa fa-edit"></i>
-						Edit
-					</a>
-					&nbsp;&nbsp;
-					<a ng-click="deleteUser(user)" class="btn btn-danger btn-small">
-						<i class="fa fa-remove"></i>
-					</a>
-				</td>
-			</tr>
-		</tbody>
-	</table>
+    </table>
+  </div>
+
+  <div class="admin-list-paging" ng-if="ctrl.showPaging">
+    <ol>
+      <li ng-repeat="page in ctrl.pages">
+        <button
+          class="btn btn-small"
+          ng-class="{'btn-secondary': page.current, 'btn-inverse': !page.current}"
+          ng-click="ctrl.navigateToPage(page)">{{page.page}}</button>
+      </li>
+    </ol>
+  </div>
 </div>
diff --git a/public/sass/pages/_admin.scss b/public/sass/pages/_admin.scss
index 30bc3ca8b34..b2be062849d 100644
--- a/public/sass/pages/_admin.scss
+++ b/public/sass/pages/_admin.scss
@@ -8,3 +8,15 @@ td.admin-settings-key {
   padding-left: 20px;
 }
 
+.admin-list-table {
+  margin-bottom: 20px;
+}
+
+.admin-list-paging {
+  float: right;
+  li {
+    display: inline-block;
+    padding-left: 10px;
+    margin-bottom: 5px;
+  }
+}

From 3c7cf3f7282baceb061744846d8aa584a0eea079 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 14:42:19 +0100
Subject: [PATCH 071/301] docs: kairosdb is no longer supported by default

---
 docs/sources/guides/getting_started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md
index dde8283e79d..d4ead7d8577 100644
--- a/docs/sources/guides/getting_started.md
+++ b/docs/sources/guides/getting_started.md
@@ -38,7 +38,7 @@ The image above shows you the top header for a Dashboard.
 
 ## Dashboards, Panels, Rows, the building blocks of Grafana...
 
-Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, and KairosDB). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
+Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, Prometheus and Cloudwatch). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
 
 
 ## Adding & Editing Graphs and Panels

From 28d93b574d7018f1099ffc3b8a7ac137d532c4ca Mon Sep 17 00:00:00 2001
From: huydx <doxuanhuy@gmail.com>
Date: Fri, 10 Feb 2017 12:31:55 +0900
Subject: [PATCH 072/301] (feat) support max connection setting for database
 configuration

---
 conf/defaults.ini                 |  5 +++++
 pkg/services/sqlstore/sqlstore.go | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 358847724ab..4606de9212e 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -73,6 +73,11 @@ password =
 # Example: mysql://user:secret@host:port/database
 url =
 
+# Max conn setting default is 0 (mean not set)
+max_conn =
+max_idle_conn =
+max_open_conn =
+
 # For "postgres", use either "disable", "require" or "verify-full"
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 5c44fe85f50..0d16d57bcde 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -29,6 +29,9 @@ type DatabaseConfig struct {
 	ClientKeyPath                              string
 	ClientCertPath                             string
 	ServerCertName                             string
+	MaxConn                                    int
+	MaxOpenConn                                int
+	MaxIdleConn                                int
 }
 
 var (
@@ -150,7 +153,15 @@ func getEngine() (*xorm.Engine, error) {
 	}
 
 	sqlog.Info("Initializing DB", "dbtype", DbCfg.Type)
-	return xorm.NewEngine(DbCfg.Type, cnnstr)
+	engine, err := xorm.NewEngine(DbCfg.Type, cnnstr)
+	if err != nil {
+		return nil, err
+	} else {
+		engine.SetMaxConns(DbCfg.MaxConn)
+		engine.SetMaxOpenConns(DbCfg.MaxOpenConn)
+		engine.SetMaxIdleConns(DbCfg.MaxIdleConn)
+	}
+	return engine, nil
 }
 
 func LoadConfig() {
@@ -177,6 +188,9 @@ func LoadConfig() {
 		DbCfg.Host = sec.Key("host").String()
 		DbCfg.Name = sec.Key("name").String()
 		DbCfg.User = sec.Key("user").String()
+		DbCfg.MaxConn = sec.Key("max_conn").MustInt(0)
+		DbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
+		DbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(0)
 		if len(DbCfg.Pwd) == 0 {
 			DbCfg.Pwd = sec.Key("password").String()
 		}

From 5b7b3fef647379e25de3fc10056082dbb0391886 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 15:29:43 +0100
Subject: [PATCH 073/301] conf: adds sample values for db conn settings

---
 conf/sample.ini | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/conf/sample.ini b/conf/sample.ini
index ce9344e1d4f..eaedfcc6f5e 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -82,6 +82,12 @@
 # For "sqlite3" only, path relative to data_path setting
 ;path = grafana.db
 
+# Max conn setting default is 0 (mean not set)
+;max_conn =
+;max_idle_conn =
+;max_open_conn =
+
+
 #################################### Session ####################################
 [session]
 # Either "memory", "file", "redis", "mysql", "postgres", default is "file"

From 143cbe921fb072785165872ed81fed381bb4347a Mon Sep 17 00:00:00 2001
From: huydx <doxuanhuy@gmail.com>
Date: Fri, 10 Feb 2017 11:11:36 +0900
Subject: [PATCH 074/301] (feat) support datasource delete by name api

---
 pkg/api/api.go                           |  3 ++-
 pkg/api/datasources.go                   | 23 +++++++++++++++++++++--
 pkg/models/datasource.go                 |  7 ++++++-
 pkg/services/sqlstore/datasource.go      | 13 +++++++++++--
 pkg/services/sqlstore/datasource_test.go | 14 +++++++++++---
 5 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 7d3a5563892..d9fee8a0187 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -198,7 +198,8 @@ func (hs *HttpServer) registerRoutes() {
 			r.Get("/", GetDataSources)
 			r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
-			r.Delete("/:id", DeleteDataSource)
+			r.Delete("/:id", DeleteDataSourceById)
+			r.Delete("/name/:name", DeleteDataSourceByName)
 			r.Get("/:id", wrap(GetDataSourceById))
 			r.Get("/name/:name", wrap(GetDataSourceByName))
 		}, reqOrgAdmin)
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 43f4d308ed6..455195aacb0 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -68,7 +68,7 @@ func GetDataSourceById(c *middleware.Context) Response {
 	return Json(200, &dtos)
 }
 
-func DeleteDataSource(c *middleware.Context) {
+func DeleteDataSourceById(c *middleware.Context) {
 	id := c.ParamsInt64(":id")
 
 	if id <= 0 {
@@ -76,7 +76,26 @@ func DeleteDataSource(c *middleware.Context) {
 		return
 	}
 
-	cmd := &m.DeleteDataSourceCommand{Id: id, OrgId: c.OrgId}
+	cmd := &m.DeleteDataSourceByIdCommand{Id: id, OrgId: c.OrgId}
+
+	err := bus.Dispatch(cmd)
+	if err != nil {
+		c.JsonApiErr(500, "Failed to delete datasource", err)
+		return
+	}
+
+	c.JsonOK("Data source deleted")
+}
+
+func DeleteDataSourceByName(c *middleware.Context) {
+	name := c.Params(":name")
+
+	if name == "" {
+		c.JsonApiErr(400, "Missing valid datasource name", nil)
+		return
+	}
+
+	cmd := &m.DeleteDataSourceByNameCommand{Name: name, OrgId: c.OrgId}
 
 	err := bus.Dispatch(cmd)
 	if err != nil {
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index 4a90edd9bfd..804880a5d10 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -120,11 +120,16 @@ type UpdateDataSourceCommand struct {
 	Id    int64 `json:"-"`
 }
 
-type DeleteDataSourceCommand struct {
+type DeleteDataSourceByIdCommand struct {
 	Id    int64
 	OrgId int64
 }
 
+type DeleteDataSourceByNameCommand struct {
+	Name  string
+	OrgId int64
+}
+
 // ---------------------
 // QUERIES
 
diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go
index 57abaf35083..de838163681 100644
--- a/pkg/services/sqlstore/datasource.go
+++ b/pkg/services/sqlstore/datasource.go
@@ -13,7 +13,8 @@ import (
 func init() {
 	bus.AddHandler("sql", GetDataSources)
 	bus.AddHandler("sql", AddDataSource)
-	bus.AddHandler("sql", DeleteDataSource)
+	bus.AddHandler("sql", DeleteDataSourceById)
+	bus.AddHandler("sql", DeleteDataSourceByName)
 	bus.AddHandler("sql", UpdateDataSource)
 	bus.AddHandler("sql", GetDataSourceById)
 	bus.AddHandler("sql", GetDataSourceByName)
@@ -50,7 +51,7 @@ func GetDataSources(query *m.GetDataSourcesQuery) error {
 	return sess.Find(&query.Result)
 }
 
-func DeleteDataSource(cmd *m.DeleteDataSourceCommand) error {
+func DeleteDataSourceById(cmd *m.DeleteDataSourceByIdCommand) error {
 	return inTransaction(func(sess *xorm.Session) error {
 		var rawSql = "DELETE FROM data_source WHERE id=? and org_id=?"
 		_, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId)
@@ -58,6 +59,14 @@ func DeleteDataSource(cmd *m.DeleteDataSourceCommand) error {
 	})
 }
 
+func DeleteDataSourceByName(cmd *m.DeleteDataSourceByNameCommand) error {
+	return inTransaction(func(sess *xorm.Session) error {
+		var rawSql = "DELETE FROM data_source WHERE name=? and org_id=?"
+		_, err := sess.Exec(rawSql, cmd.Name, cmd.OrgId)
+		return err
+	})
+}
+
 func AddDataSource(cmd *m.AddDataSourceCommand) error {
 
 	return inTransaction(func(sess *xorm.Session) error {
diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go
index 35752eeaafc..2749a3cc426 100644
--- a/pkg/services/sqlstore/datasource_test.go
+++ b/pkg/services/sqlstore/datasource_test.go
@@ -79,8 +79,16 @@ func TestDataAccess(t *testing.T) {
 
 			ds := query.Result[0]
 
-			Convey("Can delete datasource", func() {
-				err := DeleteDataSource(&m.DeleteDataSourceCommand{Id: ds.Id, OrgId: ds.OrgId})
+			Convey("Can delete datasource by id", func() {
+				err := DeleteDataSourceById(&m.DeleteDataSourceByIdCommand{Id: ds.Id, OrgId: ds.OrgId})
+				So(err, ShouldBeNil)
+
+				GetDataSources(&query)
+				So(len(query.Result), ShouldEqual, 0)
+			})
+
+			Convey("Can delete datasource by name", func() {
+				err := DeleteDataSourceByName(&m.DeleteDataSourceByNameCommand{Name: ds.Name, OrgId: ds.OrgId})
 				So(err, ShouldBeNil)
 
 				GetDataSources(&query)
@@ -88,7 +96,7 @@ func TestDataAccess(t *testing.T) {
 			})
 
 			Convey("Can not delete datasource with wrong orgId", func() {
-				err := DeleteDataSource(&m.DeleteDataSourceCommand{Id: ds.Id, OrgId: 123123})
+				err := DeleteDataSourceById(&m.DeleteDataSourceByIdCommand{Id: ds.Id, OrgId: 123123})
 				So(err, ShouldBeNil)
 
 				GetDataSources(&query)

From e80f67326424a085f21b029a42eaa82de6b95c0f Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 10 Feb 2017 15:56:28 +0100
Subject: [PATCH 075/301] changelog: adds note about closing issues

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0688790df2e..7b515930a4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 * **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
 * **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
 * **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
+* **Database**: Allow max db connection pool configuration [#7427](https://github.com/grafana/grafana/issues/7427), thx [@huydx](https://github.com/huydx)
+* **Datasources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
 
 ## Tech
 

From f069aae5763e3f0779c3af9148c78f8f79174d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 25 Dec 2016 20:57:08 +0000
Subject: [PATCH 076/301] Add Pushover alert notifications

Pushover is a service for getting real-time
notifications on your mobile devices and desktop
computers: https://pushover.net
---
 pkg/metrics/metrics.go                        |   2 +
 pkg/services/alerting/notifiers/pushover.go   | 177 ++++++++++++++++++
 .../alerting/notifiers/pushover_test.go       |  58 ++++++
 .../app/features/alerting/alert_tab_ctrl.ts   |   1 +
 4 files changed, 238 insertions(+)
 create mode 100644 pkg/services/alerting/notifiers/pushover.go
 create mode 100644 pkg/services/alerting/notifiers/pushover_test.go

diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index 1020f28f874..e60a967f3fa 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -50,6 +50,7 @@ var (
 	M_Alerting_Notification_Sent_OpsGenie  Counter
 	M_Alerting_Notification_Sent_Telegram  Counter
 	M_Alerting_Notification_Sent_Sensu     Counter
+	M_Alerting_Notification_Sent_Pushover  Counter
 	M_Aws_CloudWatch_GetMetricStatistics   Counter
 	M_Aws_CloudWatch_ListMetrics           Counter
 
@@ -120,6 +121,7 @@ func initMetricVars(settings *MetricSettings) {
 	M_Alerting_Notification_Sent_Telegram = RegCounter("alerting.notifications_sent", "type", "telegram")
 	M_Alerting_Notification_Sent_Sensu = RegCounter("alerting.notifications_sent", "type", "sensu")
 	M_Alerting_Notification_Sent_LINE = RegCounter("alerting.notifications_sent", "type", "LINE")
+	M_Alerting_Notification_Sent_Pushover = RegCounter("alerting.notifications_sent", "type", "pushover")
 
 	M_Aws_CloudWatch_GetMetricStatistics = RegCounter("aws.cloudwatch.get_metric_statistics")
 	M_Aws_CloudWatch_ListMetrics = RegCounter("aws.cloudwatch.list_metrics")
diff --git a/pkg/services/alerting/notifiers/pushover.go b/pkg/services/alerting/notifiers/pushover.go
new file mode 100644
index 00000000000..c68ad421c62
--- /dev/null
+++ b/pkg/services/alerting/notifiers/pushover.go
@@ -0,0 +1,177 @@
+package notifiers
+
+import (
+	"fmt"
+	"net/url"
+	"strconv"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/metrics"
+	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/alerting"
+)
+
+const PUSHOVER_ENDPOINT = "https://api.pushover.net/1/messages.json"
+
+func init() {
+	alerting.RegisterNotifier(&alerting.NotifierPlugin{
+		Type:        "pushover",
+		Name:        "Pushover",
+		Description: "Sends HTTP POST request to the Pushover API",
+		Factory:     NewPushoverNotifier,
+		OptionsTemplate: `
+      <h3 class="page-heading">Pushover settings</h3>
+      <div class="gf-form">
+        <span class="gf-form-label width-10">API Token</span>
+        <input type="text" class="gf-form-input" required placeholder="Application token" ng-model="ctrl.model.settings.apiToken"></input>
+      </div>
+      <div class="gf-form">
+        <span class="gf-form-label width-10">User key(s)</span>
+        <input type="text" class="gf-form-input" required placeholder="comma-separated list" ng-model="ctrl.model.settings.userKey"></input>
+      </div>
+      <div class="gf-form">
+        <span class="gf-form-label width-10">Device(s) (optional)</span>
+        <input type="text" class="gf-form-input" placeholder="comma-separated list; leave empty to send to all devices" ng-model="ctrl.model.settings.device"></input>
+      </div>
+      <div class="gf-form">
+        <span class="gf-form-label width-10">Priority</span>
+        <select class="gf-form-input max-width-14" ng-model="ctrl.model.settings.priority" ng-options="v as k for (k, v) in {
+          Emergency: '2',
+          High:      '1',
+          Normal:    '0',
+          Low:      '-1',
+          Lowest:   '-2'
+        }" ng-init="ctrl.model.settings.priority=ctrl.model.settings.priority||'0'"></select>
+      </div>
+      <div class="gf-form" ng-show="ctrl.model.settings.priority == '2'">
+        <span class="gf-form-label width-10">Retry</span>
+        <input type="text" class="gf-form-input max-width-14" ng-required="ctrl.model.settings.priority == '2'" placeholder="minimum 30 seconds" ng-model="ctrl.model.settings.retry" ng-init="ctrl.model.settings.retry=ctrl.model.settings.retry||'60'></input>
+      </div>
+      <div class="gf-form" ng-show="ctrl.model.settings.priority == '2'">
+        <span class="gf-form-label width-10">Expire</span>
+        <input type="text" class="gf-form-input max-width-14" ng-required="ctrl.model.settings.priority == '2'" placeholder="maximum 86400 seconds" ng-model="ctrl.model.settings.expire" ng-init="ctrl.model.settings.expire=ctrl.model.settings.expire||'3600'"></input>
+      </div>
+      <div class="gf-form">
+        <span class="gf-form-label width-10">Sound</span>
+        <select class="gf-form-input max-width-14" ng-model="ctrl.model.settings.sound" ng-options="s for s in [
+          'default',
+          'pushover',
+          'bike',
+          'bugle',
+          'cashregister',
+          'classical',
+          'cosmic',
+          'falling',
+          'gamelan',
+          'incoming',
+          'intermission',
+          'magic',
+          'mechanical',
+          'pianobar',
+          'siren',
+          'spacealarm',
+          'tugboat',
+          'alien',
+          'climb',
+          'persistent',
+          'echo',
+          'updown',
+          'none'
+        ]" ng-init="ctrl.model.settings.sound=ctrl.model.settings.sound||'default'"></select>
+      </div>
+    `,
+	})
+}
+
+func NewPushoverNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+	userKey := model.Settings.Get("userKey").MustString()
+	apiToken := model.Settings.Get("apiToken").MustString()
+	device := model.Settings.Get("device").MustString()
+	priority, _ := strconv.Atoi(model.Settings.Get("priority").MustString())
+	retry, _ := strconv.Atoi(model.Settings.Get("retry").MustString())
+	expire, _ := strconv.Atoi(model.Settings.Get("expire").MustString())
+	sound := model.Settings.Get("sound").MustString()
+
+	if userKey == "" {
+		return nil, alerting.ValidationError{Reason: "User key not given"}
+	}
+	if apiToken == "" {
+		return nil, alerting.ValidationError{Reason: "API token not given"}
+	}
+	return &PushoverNotifier{
+		NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+		UserKey:      userKey,
+		ApiToken:     apiToken,
+		Priority:     priority,
+		Retry:        retry,
+		Expire:       expire,
+		Device:       device,
+		Sound:        sound,
+		log:          log.New("alerting.notifier.pushover"),
+	}, nil
+}
+
+type PushoverNotifier struct {
+	NotifierBase
+	UserKey  string
+	ApiToken string
+	Priority int
+	Retry    int
+	Expire   int
+	Device   string
+	Sound    string
+	log      log.Logger
+}
+
+func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
+	metrics.M_Alerting_Notification_Sent_Pushover.Inc(1)
+	ruleUrl, err := evalContext.GetRuleUrl()
+	if err != nil {
+		this.log.Error("Failed get rule link", "error", err)
+		return err
+	}
+	message := evalContext.Rule.Message
+	for idx, evt := range evalContext.EvalMatches {
+		message += fmt.Sprintf("\n<b>%s</b>: %v", evt.Metric, evt.Value)
+		if idx > 4 {
+			break
+		}
+	}
+	if evalContext.Error != nil {
+		message += fmt.Sprintf("\n<b>Error message</b> %s", evalContext.Error.Error())
+	}
+	q := url.Values{}
+	q.Add("user", this.UserKey)
+	q.Add("token", this.ApiToken)
+	q.Add("priority", strconv.Itoa(this.Priority))
+	if this.Priority == 2 {
+		q.Add("retry", strconv.Itoa(this.Retry))
+		q.Add("expire", strconv.Itoa(this.Expire))
+	}
+	if this.Device != "" {
+		q.Add("device", this.Device)
+	}
+	if this.Sound != "default" {
+		q.Add("sound", this.Sound)
+	}
+	q.Add("title", evalContext.GetNotificationTitle())
+	q.Add("url", ruleUrl)
+	q.Add("url_title", "Show dashboard with alert")
+	q.Add("message", message)
+	q.Add("html", "1")
+
+	cmd := &m.SendWebhookSync{
+		Url:        PUSHOVER_ENDPOINT,
+		HttpMethod: "POST",
+		HttpHeader: map[string]string{"Content-Type": "application/x-www-form-urlencoded"},
+		Body:       q.Encode(),
+	}
+
+	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
+		this.log.Error("Failed to send pushover notification", "error", err, "webhook", this.Name)
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/services/alerting/notifiers/pushover_test.go b/pkg/services/alerting/notifiers/pushover_test.go
new file mode 100644
index 00000000000..a3bac73e065
--- /dev/null
+++ b/pkg/services/alerting/notifiers/pushover_test.go
@@ -0,0 +1,58 @@
+package notifiers
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	m "github.com/grafana/grafana/pkg/models"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPushoverNotifier(t *testing.T) {
+	Convey("Pushover notifier tests", t, func() {
+
+		Convey("Parsing alert notification from settings", func() {
+			Convey("empty settings should return error", func() {
+				json := `{ }`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "Pushover",
+					Type:     "pushover",
+					Settings: settingsJSON,
+				}
+
+				_, err := NewPushoverNotifier(model)
+				So(err, ShouldNotBeNil)
+			})
+
+			Convey("from settings", func() {
+				json := `
+				{
+					"apiToken": "4SrUFQL4A5V5TQ1z5Pg9nxHXPXSTve",
+					"userKey": "tzNZYf36y0ohWwXo4XoUrB61rz1A4o",
+					"priority": "1",
+					"sound": "pushover"
+				}`
+
+				settingsJSON, _ := simplejson.NewJson([]byte(json))
+				model := &m.AlertNotification{
+					Name:     "Pushover",
+					Type:     "pushover",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewPushoverNotifier(model)
+				pushoverNotifier := not.(*PushoverNotifier)
+
+				So(err, ShouldBeNil)
+				So(pushoverNotifier.Name, ShouldEqual, "Pushover")
+				So(pushoverNotifier.Type, ShouldEqual, "pushover")
+				So(pushoverNotifier.ApiToken, ShouldEqual, "4SrUFQL4A5V5TQ1z5Pg9nxHXPXSTve")
+				So(pushoverNotifier.UserKey, ShouldEqual, "tzNZYf36y0ohWwXo4XoUrB61rz1A4o")
+				So(pushoverNotifier.Priority, ShouldEqual, 1)
+				So(pushoverNotifier.Sound, ShouldEqual, "pushover")
+			})
+		})
+	})
+}
diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts
index 6be36380144..b21e5363ad8 100644
--- a/public/app/features/alerting/alert_tab_ctrl.ts
+++ b/public/app/features/alerting/alert_tab_ctrl.ts
@@ -105,6 +105,7 @@ export class AlertTabCtrl {
       case "pagerduty": return "fa fa-bullhorn";
       case "opsgenie": return "fa fa-bell";
       case "hipchat": return "fa fa-mail-forward";
+      case "pushover": return "fa fa-mobile";
     }
   }
 

From 193d468ed3ed2ceff274d17c36c82a817f38a4eb Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Feb 2017 14:20:07 +0100
Subject: [PATCH 077/301] admin: adds paging to global user list

Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.

Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.

Fixes #7469
---
 pkg/api/api.go                                |   3 +-
 pkg/api/datasources.go                        |   8 +-
 pkg/api/datasources_test.go                   |  31 ++++-
 pkg/api/user.go                               |  36 +++++-
 pkg/api/user_test.go                          | 109 ++++++++++++++++++
 pkg/models/user.go                            |   9 +-
 pkg/services/sqlstore/org_test.go             |   4 +-
 pkg/services/sqlstore/user.go                 |  15 ++-
 pkg/services/sqlstore/user_test.go            |  45 ++++++++
 public/app/core/routes/routes.ts              |   1 +
 public/app/features/admin/admin.ts            |   3 +-
 .../app/features/admin/adminListUsersCtrl.js  |  38 ------
 .../features/admin/admin_list_users_ctrl.ts   |  49 ++++++++
 public/app/features/admin/partials/users.html |  97 +++++++++-------
 public/sass/pages/_admin.scss                 |  12 ++
 15 files changed, 360 insertions(+), 100 deletions(-)
 create mode 100644 pkg/api/user_test.go
 create mode 100644 pkg/services/sqlstore/user_test.go
 delete mode 100644 public/app/features/admin/adminListUsersCtrl.js
 create mode 100644 public/app/features/admin/admin_list_users_ctrl.ts

diff --git a/pkg/api/api.go b/pkg/api/api.go
index d9fee8a0187..026bae2d894 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -123,6 +123,7 @@ func (hs *HttpServer) registerRoutes() {
 		// users (admin permission required)
 		r.Group("/users", func() {
 			r.Get("/", wrap(SearchUsers))
+			r.Get("/search", wrap(SearchUsersWithPaging))
 			r.Get("/:id", wrap(GetUserById))
 			r.Get("/:id/orgs", wrap(GetUserOrgList))
 			// query parameters /users/lookup?loginOrEmail=admin@example.com
@@ -195,7 +196,7 @@ func (hs *HttpServer) registerRoutes() {
 
 		// Data sources
 		r.Group("/datasources", func() {
-			r.Get("/", GetDataSources)
+			r.Get("/", wrap(GetDataSources))
 			r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
 			r.Delete("/:id", DeleteDataSourceById)
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 455195aacb0..ddf8681c3c8 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -11,12 +11,11 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-func GetDataSources(c *middleware.Context) {
+func GetDataSources(c *middleware.Context) Response {
 	query := m.GetDataSourcesQuery{OrgId: c.OrgId}
 
 	if err := bus.Dispatch(&query); err != nil {
-		c.JsonApiErr(500, "Failed to query datasources", err)
-		return
+		return ApiError(500, "Failed to query datasources", err)
 	}
 
 	result := make(dtos.DataSourceList, 0)
@@ -46,7 +45,8 @@ func GetDataSources(c *middleware.Context) {
 	}
 
 	sort.Sort(result)
-	c.JSON(200, result)
+
+	return Json(200, &result)
 }
 
 func GetDataSourceById(c *middleware.Context) Response {
diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index aa3f6106afd..5ae752bea91 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -59,7 +59,9 @@ func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
 	Convey(desc+" "+url, func() {
 		defer bus.ClearBusHandlers()
 
-		sc := &scenarioContext{}
+		sc := &scenarioContext{
+			url: url,
+		}
 		viewsPath, _ := filepath.Abs("../../public/views")
 
 		sc.m = macaron.New()
@@ -71,16 +73,18 @@ func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
 		sc.m.Use(middleware.GetContextHandler())
 		sc.m.Use(middleware.Sessioner(&session.Options{}))
 
-		sc.defaultHandler = func(c *middleware.Context) {
+		sc.defaultHandler = wrap(func(c *middleware.Context) Response {
 			sc.context = c
 			sc.context.UserId = TestUserID
 			sc.context.OrgId = TestOrgID
 			sc.context.OrgRole = models.ROLE_EDITOR
 			if sc.handlerFunc != nil {
-				sc.handlerFunc(sc.context)
+				return sc.handlerFunc(sc.context)
 			}
-		}
-		sc.m.SetAutoHead(true)
+
+			return nil
+		})
+
 		sc.m.Get(url, sc.defaultHandler)
 
 		fn(sc)
@@ -96,6 +100,20 @@ func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
 	return sc
 }
 
+func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
+	sc.resp = httptest.NewRecorder()
+	req, err := http.NewRequest(method, url, nil)
+	q := req.URL.Query()
+	for k, v := range queryParams {
+		q.Add(k, v)
+	}
+	req.URL.RawQuery = q.Encode()
+	So(err, ShouldBeNil)
+	sc.req = req
+
+	return sc
+}
+
 type scenarioContext struct {
 	m              *macaron.Macaron
 	context        *middleware.Context
@@ -103,6 +121,7 @@ type scenarioContext struct {
 	handlerFunc    handlerFunc
 	defaultHandler macaron.Handler
 	req            *http.Request
+	url            string
 }
 
 func (sc *scenarioContext) exec() {
@@ -110,4 +129,4 @@ func (sc *scenarioContext) exec() {
 }
 
 type scenarioFunc func(c *scenarioContext)
-type handlerFunc func(c *middleware.Context)
+type handlerFunc func(c *middleware.Context) Response
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 7bce599d692..9a978503761 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -210,14 +210,46 @@ func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand)
 
 // GET /api/users
 func SearchUsers(c *middleware.Context) Response {
-	query := m.SearchUsersQuery{Query: "", Page: 0, Limit: 1000}
-	if err := bus.Dispatch(&query); err != nil {
+	query, err := searchUser(c)
+	if err != nil {
+		return ApiError(500, "Failed to fetch users", err)
+	}
+
+	return Json(200, query.Result.Users)
+}
+
+// GET /api/paged-users
+func SearchUsersWithPaging(c *middleware.Context) Response {
+	query, err := searchUser(c)
+	if err != nil {
 		return ApiError(500, "Failed to fetch users", err)
 	}
 
 	return Json(200, query.Result)
 }
 
+func searchUser(c *middleware.Context) (*m.SearchUsersQuery, error) {
+	perPage := c.QueryInt("perpage")
+	if perPage <= 0 {
+		perPage = 1000
+	}
+	page := c.QueryInt("page")
+
+	if page < 1 {
+		page = 1
+	}
+
+	query := &m.SearchUsersQuery{Query: "", Page: page, Limit: perPage}
+	if err := bus.Dispatch(query); err != nil {
+		return nil, err
+	}
+
+	query.Result.Page = page
+	query.Result.PerPage = perPage
+
+	return query, nil
+}
+
 func SetHelpFlag(c *middleware.Context) Response {
 	flag := c.ParamsInt64(":id")
 
diff --git a/pkg/api/user_test.go b/pkg/api/user_test.go
new file mode 100644
index 00000000000..6aa9dd9adbf
--- /dev/null
+++ b/pkg/api/user_test.go
@@ -0,0 +1,109 @@
+package api
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/models"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUserApiEndpoint(t *testing.T) {
+	Convey("Given a user is logged in", t, func() {
+		mockResult := models.SearchUserQueryResult{
+			Users: []*models.UserSearchHitDTO{
+				{Name: "user1"},
+				{Name: "user2"},
+			},
+			TotalCount: 2,
+		}
+
+		loggedInUserScenario("When calling GET on", "/api/users", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsers
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+			So(sentLimit, ShouldEqual, 1000)
+			So(sendPage, ShouldEqual, 1)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+			So(len(respJSON.MustArray()), ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET with page and limit querystring parameters on", "/api/users", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsers
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
+
+			So(sentLimit, ShouldEqual, 10)
+			So(sendPage, ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET on", "/api/users/search", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsersWithPaging
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+			So(sentLimit, ShouldEqual, 1000)
+			So(sendPage, ShouldEqual, 1)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+
+			So(respJSON.Get("totalCount").MustInt(), ShouldEqual, 2)
+			So(len(respJSON.Get("users").MustArray()), ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET with page and perpage querystring parameters on", "/api/users/search", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsersWithPaging
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
+
+			So(sentLimit, ShouldEqual, 10)
+			So(sendPage, ShouldEqual, 2)
+		})
+	})
+}
diff --git a/pkg/models/user.go b/pkg/models/user.go
index e14f4486ba3..e0a36be8c0a 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -130,7 +130,14 @@ type SearchUsersQuery struct {
 	Page  int
 	Limit int
 
-	Result []*UserSearchHitDTO
+	Result SearchUserQueryResult
+}
+
+type SearchUserQueryResult struct {
+	TotalCount int64               `json:"totalCount"`
+	Users      []*UserSearchHitDTO `json:"users"`
+	Page       int                 `json:"page"`
+	PerPage    int                 `json:"perPage"`
 }
 
 type GetUserOrgListQuery struct {
diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go
index f52175c2e5c..e7c718fc9a8 100644
--- a/pkg/services/sqlstore/org_test.go
+++ b/pkg/services/sqlstore/org_test.go
@@ -63,8 +63,8 @@ func TestAccountDataAccess(t *testing.T) {
 				err := SearchUsers(&query)
 
 				So(err, ShouldBeNil)
-				So(query.Result[0].Email, ShouldEqual, "ac1@test.com")
-				So(query.Result[1].Email, ShouldEqual, "ac2@test.com")
+				So(query.Result.Users[0].Email, ShouldEqual, "ac1@test.com")
+				So(query.Result.Users[1].Email, ShouldEqual, "ac2@test.com")
 			})
 
 			Convey("Given an added org user", func() {
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index b26a9153f55..791a38f2d01 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -344,12 +344,21 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
 }
 
 func SearchUsers(query *m.SearchUsersQuery) error {
-	query.Result = make([]*m.UserSearchHitDTO, 0)
+	query.Result = m.SearchUserQueryResult{
+		Users: make([]*m.UserSearchHitDTO, 0),
+	}
 	sess := x.Table("user")
 	sess.Where("email LIKE ?", query.Query+"%")
-	sess.Limit(query.Limit, query.Limit*query.Page)
+	offset := query.Limit * (query.Page - 1)
+	sess.Limit(query.Limit, offset)
 	sess.Cols("id", "email", "name", "login", "is_admin")
-	err := sess.Find(&query.Result)
+	if err := sess.Find(&query.Result.Users); err != nil {
+		return err
+	}
+
+	user := m.User{}
+	count, err := x.Count(&user)
+	query.Result.TotalCount = count
 	return err
 }
 
diff --git a/pkg/services/sqlstore/user_test.go b/pkg/services/sqlstore/user_test.go
new file mode 100644
index 00000000000..53a50f9631c
--- /dev/null
+++ b/pkg/services/sqlstore/user_test.go
@@ -0,0 +1,45 @@
+package sqlstore
+
+import (
+	"fmt"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	"github.com/grafana/grafana/pkg/models"
+)
+
+func TestUserDataAccess(t *testing.T) {
+
+	Convey("Testing DB", t, func() {
+		InitTestDB(t)
+
+		var err error
+		for i := 0; i < 5; i++ {
+			err = CreateUser(&models.CreateUserCommand{
+				Email: fmt.Sprint("user", i, "@test.com"),
+				Name:  fmt.Sprint("user", i),
+				Login: fmt.Sprint("user", i),
+			})
+			So(err, ShouldBeNil)
+		}
+
+		Convey("Can return the first page of users and a total count", func() {
+			query := models.SearchUsersQuery{Query: "", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 3)
+			So(query.Result.TotalCount, ShouldEqual, 5)
+		})
+
+		Convey("Can return the second page of users and a total count", func() {
+			query := models.SearchUsersQuery{Query: "", Page: 2, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 2)
+			So(query.Result.TotalCount, ShouldEqual, 5)
+		})
+	})
+}
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index 28e1dcf1cd1..3ccf89bae01 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -113,6 +113,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
   .when('/admin/users', {
     templateUrl: 'public/app/features/admin/partials/users.html',
     controller : 'AdminListUsersCtrl',
+    controllerAs: 'ctrl',
     resolve: loadAdminBundle,
   })
   .when('/admin/users/create', {
diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts
index b93fd07a059..6809e4c54ab 100644
--- a/public/app/features/admin/admin.ts
+++ b/public/app/features/admin/admin.ts
@@ -1,4 +1,4 @@
-import  './adminListUsersCtrl';
+import  AdminListUsersCtrl from './admin_list_users_ctrl';
 import  './adminListOrgsCtrl';
 import  './adminEditOrgCtrl';
 import  './adminEditUserCtrl';
@@ -37,3 +37,4 @@ export class AdminStatsCtrl {
 coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl);
 coreModule.controller('AdminHomeCtrl', AdminHomeCtrl);
 coreModule.controller('AdminStatsCtrl', AdminStatsCtrl);
+coreModule.controller('AdminListUsersCtrl', AdminListUsersCtrl);
diff --git a/public/app/features/admin/adminListUsersCtrl.js b/public/app/features/admin/adminListUsersCtrl.js
deleted file mode 100644
index 721adcfb98c..00000000000
--- a/public/app/features/admin/adminListUsersCtrl.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
-
-  var module = angular.module('grafana.controllers');
-
-  module.controller('AdminListUsersCtrl', function($scope, backendSrv) {
-
-    $scope.init = function() {
-      $scope.getUsers();
-    };
-
-    $scope.getUsers = function() {
-      backendSrv.get('/api/users').then(function(users) {
-        $scope.users = users;
-      });
-    };
-
-    $scope.deleteUser = function(user) {
-      $scope.appEvent('confirm-modal', {
-        title: 'Delete',
-        text: 'Do you want to delete ' + user.login + '?',
-        icon: 'fa-trash',
-        yesText: 'Delete',
-        onConfirm: function() {
-          backendSrv.delete('/api/admin/users/' + user.id).then(function() {
-            $scope.getUsers();
-          });
-        }
-      });
-    };
-
-    $scope.init();
-
-  });
-});
diff --git a/public/app/features/admin/admin_list_users_ctrl.ts b/public/app/features/admin/admin_list_users_ctrl.ts
new file mode 100644
index 00000000000..1347457bc06
--- /dev/null
+++ b/public/app/features/admin/admin_list_users_ctrl.ts
@@ -0,0 +1,49 @@
+///<reference path="../../headers/common.d.ts" />
+
+export default class AdminListUsersCtrl {
+  users: any;
+  pages = [];
+  perPage = 1000;
+  page = 1;
+  totalPages: number;
+  showPaging = false;
+
+  /** @ngInject */
+  constructor(private $scope, private backendSrv) {
+    this.getUsers();
+  }
+
+  getUsers() {
+    this.backendSrv.get(`/api/users/search?perpage=${this.perPage}&page=${this.page}`).then((result) => {
+      this.users = result.users;
+      this.page = result.page;
+      this.perPage = result.perPage;
+      this.totalPages = Math.ceil(result.totalCount / result.perPage);
+      this.showPaging = this.totalPages > 1;
+      this.pages = [];
+
+      for (var i = 1; i < this.totalPages+1; i++) {
+        this.pages.push({ page: i, current: i === this.page});
+      }
+    });
+  }
+
+  navigateToPage(page) {
+    this.page = page.page;
+    this.getUsers();
+  }
+
+  deleteUser(user) {
+    this.$scope.appEvent('confirm-modal', {
+      title: 'Delete',
+      text: 'Do you want to delete ' + user.login + '?',
+      icon: 'fa-trash',
+      yesText: 'Delete',
+      onConfirm: () => {
+        this.backendSrv.delete('/api/admin/users/' + user.id).then(() => {
+          this.getUsers();
+        });
+      }
+    });
+  }
+}
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index a1c86391088..57714380c67 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -1,49 +1,62 @@
 <navbar icon="fa fa-fw fa-cogs" title="Admin" title-url="admin">
-	<a href="admin/users" class="navbar-page-btn">
-		<i class="icon-gf icon-gf-users"></i>
-		Users
-	</a>
+  <a href="admin/users" class="navbar-page-btn">
+    <i class="icon-gf icon-gf-users"></i>
+    Users
+  </a>
 </navbar>
 
 <div class="page-container">
-	<div class="page-header">
-		<h1>Users</h1>
+  <div class="page-header">
+    <h1>Users</h1>
 
-		<a class="btn btn-success" href="admin/users/create">
-			<i class="fa fa-plus"></i>
-			Add new user
-		</a>
-	</div>
+    <a class="btn btn-success" href="admin/users/create">
+      <i class="fa fa-plus"></i>
+      Add new user
+    </a>
+  </div>
+  <div class="admin-list-table">
+    <table class="filter-table form-inline">
+      <thead>
+        <tr>
+          <th>Id</th>
+          <th>Name</th>
+          <th>Login</th>
+          <th>Email</th>
+          <th style="white-space: nowrap">Grafana Admin</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr ng-repeat="user in ctrl.users">
+          <td>{{user.id}}</td>
+          <td>{{user.name}}</td>
+          <td>{{user.login}}</td>
+          <td>{{user.email}}</td>
+          <td>{{user.isAdmin}}</td>
+          <td class="text-right">
+            <a href="admin/users/edit/{{user.id}}" class="btn btn-inverse btn-small">
+              <i class="fa fa-edit"></i>
+              Edit
+            </a>
+            &nbsp;&nbsp;
+            <a ng-click="ctrl.deleteUser(user)" class="btn btn-danger btn-small">
+              <i class="fa fa-remove"></i>
+            </a>
+          </td>
+        </tr>
+      </tbody>
 
-	<table class="filter-table form-inline">
-		<thead>
-			<tr>
-				<th>Id</th>
-				<th>Name</th>
-				<th>Login</th>
-				<th>Email</th>
-				<th style="white-space: nowrap">Grafana Admin</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr ng-repeat="user in users">
-				<td>{{user.id}}</td>
-				<td>{{user.name}}</td>
-				<td>{{user.login}}</td>
-				<td>{{user.email}}</td>
-				<td>{{user.isAdmin}}</td>
-				<td class="text-right">
-					<a href="admin/users/edit/{{user.id}}" class="btn btn-inverse btn-small">
-						<i class="fa fa-edit"></i>
-						Edit
-					</a>
-					&nbsp;&nbsp;
-					<a ng-click="deleteUser(user)" class="btn btn-danger btn-small">
-						<i class="fa fa-remove"></i>
-					</a>
-				</td>
-			</tr>
-		</tbody>
-	</table>
+    </table>
+  </div>
+
+  <div class="admin-list-paging" ng-if="ctrl.showPaging">
+    <ol>
+      <li ng-repeat="page in ctrl.pages">
+        <button
+          class="btn btn-small"
+          ng-class="{'btn-secondary': page.current, 'btn-inverse': !page.current}"
+          ng-click="ctrl.navigateToPage(page)">{{page.page}}</button>
+      </li>
+    </ol>
+  </div>
 </div>
diff --git a/public/sass/pages/_admin.scss b/public/sass/pages/_admin.scss
index 30bc3ca8b34..b2be062849d 100644
--- a/public/sass/pages/_admin.scss
+++ b/public/sass/pages/_admin.scss
@@ -8,3 +8,15 @@ td.admin-settings-key {
   padding-left: 20px;
 }
 
+.admin-list-table {
+  margin-bottom: 20px;
+}
+
+.admin-list-paging {
+  float: right;
+  li {
+    display: inline-block;
+    padding-left: 10px;
+    margin-bottom: 5px;
+  }
+}

From 89fdcc84de63fb4bb18dac908f14ff1588923da7 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 13 Feb 2017 13:52:42 +0100
Subject: [PATCH 078/301] docs: release 4.1.2

---
 CHANGELOG.md                        | 3 ++-
 docs/sources/installation/debian.md | 6 +++---
 docs/sources/installation/rpm.md    | 8 ++++----
 packaging/publish/publish_both.sh   | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b515930a4e..d62249d74e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
-* **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
 * **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
 * **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
 * **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
@@ -39,6 +38,8 @@
 
 ### Bugfixes
 * **Table**: Fixes broken annotation rendering mode in the table panel [#7268](https://github.com/grafana/grafana/issues/7268)
+* **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
+* **Admin**: Support more then 1000 users in global users list [#7469](https://github.com/grafana/grafana/issues/7469)
 
 # 4.1.1 (2017-01-11)
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 9c6140c0c6d..fb5c649ad1d 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -15,14 +15,14 @@ weight = 1
 
 Description | Download
 ------------ | -------------
-Stable for Debian-based Linux | [4.1.1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.1-1484211277_amd64.deb)
+Stable for Debian-based Linux | [4.1.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb)
 
 ## Install Stable
 
 ```
-$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.1-1484211277_amd64.deb
+$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb
 $ sudo apt-get install -y adduser libfontconfig
-$ sudo dpkg -i grafana_4.1.1-1484211277_amd64.deb
+$ sudo dpkg -i grafana_4.1.2-1486989747_amd64.deb
 ```
 
 ## APT Repository
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 63181fc535d..56125a4951a 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -15,24 +15,24 @@ weight = 2
 
 Description | Download
 ------------ | -------------
-Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.1-1484211277.x86_64.rpm)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2-1486989747.x86_64.rpm)
 
 ## Install Stable
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.1-1484211277.x86_64.rpm
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2-1486989747.x86_64.rpm
 
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:
 
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-4.1.1-1484211277.x86_64.rpm
+    $ sudo rpm -Uvh grafana-4.1.2-1486989747.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-4.1.1-1484211277.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-4.1.2-1486989747.x86_64.rpm
 
 ## Install via YUM Repository
 
diff --git a/packaging/publish/publish_both.sh b/packaging/publish/publish_both.sh
index 2f24ff6b3ea..3a70c6d9133 100755
--- a/packaging/publish/publish_both.sh
+++ b/packaging/publish/publish_both.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
-deb_ver=4.1.0-1484127817
-rpm_ver=4.1.0-1484127817
+deb_ver=4.1.2-1486989747
+rpm_ver=4.1.2-1486989747
 
 wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
 

From c7560edba52a29c189c60c6f4ed0093b820119e2 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 13 Feb 2017 14:17:26 +0100
Subject: [PATCH 079/301] docs: release 4.1.2 for windows

---
 docs/sources/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index 0036a50694d..73816d98a40 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -13,7 +13,7 @@ weight = 3
 
 Description | Download
 ------------ | -------------
-Latest stable package for Windows | [grafana.4.1.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.1.windows-x64.zip)
+Latest stable package for Windows | [grafana.4.1.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2.windows-x64.zip)
 
 ## Configure
 

From 2c68c071c00c37ab4ab42ba8a6d5cd318881389b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 13 Feb 2017 15:11:45 +0100
Subject: [PATCH 080/301] changelog: update release of 2017-02-13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d62249d74e0..c10b14a128a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@
 * **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
 * **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
 
-# 4.1.2 (unreleased)
+# 4.1.2 (2017-02-13)
 
 ### Bugfixes
 * **Table**: Fixes broken annotation rendering mode in the table panel [#7268](https://github.com/grafana/grafana/issues/7268)

From 2ad2b96133283e35158edc993db8806e69bb28ef Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 13 Feb 2017 15:26:10 +0100
Subject: [PATCH 081/301] build: avoid progress bar update on yarn install

this will save us ~100TB of unneeded data in the long term.
---
 Makefile               | 2 +-
 appveyor.yml           | 2 +-
 scripts/build/build.sh | 2 +-
 scripts/circle-test.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index dbb345473ec..c52e707c4b1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ deps-go:
 	go run build.go setup
 
 deps-js:
-	yarn install --pure-lockfile
+	yarn install --pure-lockfile --no-progress
 
 deps: deps-go deps-js
 
diff --git a/appveyor.yml b/appveyor.yml
index 30ccabb38d7..d0c1bfb0eaa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,7 +13,7 @@ install:
   # install nodejs and npm
   - ps: Install-Product node $env:nodejs_version
   - npm install -g yarn
-  - yarn install --pure-lockfile
+  - yarn install --pure-lockfile --no-progress
   - npm install -g grunt-cli
   - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.zip
   - 7z x go%GOVERSION%.windows-amd64.zip -y -oC:\ > NUL
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index 9674c8a0b8c..6e1b2cbe5b9 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -31,7 +31,7 @@ else
   go run build.go -buildNumber=${CIRCLE_BUILD_NUM} build
 fi
 
-yarn install --pure-lockfile
+yarn install --pure-lockfile --no-progress
 
 source /etc/profile.d/rvm.sh
 rvm use 2.1.9 --default
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 726ba528363..7b1b0c6ca30 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -14,7 +14,7 @@ cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
 
 rm -rf node_modules
 npm install -g yarn
-yarn install --pure-lockfile
+yarn install --pure-lockfile --no-progress
 
 exit_if_fail npm test
 

From fc0de84701285d715694ed1f02bb0be1d0950ef2 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Mon, 13 Feb 2017 18:19:14 -0800
Subject: [PATCH 082/301] update influx logo

---
 .../datasource/influxdb/img/influxdb_logo.svg | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg b/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg
index 6fad144f8c7..5316a4c6c7c 100644
--- a/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg
+++ b/public/app/plugins/datasource/influxdb/img/influxdb_logo.svg
@@ -1,15 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="256px" height="265px" viewBox="0 0 256 265" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-	<g>
-		<path d="M82.472546,256.199228 C75.4995714,246.636291 77.6910777,233.487253 87.2540143,226.514279 C89.2462927,225.119684 91.4377991,224.123545 93.6293054,223.326633 L94.0277611,215.357519 C88.8478371,213.166013 84.6640523,207.587633 84.2655966,202.009254 L76.4957106,200.016975 C75.1011157,202.009254 73.5072929,203.603076 71.5150144,204.997671 C61.9520778,211.970646 48.6038121,209.77914 41.8300654,200.216203 C34.8570907,190.653266 37.0485971,177.504229 46.6115337,170.531254 C56.1744703,163.558279 69.3235081,165.749786 76.2964827,175.312722 C78.0895334,177.902684 79.4841283,180.891102 80.0818118,183.87952 L93.6293054,187.465621 C97.2154066,186.071026 101.199964,185.871798 104.786065,187.266393 L112.555951,181.688013 C110.563672,173.519672 113.751318,164.554419 120.724292,159.573722 C130.287229,152.600748 143.635495,154.792254 150.409242,164.355191 C157.382216,173.7189 155.19071,187.067165 145.627773,194.04014 C138.654799,199.020836 129.29109,199.419292 122.118887,195.036279 L114.349001,200.614659 C114.548229,204.399988 113.153634,208.185317 110.7629,211.173735 L109.965989,225.119684 C112.755179,226.713507 115.145913,228.705785 116.938963,231.295747 C123.71271,240.858684 121.720432,254.007722 112.157495,260.980696 C102.793786,267.953671 89.4455206,265.762164 82.472546,256.199228 L82.472546,256.199228 Z" fill="#0690BA"></path>
-		<path d="M112.157495,234.68262 C109.965989,231.694203 106.977571,229.701924 103.789926,228.905013 L104.985293,208.583773 C108.172938,205.993811 109.368305,201.810026 107.97371,198.024697 L122.318115,187.664849 C127.498039,193.044001 136.064837,193.840912 142.2409,189.258672 C149.213874,184.277975 150.608469,174.715039 145.627773,167.742064 C140.647077,160.968317 131.08414,159.374495 124.111166,164.355191 C117.935103,168.937431 115.942824,177.305001 119.528925,183.87952 L104.985293,194.239368 C101.996875,191.649406 97.6138623,191.450178 94.0277611,193.641684 L74.3042043,188.46176 C74.5034321,185.074887 73.5072929,181.488786 71.5150144,178.699596 C66.5343183,171.925849 56.7721538,170.332026 49.9984071,175.312722 C43.0254324,180.293418 41.6308375,189.856355 46.6115337,196.82933 C51.5922298,203.802304 61.1551664,205.196899 68.1281411,200.216203 C70.7181031,198.223925 72.5111537,195.83319 73.5072929,193.044001 L90.8401155,197.626241 C89.4455206,200.415431 89.8439763,204.001532 91.8362547,206.591494 C93.8285332,209.380684 97.0161788,210.576051 100.203824,210.376823 L99.2076851,228.307329 C96.2192674,228.307329 93.2308497,229.303469 90.6408877,231.295747 C83.8671409,236.276443 82.2733181,245.83938 87.2540143,252.812354 C92.2347104,259.785329 101.797647,261.179924 108.770622,256.199228 C115.743596,251.218532 117.138191,241.655595 112.157495,234.68262 L112.157495,234.68262 Z M127.896495,169.734343 C131.881052,166.945153 137.260204,167.742064 140.049394,171.726621 C142.838583,175.711178 142.041672,181.09033 138.057115,183.87952 C134.86947,186.270254 130.486457,186.071026 127.498039,183.680292 L130.088001,181.688013 C131.881052,182.684153 134.471014,182.684153 136.264064,181.289558 C138.854026,179.496507 139.45171,175.910406 137.459432,173.320444 C135.666381,170.730482 132.08028,170.132798 129.490318,172.125077 C127.697267,173.519672 126.900356,175.711178 127.298811,177.902684 L124.708849,179.894963 C123.513482,176.308862 124.708849,172.125077 127.896495,169.734343 L127.896495,169.734343 Z M64.5420398,195.235507 C60.3582551,198.223925 54.5806475,197.227785 51.5922298,193.044001 C48.6038121,188.860216 49.5999514,183.082608 53.7837361,180.094191 C57.9675209,177.105773 63.7451284,178.101912 66.7335461,182.086469 C67.7296854,183.481064 68.3273689,185.074887 68.5265967,186.66871 L65.3389512,185.871798 C65.1397234,185.274115 64.9404955,184.477203 64.342812,183.87952 C62.3505335,181.09033 58.3659766,180.492646 55.5767867,182.484925 C52.7875969,184.477203 52.1899134,188.46176 54.1821918,191.25095 C56.1744703,194.04014 60.1590272,194.637823 62.9482171,192.645545 C63.7451284,192.047861 64.342812,191.25095 64.7412677,190.454039 L67.7296854,191.25095 C66.932774,192.844773 65.9366347,194.239368 64.5420398,195.235507 L64.5420398,195.235507 Z M92.2347104,249.226253 C89.2462927,245.042468 90.242432,239.264861 94.2269889,236.276443 C95.6215838,235.280304 97.2154066,234.68262 98.8092294,234.483393 L98.6100015,237.671038 C97.6138623,237.870266 96.8169509,238.069494 96.0200395,238.667177 C93.2308497,240.659456 92.6331661,244.644013 94.6254446,247.433203 C96.6177231,250.222392 100.60228,250.820076 103.39147,248.827798 C106.18066,246.835519 106.778343,242.850962 104.786065,240.061772 C104.387609,239.464089 103.789926,239.065633 103.192242,238.667177 L103.39147,235.280304 C104.786065,235.877988 106.18066,236.874127 107.176799,238.268722 C110.165217,242.452506 109.169077,248.230114 104.985293,251.218532 C101.000736,254.406177 95.2231281,253.410038 92.2347104,249.226253 L92.2347104,249.226253 Z" fill="#C3E8F2"></path>
-		<path d="M239.065633,223.924317 C227.908874,227.510418 215.955203,221.334355 212.369102,210.177595 C211.57219,207.786861 211.372962,205.595355 211.372962,203.204621 L203.802304,200.415431 C200.216203,204.798444 193.442456,206.790722 188.063304,205.396127 L183.680292,212.169874 C185.074887,213.962924 186.270254,216.154431 186.867937,218.545165 C190.454039,229.701924 184.277975,241.655595 173.121216,245.440924 C161.964457,249.027025 150.010786,242.850962 146.424685,231.694203 C142.838583,220.537443 149.014647,208.583773 160.171406,204.997671 C163.159824,204.001532 166.347469,203.802304 169.535115,204.20076 L177.105773,192.446317 C176.906545,188.660988 177.902684,184.875659 180.492646,181.887241 L177.504229,172.72276 C169.136659,172.125077 161.765229,166.148241 158.976039,158.179128 C155.389938,147.022368 161.566001,135.068697 172.72276,131.482596 C183.87952,127.896495 195.83319,134.072558 199.419292,145.229318 C202.009254,153.397659 199.419292,162.362912 193.044001,167.941292 L196.032418,177.105773 C199.817747,178.101912 203.005393,180.492646 204.997671,183.87952 L214.560608,188.46176 C216.951342,186.270254 223.127405,185.074887 226.115823,184.078748 C237.272582,180.492646 249.226253,186.66871 253.011582,197.825469 C256.398456,208.384545 250.222392,220.338216 239.065633,223.924317 L239.065633,223.924317 Z" fill="#0690BA"></path>
-		<path d="M227.709646,189.059444 C224.322772,190.254811 221.334355,192.446317 219.541304,195.235507 L200.415431,187.864077 C199.020836,184.078748 195.235507,181.688013 191.25095,181.887241 L185.871798,165.152102 C192.645545,161.765229 196.032418,153.995343 193.641684,146.623912 C191.051722,138.455571 182.285697,134.072558 174.316583,136.66252 C166.347469,139.252482 161.765229,148.018507 164.355191,155.987621 C166.745925,163.359052 174.117355,167.742064 181.488786,166.347469 L186.867937,183.281836 C183.481064,185.473342 181.887241,189.457899 183.082608,193.442456 L171.925849,210.576051 C168.738203,209.380684 165.152102,209.181456 161.765229,210.177595 C153.596887,212.767557 149.213874,221.533583 151.803836,229.502696 C154.393798,237.671038 163.159824,242.054051 171.128938,239.464089 C179.297279,236.874127 183.680292,228.108102 181.09033,220.138988 C180.094191,217.15057 178.30114,214.560608 175.910406,212.767557 L185.67257,197.626241 C188.063304,199.817747 191.450178,200.614659 194.637823,199.61852 C197.825469,198.62238 200.016975,196.032418 200.813887,192.844773 L217.549026,199.419292 C216.752114,202.208482 216.752114,205.396127 217.748254,208.384545 C220.338216,216.552886 229.104241,220.935899 237.073355,218.345937 C245.241696,215.755975 249.624709,206.98995 247.034747,199.020836 C244.444785,190.852494 235.877988,186.469482 227.709646,189.059444 L227.709646,189.059444 Z M170.92971,153.995343 C169.535115,149.413102 171.925849,144.432406 176.508089,143.037811 C181.09033,141.443988 186.071026,144.03395 187.465621,148.616191 C188.660988,152.40152 187.067165,156.585305 183.87952,158.577583 L182.88338,155.589166 C184.477203,154.194571 185.274115,151.803836 184.477203,149.61233 C183.481064,146.623912 180.293418,145.03009 177.305001,146.026229 C174.316583,147.022368 172.72276,150.210014 173.7189,153.198431 C174.515811,155.389938 176.308862,156.784533 178.500368,157.182988 L179.496507,160.370634 C175.711178,160.171406 172.125077,157.780672 170.92971,153.995343 L170.92971,153.995343 Z M175.51195,222.131266 C177.105773,227.111962 174.316583,232.291886 169.535115,233.885709 C164.554419,235.479532 159.374495,232.690342 157.780672,227.908874 C156.186849,223.127405 158.976039,217.748254 163.757507,216.154431 C165.35133,215.556747 167.144381,215.556747 168.738203,215.955203 L166.945153,218.744393 C166.347469,218.744393 165.550558,218.744393 164.753646,218.943621 C161.566001,219.93976 159.77295,223.525861 160.76909,226.912734 C161.765229,230.10038 165.35133,231.893431 168.738203,230.897291 C171.925849,229.901152 173.7189,226.315051 172.72276,223.127405 C172.324305,222.131266 171.925849,221.334355 171.128938,220.736671 L172.921988,218.146709 C173.918127,219.142848 174.914267,220.537443 175.51195,222.131266 L175.51195,222.131266 Z M235.280304,212.56833 C230.299608,214.162152 225.119684,211.372962 223.525861,206.591494 C222.928178,204.997671 222.928178,203.204621 223.326633,201.610798 L226.315051,202.806165 C226.115823,203.802304 226.115823,204.798444 226.514279,205.595355 C227.510418,208.982228 231.096519,210.576051 234.483393,209.579912 C237.870266,208.583773 239.663317,204.997671 238.46795,201.610798 C237.47181,198.423152 233.885709,196.630102 230.498836,197.626241 C229.901152,197.825469 229.104241,198.223925 228.705785,198.62238 L225.51814,197.427013 C226.514279,196.231646 227.908874,195.235507 229.701924,194.637823 C234.68262,193.044001 239.862544,195.83319 241.456367,200.614659 C242.850962,205.794583 240.261,210.974507 235.280304,212.56833 L235.280304,212.56833 Z" fill="#C3E8F2"></path>
-		<path d="M255.203089,66.7335461 C255.203089,78.4879891 245.640152,88.0509257 233.885709,88.0509257 C231.494975,88.0509257 229.104241,87.65247 223.326633,86.4571029 L218.345937,92.6331661 C224.721228,97.8130901 224.721228,104.786065 221.73281,109.567533 L226.713507,115.743596 C228.905013,114.946685 231.295747,114.548229 233.686481,114.548229 C245.440924,114.548229 255.003861,124.111166 255.003861,135.865609 C255.003861,147.620052 245.440924,157.182988 233.686481,157.182988 C221.932038,157.182988 212.369102,147.620052 212.369102,135.865609 C212.369102,132.677963 213.166013,129.490318 214.36138,126.701128 L205.595355,115.942824 C201.810026,114.946685 198.62238,112.755179 196.430874,109.567533 L186.867937,109.567533 C184.078748,117.337419 176.308862,122.517343 167.742064,122.517343 C155.987621,122.517343 146.424685,112.954406 146.424685,101.199964 C146.424685,89.4455206 155.987621,79.882584 167.742064,80.0818118 C176.308862,80.0818118 184.078748,85.4609637 187.266393,93.2308497 L196.82933,93.2308497 C199.020836,90.0432041 202.208482,87.65247 205.993811,86.8555586 L214.759836,76.0972549 C213.365241,73.3080651 212.767557,70.1204195 212.767557,66.932774 C212.767557,55.1783311 222.330494,45.6153944 234.084937,45.6153944 C245.83938,45.6153944 255.203089,55.1783311 255.203089,66.7335461 L255.203089,66.7335461 Z" fill="#0690BA"></path>
-		<path d="M218.545165,66.7335461 C218.545165,70.3196474 219.740532,73.7065207 221.932038,76.2964827 L208.982228,92.0354826 C204.997671,92.2347104 201.41157,95.0239003 200.415431,98.8092294 L182.684153,98.8092294 C181.488786,91.4377991 175.113494,85.6601915 167.542836,85.6601915 C158.976039,85.6601915 152.202292,92.4339383 152.202292,101.000736 C152.202292,109.368305 158.976039,116.34128 167.542836,116.34128 C175.312722,116.34128 181.688013,110.563672 182.88338,103.192242 L200.614659,103.192242 C201.610798,106.977571 204.997671,109.766761 209.181456,109.965989 L222.131266,125.704989 C219.93976,128.294951 218.744393,131.681824 218.744393,135.267925 C218.744393,143.834723 225.717367,150.608469 234.084937,150.608469 C242.651734,150.608469 249.425481,143.635495 249.425481,135.267925 C249.425481,126.701128 242.651734,119.927381 234.084937,119.927381 C230.897291,119.927381 227.908874,120.92352 225.51814,122.517343 L214.162152,108.571394 C216.951342,106.977571 218.744393,103.989153 218.744393,100.801508 C218.744393,97.4146344 216.951342,94.4262168 214.162152,92.832394 L225.51814,78.8864447 C227.908874,80.4802675 230.897291,81.4764067 234.084937,81.4764067 C242.651734,81.4764067 249.425481,74.5034321 249.425481,66.1358626 C249.425481,57.5690652 242.452506,50.7953184 234.084937,50.7953184 C225.51814,51.393002 218.545165,58.3659766 218.545165,66.7335461 L218.545165,66.7335461 Z M167.742064,109.965989 C162.960596,109.965989 158.976039,105.981432 158.976039,101.199964 C158.976039,96.4184952 162.960596,92.4339383 167.742064,92.4339383 C171.726621,92.4339383 175.113494,95.2231281 176.109634,98.8092294 L172.921988,98.8092294 C172.125077,96.8169509 170.132798,95.422356 167.742064,95.422356 C164.554419,95.422356 162.163684,98.012318 162.163684,101.000736 C162.163684,104.188381 164.753646,106.778343 167.742064,106.778343 C170.132798,106.778343 172.125077,105.383748 172.921988,103.39147 L176.109634,103.39147 C175.113494,107.376027 171.726621,109.965989 167.742064,109.965989 L167.742064,109.965989 Z M233.885709,126.701128 C239.065633,126.701128 243.249418,130.884913 243.249418,136.064837 C243.249418,141.244761 239.065633,145.428545 233.885709,145.428545 C228.705785,145.428545 224.522,141.244761 224.522,136.064837 C224.522,134.271786 225.119684,132.677963 225.916595,131.283368 L228.108102,133.87333 C227.908874,134.471014 227.709646,135.267925 227.709646,136.064837 C227.709646,139.45171 230.498836,142.2409 233.885709,142.2409 C237.272582,142.2409 240.061772,139.45171 240.061772,136.064837 C240.061772,132.677963 237.272582,129.888773 233.885709,129.888773 C232.88957,129.888773 231.893431,130.088001 231.096519,130.486457 L229.104241,128.095723 C230.498836,127.099584 232.291886,126.701128 233.885709,126.701128 L233.885709,126.701128 Z M243.249418,66.7335461 C243.249418,71.9134701 239.065633,76.0972549 233.885709,76.0972549 C232.092658,76.0972549 230.498836,75.6987992 229.104241,74.70266 L231.096519,72.3119258 C231.893431,72.7103815 232.88957,72.9096094 233.885709,73.1088372 C237.272582,73.1088372 240.061772,70.3196474 240.061772,66.932774 C240.061772,63.5459006 237.272582,60.7567107 233.885709,60.7567107 C230.498836,60.7567107 227.709646,63.5459006 227.709646,66.932774 C227.709646,67.7296854 227.908874,68.3273689 228.108102,68.9250524 L225.916595,71.5150144 C225.119684,70.1204195 224.522,68.5265967 224.522,66.7335461 C224.522,61.5536221 228.705785,57.3698374 233.885709,57.3698374 C239.065633,57.5690652 243.249418,61.5536221 243.249418,66.7335461 L243.249418,66.7335461 Z" fill="#C3E8F2"></path>
-		<path d="M110.7629,1.98449612 C121.91966,5.57059736 128.095723,17.723496 124.310394,28.8802554 C123.513482,31.2709895 122.517343,33.263268 120.92352,35.2555464 L125.306533,42.0292932 C130.884913,40.6346983 137.459432,42.8262046 141.045533,47.2092172 L148.616191,44.4200274 C148.616191,42.0292932 149.014647,39.6385591 149.61233,37.4470527 C153.198431,26.2902934 165.35133,20.1142301 176.508089,23.8995592 C187.664849,27.4856604 193.840912,39.4393312 190.055583,50.7953184 C186.469482,61.9520778 174.316583,68.1281411 163.159824,64.342812 C160.171406,63.3466727 157.382216,61.75285 155.19071,59.5613437 L142.2409,64.5420398 C140.248621,67.7296854 137.060976,70.3196474 133.275647,71.3157866 L130.287229,80.4802675 C136.66252,86.0586472 139.252482,95.0239003 136.66252,103.192242 C133.076419,114.349001 120.92352,120.525065 109.766761,116.739736 C98.8092294,112.555951 92.6331661,100.60228 96.2192674,89.4455206 C98.8092294,81.2771789 106.379888,75.4995714 114.747457,74.9018878 L117.735875,65.7374069 C115.345141,62.7489892 114.149774,58.9636601 114.548229,54.9791032 L106.977571,43.2246603 C103.789926,43.623116 100.60228,43.4238881 97.6138623,42.4277489 C86.4571029,38.8416477 80.2810397,26.8879769 83.8671409,15.7312175 C87.65247,4.57445812 99.6061408,-1.60160511 110.7629,1.98449612 L110.7629,1.98449612 Z" fill="#0690BA"></path>
-		<path d="M99.4069129,36.8493692 C102.793786,38.0447363 106.379888,37.8455084 109.567533,36.6501414 L120.525065,53.7837361 C119.329698,57.7682931 121.122748,61.75285 124.310394,63.9443563 L118.732014,80.6794954 C111.360584,79.4841283 103.989153,83.6679131 101.598419,91.0393434 C99.0084572,99.2076851 103.39147,107.774482 111.360584,110.563672 C119.329698,113.153634 128.095723,108.770622 130.884913,100.801508 C133.275647,93.4300775 129.888773,85.6601915 123.115027,82.2733181 L128.693406,65.5381791 C132.677963,65.7374069 136.463292,63.3466727 137.857887,59.5613437 L156.98376,52.1899134 C158.776811,54.9791032 161.566001,57.3698374 165.152102,58.3659766 C173.320444,60.9559386 181.887241,56.572926 184.676431,48.4045843 C187.266393,40.2362426 182.88338,31.6694452 174.715039,28.8802554 C166.546697,26.2902934 157.9799,30.673306 155.19071,38.6424198 C154.194571,41.6308375 154.194571,44.8184831 154.991482,47.6076729 L138.256343,54.1821918 C137.658659,51.1937741 135.467153,48.4045843 132.279508,47.4084451 C129.091862,46.4123058 125.704989,47.2092172 123.314254,49.2014957 L113.55209,34.0601794 C115.942824,32.2671287 117.735875,29.6771667 118.732014,26.6887491 C121.321976,18.5204074 116.938963,9.95360997 108.770622,7.36364797 C100.60228,4.77368597 92.0354826,9.15669859 89.4455206,17.3250403 C86.8555586,25.493382 91.2385712,34.2594072 99.4069129,36.8493692 L99.4069129,36.8493692 Z M124.708849,98.8092294 C123.115027,103.39147 118.333558,105.981432 113.751318,104.387609 C109.169077,102.793786 106.579115,98.012318 108.172938,93.4300775 C109.368305,89.6447484 113.153634,87.2540143 116.938963,87.4532421 L115.942824,90.4416598 C113.751318,90.6408877 111.958267,92.2347104 111.161356,94.2269889 C110.165217,97.2154066 111.759039,100.403052 114.747457,101.399191 C117.735875,102.395331 120.92352,100.801508 121.91966,97.8130901 C122.716571,95.6215838 121.91966,93.2308497 120.325837,91.8362547 L121.321976,88.6486092 C124.509622,90.8401155 126.103444,94.8246724 124.708849,98.8092294 L124.708849,98.8092294 Z M160.968317,40.8339261 C162.56214,35.85323 167.742064,33.263268 172.72276,34.8570907 C177.504229,36.4509135 180.293418,41.8300654 178.699596,46.6115337 C177.105773,51.393002 171.925849,54.1821918 166.945153,52.5883691 C165.35133,51.9906855 163.956735,50.9945463 162.960596,49.7991792 L166.148241,48.6038121 C166.745925,49.0022678 167.343608,49.4007235 168.14052,49.5999514 C171.328165,50.5960906 174.914267,48.80304 175.910406,45.6153944 C176.906545,42.4277489 175.113494,38.8416477 171.925849,37.8455084 C168.738203,36.8493692 165.152102,38.6424198 163.956735,41.8300654 C163.757507,42.8262046 163.558279,43.8223438 163.757507,44.6192552 L160.76909,45.8146223 C160.569862,44.2207995 160.569862,42.4277489 160.968317,40.8339261 L160.968317,40.8339261 Z M106.977571,13.3404834 C111.958267,14.9343061 114.548229,20.1142301 112.954406,25.0949263 C112.356723,26.6887491 111.559812,28.083344 110.165217,29.2787111 L108.571394,26.6887491 C109.169077,26.0910655 109.766761,25.2941541 110.165217,24.2980149 C111.161356,20.9111415 109.368305,17.5242681 106.18066,16.328901 C102.993014,15.3327618 99.4069129,17.1258124 98.2115458,20.313458 C97.2154066,23.5011035 99.0084572,27.0872047 102.196103,28.083344 C102.793786,28.2825718 103.590698,28.4817997 104.188381,28.2825718 L105.981432,31.0717617 C104.387609,31.4702174 102.793786,31.4702174 101.000736,30.8725338 C96.0200395,29.2787111 93.4300775,24.098787 95.0239003,19.1180909 C96.8169509,14.5358504 102.196103,11.7466606 106.977571,13.3404834 L106.977571,13.3404834 Z" fill="#C3E8F2"></path>
-		<path d="M34.6578629,114.149774 C36.6501414,115.544368 38.2439641,117.337419 39.6385591,119.329698 L47.4084451,117.337419 C47.8069007,111.759039 51.9906855,105.981432 57.1706095,103.989153 L56.7721538,96.0200395 C54.5806475,95.422356 52.3891412,94.2269889 50.3968627,92.832394 C41.033154,85.6601915 38.8416477,72.3119258 45.8146223,62.7489892 C52.7875969,53.1860526 65.9366347,51.1937741 75.4995714,58.1667487 C84.8632801,65.1397234 87.0547864,78.2887612 80.0818118,87.8516978 C78.2887612,90.4416598 75.8980271,92.4339383 73.1088372,94.0277611 L73.9057486,107.97371 C76.2964827,110.962128 77.6910777,114.747457 77.4918498,118.532786 L85.2617358,124.111166 C92.4339383,119.728153 101.797647,120.126609 108.770622,125.107305 C118.333558,132.08028 120.325837,145.428545 113.352862,154.792254 C106.579115,164.355191 93.2308497,166.347469 83.6679131,159.573722 C76.6949384,154.593026 73.5072929,145.627773 75.4995714,137.459432 L67.7296854,131.881052 C64.1435841,133.275647 60.1590272,133.275647 56.572926,131.681824 L43.0254324,135.267925 C42.4277489,138.455571 41.2323818,141.443988 39.2401034,143.834723 C32.4663566,153.198431 19.3173187,155.389938 9.75438212,148.416963 C0.191445508,141.643216 -1.80083295,128.294951 4.97291382,118.732014 C11.9458884,109.169077 25.0949263,107.176799 34.6578629,114.149774 Z" fill="#0690BA"></path>
-		<path d="M34.6578629,140.447849 C36.8493692,137.459432 37.8455084,134.072558 37.6462806,130.685685 L57.3698374,125.505761 C60.7567107,127.697267 65.1397234,127.498039 68.3273689,124.908077 L82.6717738,135.267925 C79.2849004,141.842444 81.0779511,150.210014 87.2540143,154.792254 C94.2269889,159.77295 103.789926,158.378355 108.770622,151.405381 C113.751318,144.631634 112.356723,134.86947 105.383748,129.888773 C99.2076851,125.306533 90.6408877,126.103444 85.2617358,131.482596 L70.9173309,121.122748 C72.3119258,117.536647 71.3157866,113.153634 68.1281411,110.563672 L66.932774,90.242432 C70.3196474,89.4455206 73.3080651,87.4532421 75.3003435,84.4648244 C80.2810397,77.4918498 78.6872169,67.9289132 71.9134701,62.9482171 C65.1397234,57.9675209 55.3775589,59.3621158 50.3968627,66.3350904 C45.4161666,73.1088372 46.8107615,82.8710017 53.7837361,87.8516978 C56.3736981,89.6447484 59.3621158,90.6408877 62.3505335,90.8401155 L63.3466727,108.770622 C60.1590272,108.372166 56.9713817,109.766761 54.9791032,112.555951 C52.9868247,115.345141 52.7875969,118.732014 53.982964,121.521204 L36.6501414,126.103444 C35.6540021,123.314254 33.8609515,120.724292 31.2709895,118.931242 C24.2980149,113.950546 14.7350783,115.544368 9.75438212,122.318115 C4.77368597,129.091862 6.16828089,138.854026 13.1412555,143.834723 C20.1142301,148.815419 29.6771667,147.221596 34.6578629,140.447849 L34.6578629,140.447849 Z M101.399191,135.267925 C105.383748,138.057115 106.18066,143.635495 103.39147,147.420824 C100.60228,151.405381 95.0239003,152.202292 91.2385712,149.413102 C88.0509257,147.022368 86.8555586,142.838583 88.2501535,139.252482 L90.8401155,141.244761 C90.4416598,143.436267 91.2385712,145.627773 93.0316218,147.022368 C95.6215838,148.815419 99.2076851,148.217735 101.000736,145.827001 C102.793786,143.237039 102.395331,139.650938 99.8053686,137.857887 C98.012318,136.463292 95.422356,136.463292 93.6293054,137.459432 L90.6408877,135.467153 C93.8285332,133.076419 98.012318,132.877191 101.399191,135.267925 L101.399191,135.267925 Z M57.3698374,82.8710017 C53.1860526,79.882584 52.3891412,73.9057486 55.3775589,69.9211917 C58.3659766,65.7374069 64.342812,64.9404955 68.3273689,67.9289132 C72.5111537,70.9173309 73.5072929,76.8941663 70.3196474,80.8787232 C69.3235081,82.2733181 67.9289132,83.2694574 66.5343183,83.8671409 L66.3350904,80.4802675 C66.932774,80.0818118 67.5304575,79.6833561 67.9289132,79.0856726 C69.9211917,76.2964827 69.3235081,72.3119258 66.5343183,70.3196474 C63.7451284,68.3273689 59.7605715,68.9250524 57.7682931,71.7142423 C55.7760146,74.5034321 56.3736981,78.4879891 59.162888,80.4802675 C59.9597994,81.0779511 60.9559386,81.4764067 61.75285,81.4764067 L61.9520778,84.6640523 C60.5574829,84.4648244 58.9636601,83.8671409 57.3698374,82.8710017 L57.3698374,82.8710017 Z M14.7350783,125.904216 C17.723496,121.720432 23.7003314,120.724292 27.6848883,123.911938 C29.0794832,124.908077 30.0756224,126.302672 30.8725338,127.697267 L27.6848883,128.494178 C27.2864326,127.697267 26.6887491,126.900356 25.8918377,126.302672 C23.1026478,124.310394 19.1180909,124.908077 17.1258124,127.697267 C15.133534,130.486457 15.7312175,134.471014 18.5204074,136.463292 C21.3095972,138.455571 25.2941541,137.857887 27.2864326,135.068697 C27.6848883,134.471014 28.083344,133.87333 28.2825718,133.076419 L31.6694452,132.279508 C31.4702174,133.87333 31.0717617,135.467153 29.8763946,136.861748 C26.8879769,141.045533 21.1103694,141.842444 16.9265846,138.854026 C12.543572,135.865609 11.7466606,129.888773 14.7350783,125.904216 L14.7350783,125.904216 Z" fill="#C3E8F2"></path>
-	</g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 78.8 79.9" style="enable-background:new 0 0 78.8 79.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#symbol_1_);}
+</style>
+<g id="influxdb_logo">
+	
+		<linearGradient id="symbol_1_" gradientUnits="userSpaceOnUse" x1="41.5273" y1="41.85" x2="319.2919" y2="41.85" gradientTransform="matrix(1 0 0 -1 0 81.8)">
+		<stop  offset="0" style="stop-color:#4591ED"/>
+		<stop  offset="1" style="stop-color:#00C9FF"/>
+	</linearGradient>
+	<path id="symbol_2_" class="st0" d="M78.7,48.2L71.1,15c-0.4-1.8-2.1-3.6-3.9-4.1L32.3,0.2c-0.5-0.1-1-0.2-1.5-0.2
+		c-1.5,0-3.1,0.6-4,1.5l-25,23.2c-1.3,1.2-2.1,3.6-1.7,5.4l8.1,35.5c0.4,1.8,2.1,3.6,3.9,4.1l32.6,10c0.5,0.1,1,0.2,1.5,0.2
+		c1.5,0,3.1-0.6,4-1.5l26.7-24.8C78.4,52.4,79.1,50,78.7,48.2z M35.9,8l23.9,7.3c0.9,0.3,0.9,0.7,0,0.9l-12.6,2.9
+		c-1,0.2-2.3-0.2-2.9-0.9l-8.8-9.5C34.8,8.1,35,7.8,35.9,8z M50.8,50.9c0.2,1-0.4,1.5-1.3,1.2l-25.8-7.9c-0.9-0.3-1.1-1.1-0.4-1.7
+		l19.8-18.4c0.7-0.7,1.5-0.4,1.7,0.5L50.8,50.9z M8.3,27.5L29.3,8c0.7-0.7,1.8-0.6,2.5,0.1l10.5,11.3c0.7,0.7,0.6,1.8-0.1,2.5
+		l-21,19.5c-0.7,0.7-1.8,0.6-2.5-0.1L8.2,30C7.6,29.3,7.6,28.2,8.3,27.5z M13.4,58.5L7.8,34.2c-0.2-1,0.1-1.1,0.8-0.4l8.8,9.5
+		c0.7,0.7,1,2.1,0.7,3l-3.8,12.3C14.1,59.4,13.6,59.4,13.4,58.5z M44.1,72.6l-27.3-8.4c-0.9-0.3-1.5-1.3-1.2-2.2l4.5-14.8
+		c0.3-0.9,1.3-1.5,2.2-1.2l27.3,8.4c0.9,0.3,1.5,1.3,1.2,2.2l-4.5,14.8C46,72.4,45,72.9,44.1,72.6z M68.4,52.7l-18.3,17
+		c-0.7,0.7-1.1,0.4-0.8-0.5l3.8-12.3c0.3-0.9,1.3-1.9,2.3-2.1L68,51.9C68.9,51.7,69.1,52.1,68.4,52.7z M70.4,49.1l-15.1,3.4
+		c-1,0.2-1.9-0.4-2.1-1.3l-6.4-27.9c-0.2-1,0.4-1.9,1.3-2.1l15.1-3.4c1-0.2,1.9,0.4,2.1,1.3L71.7,47C71.9,47.9,71.3,48.9,70.4,49.1z
+		"/>
+</g>
+</svg>

From b46fac34d9bdaa7bb54d962406c52f8bbc8fb958 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Mon, 13 Feb 2017 18:38:13 -0800
Subject: [PATCH 083/301] replace elastic logo

---
 .../elasticsearch/img/elasticsearch.svg         |  12 ++++++++++++
 .../datasource/elasticsearch/img/logo_large.png | Bin 22570 -> 0 bytes
 .../datasource/elasticsearch/plugin.json        |   4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100755 public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
 delete mode 100644 public/app/plugins/datasource/elasticsearch/img/logo_large.png

diff --git a/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
new file mode 100755
index 00000000000..7c3078468a0
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet">
+	<g>
+		<path d="M255.95919,134.393266 C255.95919,112.8718 242.586628,94.2755811 222.736732,86.9624613 C223.572517,82.3656432 223.99041,77.9777714 223.99041,73.172007 C223.99041,33.263268 191.603737,0.876594931 151.694998,0.876594931 C128.501961,0.876594931 106.771548,11.9507476 93.1900399,30.9648589 C86.503759,25.741202 78.3548541,23.0249004 69.7880568,23.0249004 C48.6844827,23.0249004 31.3419417,40.1584951 31.3419417,61.4710155 C31.3419417,66.0678336 32.1777268,70.6646517 33.6403507,74.8435772 C13.5815081,81.7388044 0,100.961862 0,122.274382 C0,143.795849 13.3725618,162.601014 33.4314044,169.914134 C32.5956193,174.302005 32.1777268,178.898824 32.1777268,183.704588 C32.1777268,223.404381 64.5643998,255.791054 104.264193,255.791054 C127.666176,255.791054 149.187642,244.507955 162.76915,225.70279 C169.455431,230.926447 177.813282,233.851695 186.38008,233.851695 C207.483654,233.851695 224.826195,216.7181 224.826195,195.405579 C224.826195,190.808761 223.99041,186.211943 222.527786,182.033018 C242.168736,174.928844 255.95919,155.705787 255.95919,134.393266 L255.95919,134.393266 Z" fill="#FFFFFF"></path>
+		<path d="M100.085267,110.364444 L157.127601,136.482729 L214.796773,85.91773 C215.632559,81.7388044 216.050451,77.5598788 216.050451,73.172007 C216.050451,37.6511398 187.215865,8.81655348 151.694998,8.81655348 C130.382477,8.81655348 110.532581,19.2638674 98.6226431,36.8153547 L89.0111143,86.5445688 L100.085267,110.364444 L100.085267,110.364444 Z" fill="#F4BD19"></path>
+		<path d="M40.9534704,170.749919 C40.1176853,174.928844 39.6997928,179.316716 39.6997928,183.704588 C39.6997928,219.225455 68.7433254,248.268988 104.264193,248.268988 C125.785659,248.268988 145.635556,237.612728 157.75444,220.06124 L167.157022,170.332026 L154.411299,146.094258 L97.1600191,119.975973 L40.9534704,170.749919 L40.9534704,170.749919 Z" fill="#3CBEB1"></path>
+		<path d="M40.5355779,71.9183293 L79.6085318,81.1119656 L88.3842755,36.6064084 C82.9516722,32.4274829 76.4743376,30.3380201 69.5791105,30.3380201 C52.654462,30.3380201 38.6550614,44.1284744 38.6550614,61.2620692 C38.6550614,64.8141559 39.2819002,68.5751889 40.5355779,71.9183293 L40.5355779,71.9183293 Z" fill="#E9478C"></path>
+		<path d="M37.1924374,81.3209118 C19.6409501,86.9624613 7.522066,103.88711 7.522066,122.274382 C7.522066,140.243762 18.5962187,156.332626 35.3119209,162.601014 L90.264792,112.8718 L80.2353706,91.3503332 L37.1924374,81.3209118 L37.1924374,81.3209118 Z" fill="#2C458F"></path>
+		<path d="M167.783861,219.852294 C173.216464,224.03122 179.693799,226.329629 186.38008,226.329629 C203.304728,226.329629 217.304129,212.539174 217.304129,195.405579 C217.304129,191.644546 216.67729,188.09246 215.423612,184.749319 L176.350658,175.555683 L167.783861,219.852294 L167.783861,219.852294 Z" fill="#95C63D"></path>
+		<path d="M175.72382,165.317315 L218.766753,175.346737 C236.31824,169.496241 248.437124,152.780539 248.437124,134.393266 C248.437124,116.423886 237.362971,100.543969 220.647269,94.0666348 L164.231774,143.377956 L175.72382,165.317315 L175.72382,165.317315 Z" fill="#176655"></path>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/public/app/plugins/datasource/elasticsearch/img/logo_large.png b/public/app/plugins/datasource/elasticsearch/img/logo_large.png
deleted file mode 100644
index 5ded1d8f4386220953cbeca7c96bc385602722da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22570
zcma&NbyOTr@GlCBExvg0#XU$!a9GIV?(P=B-CY)!gh24%?i$=30t5-}?hcDQzQ23l
zKlj{s&g+@!GpDAls;53()e@niB#n(hhJk>9fGsNnRYO2PjQ{TeqP|iBIzEgdAZVY<
zLd7*a5RbaJ5fKo8$iEJa_0%6xkzW)1e*`Yq>!W292lAl?(K8%FD>>fWDgycD(f<`j
zUS7<tlxzl6O-KQm2|a6Y{<ZmkTugv)2HmIjT&+2!8uhnB+@G(OON@1`l1>Z6GDNYz
z)rFD&wJ4{_FZhJro~k#QTd<!=qILC{QNoplY2DuM7YFoddt4$MJmv1NS4)a~L;H+K
z8}uC=NRHEvwc|nYrg!GfbFcY+E(EJ5^bHug$qkl&AE5oh1D@jnWnE-FH+?(I<QAEG
z@9Z}o*T$Uewvv9ijEkL@F<~vTD}?m<7OmOkXjfqMUU$~rFKS{r@p?Ip!&8itdSLgR
z(GkhrJnlAp3-0{+wx`){m&3aCPF}e@g0u59)$yjiP#E#A%9f{m%GErpRft3=3{fJF
z>iK|DgW2bK>0p0i&{cr*%~|@bmCtS(Fk*G2Farncfl6Y%V;xA96;3N!!D;K_>R4Lp
zs=PF>%H$L0^OCPvLAB@RGVUw~Ou_^vn*-Bc`WAUJdw3q(#YW}l@5bRyMn|E$cw9p2
z6F$gAT!Qb@StDPo<t^s%=*E5{EN*ysG+QW4vv@2_jdUrEhs>8MzOWoC4(CTbXG`YJ
zMnk*5xM_N8!;SQGf30L$H8A(Z$Dh<#j5(0UW(Pi!ts1kon`Y8|+H>k!iBZ6oW*D>U
zjbiMLF>&u+6rz=V(M&`QZ_<#wN83<Fbj4OLUOQb!>Ir!jdthh4kXrz<YfSO|$z4zx
z2^``|woirC`Q+g(i@Mcy%*bxT;83xMjPyMl7+OO6{V0GsTN<K^3_$Nd3+h;GHSWKB
zmo!0q*^0-*sM9J}MKK5;e^L_|s+<3LqNA3phDb!8^ro=&mDRB?iMAf$zBuYC<@a^)
zeV>K<uUI8QT-iI8@%5EE+vm;K+Gvt1I8%X<CL7#{NcqE;?`^8~M$+=XB$NzkDDW&>
zu@dc4uSf09PUsLm^Sz7l3`6IJF#qNn)J*Ow0bikJ{!pIq5JDXi3mDteOlQ+D{*|nv
zYcRj|2`ex7jSHsdDu)K@avgeP855H8=J0}v?BZ~rh9W*M4<%z#Qh8NgM^N1Dn*CX!
z?v;98GJsX)x&6ZZ$1`5hq(t6T5iQTOx~cQ+&zSMDGQQ1sMLY}KZ>WA((Y$$MrGkC<
zjyEd)S>YdQqy{sOVR*-~>Xp)uO=si88O!V-i&VB5oh0;X01c0#v937s@UUB-Rc_pQ
z{TFIF^(8aZkGyTRCeahT-{<%P0Sx5K$sbbxP%bh0i}9h|S_<!ydy1_9hN~1kKCChE
zq5=~>hXvQ5&NeHLxd>2KwyTM%FMT0fCE>o)EVRW?d6j1o7K6|-15x^;VSZ2#TtLIs
zU6y)C$r+`vDUTJ=RRmT6M+5z{Y{aL^W^cv!V?eF$_?{%`);B4M<>aPk#VZkPYE}RT
zOb1Sx3xs7q!_#-$x$j;QG{Oyt70Mu=ghP~~(&J-%+Tog5dgPWWJz&OZ^$)xlxnl1n
z-AYE@erVEICZO}yu&7j+jq^P%JM9<OHRoxQ!~*4z+j-paYW8P6mtkqC(D37o`1qh(
zbk>N(oTFn8ds(@+E_)g;eEET%i{?suDCAGmvLUWJcT)}vQ@bR={}+k$J?YSGHD1#G
z<A>{iRvr$lp}}{^W)F&e!Ujv9h&eS@JJ>e+RuPBE>cKRqKyLo6G8Qb+uld9A+I2cc
zWMv<C6+LPas=;X_mQ1Zz3TMw=8VS^;RO*$zDg#5HQ2!uic7CpSi^q8;?mss1av#%*
zLCaM$s3;`78b1IeV;B`wx@|<lS_L;$=+$TvA&7KM-*nwX%uW9333z`=`&Ww?I(YS=
z$i^55h8}UV3e^Dd|IOgYAseZH44-gR*K+6>#w&U<NIwsJi_E=JaUdk6z{ACFO$zhI
zJM)kyR{xP5B4R|X;Y@cKu$L-M)41Y^h#I??->AAWzV>MrJd~?VOSH>SyYGCBaB~xY
z@Ar*wAwtomn^$vUwatNy*>R)dpR;4pde%q=(ad({no~*1P%!<W;kCpDHK%Rl7%Gb5
zKWdsA2=n!NxRT8>g};lv{sv#X*y-5ZE?+N~PVYQLVQCO@>B-T>D%NA!Y5Nc9phSev
zVV^lR2#NPgOJhZj%TJfv=$kJGBdrhGZzR2TJKnNV=uGmY94Ag2nOnUha{w`T=OEl9
z%tvmCT^JpeXLnLCP>+2H(Fu(A?>Q_8!Vg!+TwZCI?Sl)E>?4h27Q1sQeZT2E>62}{
zG$!7E9uIvOP5t=+%I~43BAY#FcY~0h;V;;6LOLxT0o0`H#RwVAjGa?NVR%^3?`X1?
z-ME@enwSDcUsUuB<seIgSn=8lIesZG@##zSQpM2NM;!TMN*1NpCtWX_dx|}?sDMIO
zfYpFsYsW6Q6$;}gw#qAhT-OS1mF5Y^l8D3EJx33Gn|p@NA3uf+o}ee@uK?nbGmYL&
zBi=~q1gd<*)SzsmjF`xoODNW&3~ni%*8KPlfqQ1KOY^c6slTVN4t6nPxiZ5DKNnWw
zKtRE+M@(o+h_4b|y%EAG+)(av(Oe9)jLJKJfRRgM7i5jMy0$T03PvoAL%x(s{UINE
zaLz=Iai}0ZXJ^OwFnr5lcqbJy&~9F;P}!qJ*<+b@Xg${#j)6z3A0uN~BeW@031Fzx
zQitGqgL%7<lXp*!KRsF6>#I@k`Rr7c;^5613{1=xe%1LUStjLB@uO|)fGInK{T4+M
zJH|ht2v|{baIAAz*Jc|b6lZ2UkjWrRS=0RmDuJAab6q@B8-|6K(|S5weZB)4uWR9H
zG@bosDse<gqXiD}w1neU`+wdb((!8PSYYNnes0`a8w``?f}Xj_N@TVAyD5_6M8Ks=
zuy5Mm89nBkyetw$z5(;bk|W)^(YHrxYN6D!aC!DA>BcZB#0=@zYUg<m%7qlMTbF4n
z-?j0swPc|%94*uR)gikZQm<N_oXfn+{WvnFN<Y&^=~Xrl67V}s*DI)nVK^a~sd~|6
zUV3K-$on=&C-+BU$N3g}DlaW&Ho@nI<2AL+DQGw5MX>Nn%qIq8n_B%_j6|NQv%S3j
z@~ZrOLv|+n4LeSxc((bI#Y<sGIPdT+JI<9*KQ~k*qKZl4J>@8~xY}{l(cmju2TuX<
zRCv$dPkm$H9k!jw_18UQtM1smOV~Djiap20n<n_Fs?H!`aKPq1v38vB&hR`r;6nO}
zg2Rj;gE8O1AI-$s<RSwYCl41=^a#k535vO1cx7SKFQIHVeZr-06=w&FFKlqoG{E7f
zow4*`VU+-v2PlV_;5}4HMCDQxk5&NCr(o+kAd0@z;rnqW&Lf}WpTBU8!tLUdd^KjP
zty%bM2W;`*O_zRMs#e+(kZd-FYJL7CcA=<}Gu}q~syspKlXKN))@aE;Gq&CGHR<BV
z!rG3}eXVTAtgZ2gEO#H0#(46#{iq4KpkWb+-Dh`WG}G+%MQ1=N@2SQ*P3zfnLgSKV
ze3tEVEj!`fogQ*=#E*G)SfDWJ;gEq$hzGA3>`0!YZe3L#21?3y3ezH{0bqPV$1@Ay
z5`IW-cs@9DBBvS(!;V{1Jwwx~8w}M@S*5}=gJlDn(Z4q}R4du!d@HL{1FQ$;&eN%Q
zhG@}-pQdQ9N_{kgdCbW5y88pQ%N6Lgz=ZR=fd!Y1I0X`{ai6$aW)1}}LI$s(7C$*z
z<L!Iu;ZPW2x4Nri#mw%FX|dg@Ol89c6<#F7+)&Hfa0v!FUz&h0Kp~TNDG16zNB^{Z
zDI?s?zh(d1t?o4d5NWnlwURWF&3eCoi+2-|G60Ns2TY8AS*WcV3=0=oJm7Ilnez=c
zF|QoeGeJWQ1J1PmJDXzErplUtpNs?)-hEjA+-kuVH~!;(9_&G3tsi>C73T+|`0d-S
zL37RfHv(h+6SIBX?vn>5?}W%<D?x_M#K)6M$oBbacru@%2XaBJ2kA@|Na@^l``F)V
zcHEm5`l7~a#4Onrqq66@<nA+5EA^tWjLQG+a5VMz#3(K69@Tzs^KDR&j6LrbD|@O7
z(rguymI1@d)n24^YUV)V8C*E^Gi#~;KmHR9>rd}XcnG(xdRj@~=3MY%EFwiL(A&9V
z8J~JVTg?VO^bbNu8Uu_U7jcUnRhZ<2g7NA3`7lpgj8T*<CEYQiZc|QejnBxgMC96R
zqX6C_gG$yJtyv_hs!!ff3s3tMcTA-H`BEA|nr;Ldeb1|Wz06o5Z8RKq%&)1_;|I_2
z3dyah7O=mek;!8hD|F4S)4Papn#t7e4aA5kUa{XBx*qvsXKzZVolGpFUgd>F1?`I>
zAAOE5+Z81t^D7i|&rx4XNt`vNG>jn9e$P8bN^7v7Pr_=%wXQl|xM`0ThK7_kiNc4;
zxKh)|@p-)If$ziE*Zt5n6<I1*iTBrHs8c&+OYGx=8^@suDc!Vij6MDbs+MGW9J9iE
zhd7pX4PvAa@YRk)h_q=Gn{RF9M|!1w%YZ-h@FsUzv;A|;o@4JSd;v#lZA;an4M<~d
z6cAVV)jTB6aZm;#g&h6Wv|sGz+_b|LvemR+4R&+XBo2+={!Q{B<#VZl;EkmUK1FMB
zJRklC;YHr$kNA_9gE#ID9Rt^PTy<z~c_2V_Ep65jR}pKj#ce;b91s;2=(pQJ$+Z#t
zziq#`gx>*QuGzzYaU3k)8=5cp(+-_h07sq<7;IkZ+P=r-#+6i>Y8!uNU@MeU(ZCrg
zDiK^~hn(8Wbg@fa6Sp*J7U4Hw;oXC-BxmbQmw&ZzDX)V_nyF~_;&0Ze+fF8CZ;#7{
zZBwo-V53jet+*jU>e^1jb_c-13Mot0DD3M3A^K_+LrYDm%}4EQT6ZKGdwTlg4m;MO
z=h)EG#Z{Ih=^BH4Y2woO9{15G2O<gG2@T2%or1D6H~Wf3UnJ%=oXbzgP^Ol{`pWWc
zbbiam+s>NFC9XkMWPkHl41&5Bsmp#qBX;C%5lHQQ(r>HZMmGtfD`6{d!iXAibG+&=
z*KzGTdlSsMWm4x>^v$}Ul%98ZF@J9T*?lFd1BuXKm^D>h$D(HwvKvHiL~4BW)i}>l
zT;n*#d85V%Rr=h(-Ss!?@mBtvqlfe3q={EldQIdOAu$U1uI<p@`ICDSq8fjJAJ-Q*
z-C-5{<Nszffp~Y}26LnL*&$^$Q*w#`NrG=vJyH#hD|4A1Y;I{If0L*V`vvSdEr_Nd
z!&9q86m9KBtT^NpCl@|m{ZZoR<uint1tY%TF=rh!eKWcb*fkGt!dbVvhIhK9nmi(Z
zA^xuV_ns(xckBFFY-d)86M-R5e0;yeDy2IIa$S8kjrQZ$!&;5u$}c51)@m#U=0S~_
z{1`^wE!!3Mn@;S)*<O+Wz@=H4?g{5^#-2qo{>e+SK%B(&d51y62y5ODTXYvBNfp2m
zPB~1N#6Hlst0ZClfztbh<z+t(iGiNqhf1=WrOZmC23fk^e{&GSd4=c`SqJOZU!>f5
z%wIK@+KS>`sQr)y<o>k}waB-R55rcS!FLO>(bVw2KP#FrhZDbiEGU@=+y7=1{CBW9
zzdUa4wU{V0DV*FQ`gSw+GN)MLNFVbwe4f&W;@KDUT>ne#E9|s%Tj0(5D)mF{M^Wl$
zpYER%b5~2@&xUs`xfm=|I@Q@QgapJGsl;OT;cUykzmf_ci5gQ_SmHaYXq=H}cb?|Q
z&Kk_yFL_nO@hNO#k=Q_5)ZUBw_GC>j0uP|KQQa5I;rhDuwCVRt$c;`Z#*H;$1NG0D
zN%j7xNioiK&xWoJhk=xMf8NE4wG1HlTJpAUbM<^FO7Av`c^NKT_O5M*GYPCded%{M
za<zMkE)2$~QP*IhYQ(_;VSHbD%801E;ZS^Z^tV3b@bD&&$@2ZPn9y`QzkF#&E;C>^
z;(21*d{qT{b_0gIWJ%@<9X5*%u4g*(wu${XbXy7P^jMKpkj~Kg&jRU|F&TW0Ig>+r
z^@@GoOIjo^%YFLmSxmqUxr>u7sAU9|u$ODOWca|Fc0;E_o|@3n_Yna-L9gCAv=@Pf
zmKGI=hsO<p!Ctff-zZoh+W#ZXe-yI-(Epo@XW^_v_MnG46CcqfICH74E>j~vEEt9^
z0sZ#9vQR6p4qX!!lN%y6gw3bmw=m$h(JS`ods~bhwQ+XWv2>%6v~cTxl!4+wKJ+8>
zE2U}5P-3cO0Y8DuO33GwpZnbJUIV|{2!Yq@<kBO)Yxp-)gDTq68?EBpbDtKfx+_ub
zET7d%J0S&Mm%}CRljxsW=hihK6?mK90rfPMCVgItj~IX(aT5#%^WT^}M2;n=9Lt})
z)Az>Fw{4SVdXrthTQpgFQPekI9m@HTN8NUP)(&lN5~CvXaeUGiK7A5Bd0184dh+SM
zUQK7dn_~=rB${3_cSiq^`o*=z8NZ8)4I%m&fom4Z)#jeRnDcc>sjw+SR+$%4@^kT@
z(g|1pySdiX0XOPh$F2%<a|fT%2@%Iwu|RtvB{4o4{|;}v&GWX#%e&pvt#i&5Me3|I
zdiD_a_&dO|7-#COH@X{!V=Dt2LH|pzNgNhJ7q*8jLD!Da%f@Fb{nL&kg)sf!0ydu?
zfU21~2-9C!^xx^|8dv8F->dtx4q${2pBq#w;Ep@2dojr}11kw9Jn1wN;yWpbawL{$
zdM#4!WS2NZvsei;OhT>{d(Vlx5Z*+sp_Uo8e2}Ob?bJmoSk|i!3Ham{x@H2%NppG6
z9|6p|J~=%f9H$dbSmdNiF)ft%9+B8ej5Eucq_fiT4SJJ1*&Qevgl_S^+mqn6xE>_L
zucT2R1+n9+WPyU7@@TEhHC)v-7l$<N_BG33AAIDkmtTXWni1}5kwfL-+o~iHGAuuC
zQO!@<ae~l;-o8cc{M3sHa;EMg$-S)O6!=Ypyp>0Ws|J)g_&s<2X+7J+1l7X?i~HAC
z79;-7P2(nYpXV;<iZ{WcCtO3~E~IehOA0cA7ozy>%&2o^hV1hI;<|rIs^}ye$fQvg
zak9Z+h#>1pD6aX+WK<kNg+w>SM=A)Fa7w<rJEeb{hRztk2l(;_6Z|Uvg?;M^if#XB
z5QT!tD0?IE=$chShVsi9r>DyvD7Kmkw}$pyuEx96LB;3sMi1qpdKHR}DuL66(9ejc
zp#S@ZG&W<K9?Ysi4QXt$1Vx_<*xzGBUol~6(pC7Eklo*W&v=#q&;r2V?iZkm*J;TF
ze;5muC_@mEt519==QD3yylncQ2q`u4fL<WXWAd@X3;hDrK~3`p$a05dq8Q@CXW4N3
zJUq!e`CJ?nh{HqHSYxP3_p~r~R&)lrpz?`lie%Fd2ros7SP_xET|)?zLne}ep<`W1
z9!|`S&YpN5yXXO7fM>LLBdvzoFL_yxNXl5x&OXsDTokLm5|08aSuRmXQ07G+#08J9
zNFfiMH|0NOy15}m_<A!kS$v`7%Om%H<DRt0_CfKE0alVw3yfv4_)+f>*qJ6R0+Ecr
zzyEiWhs2o)=Obdf!gu`bYNImA(z>;zS@-SKveXt7F)pw{D%}VQSu83ppayLbL_%sU
z@XZramWzv_=?jw7!_wRd*^3f87duZqzUK>{&F(sVSNuT~?~21&75Wu}n2QS%ASVZR
zYKjiUVlqlplLQg5FA)ZbXnrmPGIqu$IDj7dRFUPE&ldh^$-ApEp0NrA#wwNVkgp8V
zi8B%Fc@89DaMMbV5(vDI0i<>LyD<>EkiEQ)Ni(eE=U(Q2)<qKRaZP2ov4DSGW*WW!
zW9Xlbf;<S3DmmHn^4@sYt~5w*9E2G9EBTL_{F-5dW0d9m#d1jy0DxGn->itn`Vc1X
zsb*nD^k-O~Nv_TsiuLt3@;CWnhwq_u?3&H6YFXrI)CRFtw}qx8rEeZ@KCNqF<4uV9
zv+@ZhUlj8YM464O2mcMm3mVb6ql7o&V<?v(DdeD$>PX4Y9a2v3e4t%Qf@&ofTiJ1>
zNR+pV6=)gpOu7G+g+OH43v&+Rf)9|w1X)2Sq|1RbwX96~9!Z2CFcOjLM=J9%PdHyO
zL1`=iz=}`C6WzSh7vhB!h7cUmh2wI60z=-~jV&k(K$y(5t(T$mU12jUfxI$tdu4Pm
zm~*HMl*-0X#nu3e!^~dBRHvPuqd7t%&9#N9iCfP$0|Pptm6aqLmv?`}FC<zOk$<SL
z$ie(KNfc>y9*(TvHt7A1jU+Zwe@B>w*v0F0=`6||SM?`U(_N1CLFC7+m~=KBCK1dG
znWZ(V(Qw(i;TC(b+hQh3dA-l?ihQ+~E)*4uAgE@qKj)BgsC$w(5Jmv~$qWU9e-fo>
z>Hl+^>>ioyE@jnIgiMi$#SMhKtUp{=N<eg#3S0UPfkcJV;;@f|bjWnht{LSc93e1A
z?WEC<fJA{yDJtqmk~nit8S_yWGWI<9GIF#_Qa}XNk+^a7J;tI7bdM^wQUVNKC>ZhF
zaDMspmsgNAK0{ivb?8@d)(T&oN%SRS5aRoQfHHwg$r%yw=Yvk3vnovkNVF@-<q$SL
zXf19qSAur^#8`RljXaS<2oZ2_n4{9&ra7W2uOa{fu^_ikcQn7&^%*XFkpMVV;njlY
ze`Q`u^;&qb8~dOKx*2Ig$n8PqQ;i3PvD>h41$10}&B-nBulIbzF(*Vm2h#p@+KV5Q
zAZx+B7e=uVp-R0q;K<RDf2H}qrK#^EAmCu@&=O%_B=tQJa$cAEenk2$=8fJ8v`Sq&
z8)5w^1`UuyN<B(egZVXO4YCeh+38zS7~7m)eKDu%v%8W~C2rPn5fMIimfitjj0Pi&
z1|pB-l_?zf>P}-s1b`FfY%<3RJ1SKHfIKvb8LH(~66Yr^KvY4MiX37PJ9}<Dyp{(|
zp0ED}h?xyQtRav$_$J_w!d;Dm41q{VH>dfQcI<p2<qnMn_i<@}qpa0XE^_<PfknNB
z5~IOetz*c7)qg_YcabuHU(vEM>?5R#0NU_bn)JURie{?KQG>oEZrayT2odq82?PQL
zL-^3~@uUD36{ivqvJMluGQ1Tj2;?s!!0f8x0Rx$yf(S;KAS(e;3FO6c*FZ@Ws)`8+
zU`9sHvtK(@ViX1da4k@U<NdW!HXiiRfk0#^B_6k6GLFD+qsF)F0dLt;_S##OfA=8*
z40TuoKCIN^1?iF=Kj|VlgV&27GLY0=6P&ztXE0jdQ*iaKrwn9dC<++dMen88L+`b>
z;6Ve%j&qst94PeZH<mHMr~I~u0RiA+;kQq4+n&dF;r*D>)zP&Z%j*B^%bj(zZcK|=
znxL!Gq6~wJ)nxd`;0<=Gp;?&jx3R4r>)><~eoW{m-;}y_!cc#FkDT}GbE`Y-kSYjo
zUZDs_W^*Rl-lNvsIw{V1Ks5e?oucKEPJ5{G{T8(+Asj*mNjMvpfS7r{)FVIQ)(4>F
z;M(|qPWgauMz=0m9}|LZLtn;6<jK&%(%vJK)+r@X|N8jO+#K4lu?tPofd4}|d^TJ1
zxj@Mc@uY!_h}J^9BFJ|{BAE~qs|MfT@{zY?atPWaKpCsWdSTH!Wh&=a-p|EuR%lK-
zWVs~l=;`06p!D|)N&W{B1^y<THTse$-8A5mi}--N34heM<9VinoYy>h*7CQU^bS6+
z@EHn3rf<7WoQ`f-smb_4JiQl5Z7vQ`({2lrrnb8Xdf>w6q#&GoiEM@o0x68wf$}r}
zL|vcBG1A)l-48+;_?|kJ!Zt(<p!l7_j&SLa;xsl1$br0U!|Cr8?N@m7)n@tAzX;{>
zUTkQxT<~{wp+gRg1jS2Ez=3f`!c*Be>_-T)zn?9U0fa;hqaEjr676g}zkfUpPv-x_
zKvc#5I35T@{P~hN0UmB!X<CuR$8~%nCx6@|1WfOi1j=5iezk?q`K(OxCZW74k%BbF
z;L_Y_J_a&C&3d>7&br$c5a5YJV0f$xs?FcDjWv~kX!KQ;l(&8(&3ZaH)kd*EL(Wqg
zJP59U&yR0l0cOI7|6pEJY1w#1Y}PrkWxUNz(w?MW*^yjQ;8=UN@<Q;l7Zb4<GwI8<
zBe`<ZN(^!<t_S#_=0`P9e0ooRoQBS@T|P8`8TNDghP^)~|LgttxThZj%re}ubY)&D
zk*95j2L5V7w0_55(}1Xip+*uT3-w>=kl+0%Kdi1fW;#CLqOlVHE>TLl_b~g_!|cpB
zMWRyMMs_{mN-QxHsTAlzeFo{~R^Z>w*?pg8>pQ@#qAKk2Jq@J`Wa{mT@f2izsZ#-C
zx$@GaHf~L0a#|rr$HF#?SMil{HzO@K6dPcN<p}8ft2h9ykJ)eIC3L3^fY$HS*ijM~
z#DG}NZ+5vRduGN<Z?Op}48sG8!uWsK>?Z(f&KR<ar7<~K;|vEvU`s!k?*tJyDHy#x
z_D-!;gZ4$(j5ajPmtTJ~(?+y+U~e#Zlkx|@i_DUCQOTkV*UkU3=KyUXKT{JbM7E<Z
zIrJMYO5PmClEw=}Px!3HS>g~QTcj6^NxthI&+Wc#N`!0&V$g>mOZ~1sIU;_yc)q&V
ztA?)FaHe;exU{D`RH%l@c`OkgD2kI5uCS1V6x_E9n!1GOnB8?!L*gUq*Gfo~xEH;i
zw=8&A@4;uUT7GdSCv?e}*-2Y`o=qQDZjn=cizPAc1rY{=*FzMp5Uj4snlz<SKY2y0
zu_7SuW84I^CQ2JpdqXmrE7EzWV^0&g8JNB`Z)}HP(S>?IAQFlkQx-$1BtlNKBEh<#
zKC>l~_Oow+FNo(JfbaRc=b<gVSYrtxhgnKo4bHptFf?TPqrcHtqp9WOC5N_s5Sj*p
zlEm(>-2J<)`|^98UXL1E(F1?P-zI<DZnI}_hO337^9=YogN-02c@v9%#}c*maAeZ`
z6d7%V&)J;mJ&MyC(_(kdJb$RA(TGDf^I9Vj#pmEzDTf{3O@j2G=m=K;Ddjx(w@<`B
z<ckAGJ0ss!RJH{$i9Kmku~CEsKF^1k)3@&;<Dw#W5IeWo1>wd0Ey4WLA7x>b>pyl_
zDhex*K>@tb`S!`1X2&T?BGXLO)1R^^YB%iew2Jj!Jm(|R<vD<LNx(7gSPyV`F7mXN
z{UR|IVF~^*&g<GZwRck>j#LPXkx)SnQO6WG*<Wg<5?|mYb&_DaNU&1}nGfvY&fp6w
zef1&F#1)paS$m5VAOUt-?4|i;+*&^`XDc;nh2pdZUqIzWrl!zDAqHY2mTY#WL3he;
z{T@{<k2lbjk-l&o8-ff?<Ztn?>=6v%mACAp!7dp$eKw4J<t`;qha8DB$2|N_>327~
zuz}~z3v`IDe@3wt4R|SYS%Z5q`Rub9AY;XnX-l{Vu^X5F)vVa)d^0!jVB7zEPJKT>
z2H&N)J~w}P-ntzO?8uPLlL5Xn&?0qO|Hj#yFEe>#M|*0VM!{|cBnGqL<n06U&P9!i
zGLlUeYOW_-7T`@u$7@>hB$EPx2p6a2&Mb|E+?fKm`>(KFiRV=m8z1<VDxId2bNadi
z29F@Pf<M30q%|&t<0f`4;d9)Le1#7q<(YKuBAh`ok;PFG7n~-K{ytnz$lEuqEnW3v
zP9)4lpv-#=2`to1Pw0D$EH+AGtfWG92ECPKfA<CM;Z%kT<5(Z8J>T1$^%4d>Q9mcQ
z)dtvYE;XFl%k+$HhrP|^l(yLAnKrkw+Ue|(=*&*}r<B7Bs5O@**b%m}@=IpP@q~|#
zu8v<s0<7X1W*-EdM*sLv2*3k)M)K&BN3wt<a%0_zEXpExYaes4V4<CFog{EAh@U{k
z!?aP<&>x??-pNHhK`>FE!96(WC?OyT;QtZ*3V5ac-y#~q*AM?^6asjq{ZG`}^1oj#
za`n}x@hy)k=`pc$YYw!g6HD|P1KJZ=0z1w@ewoJM9k)*f#U$$Jk@4YvXc9m?Zah<T
zQaDpo6fGghiTX#wtRJ+V;@)q@>rO~xG2xW{QW-^sBfR6Qx%F`)T<tvWZaM;25f@)L
zx#*_Q%pOw#YFy9xuj3ktj!r(1H4GL3i~?e)tb_?~34vq{5$k`~KHpzVA6w~4XXwt(
zoSnI>?l!j*-`}$MJhHSN6YghTICEW}w&2_63Vs<|j-aZ27%n3H&C8=G(<ze@=<<kj
zX8<O8;WKy{&5Bh<o{G?FePnyS>MR88ZdQ83>l5BXniC9<5&;CNrY_yUkS64<pU*$a
z<rib0S}1fZIizc{x%}guvME*s$yh=h&eq3uaXLOjppc+l)X}w28azVaWs0uvaha|&
zo8|0M3fISEX+_wO_PLusCD(@PSybR(NX+TRAFu4CJr@#{l>mkH3>b03`;2vCj?=IB
zh(q7&f6V_{_NtttOgc<g3!ErUHDVTCS=Hz?)#_a5bB=EnBbwMu#ms{UW@6`=lQsvn
z0;7SlW7p^oTFBD9yVOC&cjz5>a3$l5QJidE!Lj`BtVlj*s(QE_;L2z>TZ366_(Vyq
zk~GcEBV-s6xz}gYq=U2@v479JB0y(xBhhtGypx8RPAf#s*HvL<=bc9y^YfGbBVEE6
z<TF%;eg@?)ZHU4>r7VLA`R^Vv-O0I6w62NHC#_@6p&I-f)y+aS4`2#$fq6Bsh;qE}
zU?6*laNJe0yu!u{zD(bN&;H$F;1n$W57RF+HJ-he0(YYbcH>#q+rpC4K-EDX44KW#
zox=?gtt&i}tLkhJUe|l1i;Y}Z3jgGAJSXW>l{~+kj0`gvnTQcme){>bATo2a;EQOw
zH6f4K<bYlt-YsJ;Ocb9mK2%=ZoB2%EhTwUl3Vrhl;|?{O*Q^PtzKUkr!+N7#U2jG;
zO`~mq<0EB?GiGj_wq(nmFZ){;4Yi{74{tLgJQ#L^is#V+@S)I~H26rMUP}CDKZK3w
z36;1TzI)ci*q<dcg7X)h>6o9=sXu5p%%z?RdiP_IMT-*Cpv2Ee(E7>#fn}|vQF&mi
z1m)ES=y}AG-hrXM%X69tpWoWB9@?7`@<?kO>}@JAwc(xu(be>2Wxx8OXzF*I2X>I^
zVw6o8YkjT882PqWvtnrNMJ?^T?q7maTE>Sqsv9yXT}$Ar;KBZo9d8k|i$+;1;wY37
z4G#pYL`%I11R2h@6f-?Ou^(pmvbIwB##0Q+>0xTK#PS!B<BBl7s^!LqzmD4JnZ6%0
zlC-}H9<);X#$&1Jy78Lza)w0rzFlkkPOPp2B|lh%>y`YdqZ}z}Fz5Yi&Hdn^SeBNg
zoj)y|==vc2O!B!r4#42hKx}R5iIFj^H%Iw=?Zo{z4Y#)0fjB1)+wgkowyWZDY9p4H
zwwpTP)0TDsU`6&bcc`R`4kb^_FcD?_oTjn|v6?PnJRjE8534Kj8qWN>sp=0If;Z7H
z6$nhp(pKo-qgGyxQ^_$iPDgIpa4OCDd{~8l2L)q3nQwf0Ui}w4#_e0N=auu5q)u;I
z2}D!P*|3T*W47dyGOO{SRP;QT#xHlsxwvWwr2C{@*QqbvgI3uVXrd|>b}9L|3QI(^
zrGf`oGmHE&8pOpmB40>%C(>;aO4z8fk?ApNlA*MC9;S_4^DandTJ*1QP+UgI>2_qa
z;CFOc(&k2n9cDuY75w8faQ7JxBt_jjMma#xTz(tlAqQm!6DExL4s_Jwhy9+?zhcHx
zCrueF=-N<$+AZvt#haD^*v~CVPdB7Xpe|^~3l$ES)|QH6{HuSLJ1teWM0<H+VbQ)O
z78WcjHXkhLepy>tYGUJ51W;d~m89jj;ik2FU4mkqFCae0%l;lznqJkbNMAZW|3G>#
z6ff`qh0-u#{v}}2H*Tpbzlkczy+P!A<Fs%xu3o;t&q?JA3bNFkvViRxpBLteuTdht
z4iIf!4$k(Qd>U>uBN^|dGnSZK>r*c)27@D{jVgYP<QA;Le3`P*ByfB6*HjCfYYtm_
zIt=}CbfNSk#ch&m+MswooGWhEYlNzFzKRh~T%`P}p+DX&GtC4UO$u%ADX-6KL{krr
z?o+7f8L>loGE4}W*Ovbhz5Zrt2bD7PTIN^qQ=#0|Q-p$w^!N3pE(eh!)LWt(rpH*^
z8~)GjZ06($-jI2;4c|KIns-yRUp>8#{Y%Fm662u5%f+Q#egzdLXufeadl$fp>X*`f
z9M|lUvlpWOdU-%usSYN*u=x8np~2kPS#YM7!Pu4Pv$MiwPB<EkZsA7BnlkPQQhIQo
zu1<b9aYDK8*lH7$wN|gZhgZ8qQ=7bnEM0_JQe8V_%OcNvZ=<TBiFK&%wdK7Pqme#_
zC@SRMX?}S%jn!Mj-mbOT-Ph%Gg`*(fxQ%#WX4vVvGLs(;ta31tP0KWitHP1#6*bXV
zO-k7CKq_*RXxe`h(Liwqukg(>=S$4o>BvA~DY5iIU=lv4S}NVEWVtQ>%i{L)_aoGK
zTO$g!c%@6<MzxDpJZ4j|2a$kO>OsJR8SL#T%G9Sf{j{tcv?!d?REMg84eqpF6N!cr
z=MH2jErEa|UTY@7pV3ZHGTI+IPPA@QVH!=oajNGcCmFwK330KckI*m(32-G4X}l;a
z5by-{<*bQXXHU-`pr>uVxDw}(1=f_vYXk<L4ANqRFV8fX7g4m|pm{<*H93_-?=oR0
zxAVTgGoGmWz@G80Zke|L6sjtN<f`ao1^k4t&Fv>euUu2V>a?9WaS(SctiY3-Uss!a
zM^E^TrviZ#I2!te&FF++h(qrD&sb2pv*d{q4q?@%L8@#I1W}4gJrob<NPftCF7oL;
z`9ippTeYSE$7dm{cHbl3G?by`K{=L2UUXFT^Vig5JMYjHU9_xiPeh+L<4mNRx=jtj
zFv|Nh95vsM&eZj-+m!yv$AeN;XQ5$?e)j-j028b}E?2j=Ro?4!1#p`yp4*BzS)Xee
z;Ng$J9ApkK@CMuwQJSXBrPf73IRlwK|KWH2lg3ws+_e|&>yTsBvw52)a34~^eQB;C
zEfw#mVLVj)^s;j#OH#EDe#OHa%e2l+z@wi6lSpm%M^_QbG4$4Qoqa<8Kz<O`^B5#&
zC@y>>)BJYedwk1}eLd&$XSLHyP;GiJo`6EaD54kP<6+ptY~_9lwaf2Wl91*KZxOfj
zFYl4q=UhLkDdi^_76?)Cpz<M}T&8d~;fBDWA=o18*2$d)?!@YrJNm+zf|F*HZ^R+1
zJ%JWMBw?d}wpIVpdk`{n8E=R)gL{|RYVs@Z7k@O&`DwcHeZpfI4fha^Es!>5l{)_e
zT0CvyVVvk7R$yqyW$vVkyASgPLlvaau3hprW7zsgs@3#<FeRp;otxxlhiyIXy{&Bi
znRqp0j52}UN~D8AgPAuKS%nb=Ypzh&`%lL!5AF6!jzr!*(F&6N@`!I{41UIG5%?pM
zer8CahpR#Ktn~Q@C-hSeK^}4de!~^-Q|Hu&ygD%bZ@H)qaVzo&evqw2X=O&ey4L>Q
z>*6lV1EKzo=8?vOaNl4~F<cq?igvHop<MI#hX$&Q$xnIR3{-w2m)Ra5Z+dh$kHO2d
zz{?0eM3i~mb{!KY!34s<5Az-4ylfxb!u{cR8lNJ%Ds1qElnZ660DG==qLFAOe*;V3
zY`YPr#<raWCM4tsJW(o`;&JBHQHf3B;|CjhNxAUyWZ+z86fSI?nJh%MQU2>}PR@xH
zyJXlrMaA&Q8~%@dO}!*Yn_sK<_Cv*4ZA!kTiim0P-(k^D`C6d{X~+Mxyp4|jQ10Zj
zQPHE-%xJ4-e&s-ur$8r7(Cn1c_AL6JBARj&nCNWVXEI#p*ep~v;qpm(_i&||P>)u@
zS;_M?W_(^0oYXhcLCFM-!9&pZDgml!bf68*@68<sapB2Ay&NJjVo|@Mv)B%uZ=&b%
zhVm>`-2T#3`u9Mxu%zm66V(WD6H%;QLCEtNC9l%&{C&b89VBflh?aLUBHU4$PRQtJ
zzOAA3m%psGh{8=(n?Gd}ANpHKG1-|jS?dzJ=-P5Q$1tLJ7tL36WcL+}A=Rox#`v!1
z`PP(_)6tu*`{sG}wlblPI0x_Fds<pRtuWKqPpjO1dcDD_(h(07zeea_g5$#;srnxG
z!6$~>aJ(6SrXJ`}EQFs{4M$^;m$mWg!}D5X?1F!M-Rv~i$g7d}FP=M|jj|(n&E58%
z;#bti#0vcNJL$6?K|==1<|{$=y+DxJdnz(GTOdAFT%DcAj>bskul5(Qm6*xJl$?^w
zRRI$(aw&>C-$l#j;`tYp=y{qK8H;x+0lt)yCe%P07<9>e<75BX>yBTl?q3(A#ZBmj
zE+O=iH0NawOEQA`0CUd2d0|-qIner_1Xh|pV{zE$-%ofHRMmy5yD!4CvCmly^vPk%
z5^4xLIl+YKtH#89sK4>f-oXS90M^D!*n}x&u0*Cp#5CV<a98uYm}qFx9R56(0wZcS
ze<9R>aYsY39bek3mWKAXVK2C;h*`G`6GsRbquCCxsP!v8g;;Jr`Dit=WiBgelE?|D
z`%Sxir(36ADV+XI5<9&bC;28ss!V8u8r~9s_mb3ke@6g8#6bHMFp3>5Q-X@74dHKR
z_|%InkP?rImj$KP()Ev29TNUF*N40CCYh4b<Gy4S=6~A4MEf-mKd<_G_bXgj%qH|$
zIgu8M`C4%z=aNni`0KkjX;;e(p6E?rI3FhcSwxuq<ofy9+0EGp)#X0=u4P$M<H9@d
zzZU;=&SSN%iN9l{Ri*{pa|4GM1V+n>wuXx$l3h<S`r)JM2o0as1g0VzSnMX)TlQav
z&GBT41;p=Ce)gB5XYmdxv@}lAY*a&AJQF574@yTEp2YodW4SN#So-^4W}TBhwNJoE
z-)8gJL7^WjraI2u?|#lbMC%MLv)J(=oEWEUH-%WXhR6t7T-fBbCF7TVl-hXes>^HI
z@aOdOD2$X}Wv~{PY9)|jl4SX0k3PT80(EoqAFpC}e2~rqEj~#dZ8EnQp?$YfEhq-6
z>xAr=57j1aIRx`vAW{TfH_1P%+qRFCF>rgi;$-c=72?=FY3!Pi_ETygjb%_0hq}pN
ze=u!YXS!j?B@dh$oX8sU55WVT1Ge2;F#UFu2AwEkPrH{dImHziEnLF#OdPa17+Z<I
zC({!8#(NoX@qkNFkQkf3J&@N6_Nsb$D|tCS?tfC@ba*Xl4j&uVuo89p6OG#EtP4%}
zTaJ7G)H&5FXyZsY5r%JDQvApY&gRF9JkA1pO$s&D2Eih~E#P59LFg}T=1Oxh!4okd
zcO)0S!?&d<o0w~iK6zE&<>|1SFquj8(&Yz0OuUomUAYQV`X`KiLw9d+jyu~U;y$Y2
z&=|gBeU1Qzc`ykchwi%Nnb9*Ab}(Wph^M#)BG5Xx!v(ioFI<P`*q$Zpzr`kg8u2rH
z%;Ii6W2dcI{g~BXXqg8~S%EZ9ioL_bmLmJF?bK>R45*Lg1q_l{#(Ay%AMU2ASt%M;
zal}1|=YD11F-vW{>-?K5fV^zWf%;AX-a<M_>M(GUIoC^#e7m@cNSbW?4Go`RXg6ts
z(>UBmgqDz&>^I+z^V!>Hz#KOz4L%oY`#^GR$CKgaBnL#X|H*ls-k|$)YsgaElbefE
z$5r$l^ZVj?C4Vn4?Bjh4gI?GAN<@!9gwTW7z_r-fsWCntULc;bIQb;pu5irvjkYn;
z*+p=0<0{(OvtS#eY6u62guVKKRrIzaN`^mElJAZqZ?_$H$K7@9am}vLpZn)i!6s?5
zTy7x-&8tkg71_4)M?$C_eofY-YHU@<<N0!^nTo<j2jXcTGQnhrTaaWqE)A}FaO7uP
zvIr`Qo5C}DrYN(HcD|HISL7HE%uGJ8*BxbEp<fqq_#G2hJ^z|AqY-D8b}x33Hw_DG
z#9J4+NW6Xn$g59Cd+#5ip&+D&M{JRbW?UFs!0z%ct9Up-&jpmDP$>b^-HFwy+h<2>
zG}yM})B1P#Qfo}Yi~tZvkhCVo-I=`E!*^pVKkZ_QW@!Av(c?d-xS1JaoV*#fg-Yvt
zFXj9e>Hp(2*8d;!-Onj0-fDIv6Si^^tcz_Sn*|+CLAP;4om4v5W{dj}$zu3E)lyrs
zfz4ur?f=}GFxy308n=rn-=F2Fr<pemcBNFmji0_W+>9yWdhK-lxHcoy4}?){JocIr
zU#)yUvB$fe(NmVD_w2R6kBlIK6~)dUBjD6w+`fmw1-jql!Y1pCU}Nv+3^wr-R6Ra5
zx{BbqDl4Wj7U*T9t=aUAdlR2K$i1iNjK#T{)jG6|u>D;!gHJ=tL$4S;krFY8XrsZ`
zP)J-sBF7;KjpA&-<A?H2?U@(8u44L8AQPYQ1x@=?bW-%r18B8A(ToeD<K3>w?meW2
zh{l1jIDC%2w7nfDM|ny{c}#YMMd8tXaMO1Ou9E^co{b>SVE!k*`T$rTY21d}gFpU8
zmLLA}CWwTI)?W;&U?Y<msMCAxbM*Z2ii@HpSLbyq>fqI#GslDhp}CVOO`iV1tD)XW
z;&UvdD%$nSIu5YVgX~>+7R)~?02UDdd%dFRFOReEOi(fJK05u2I3*?hV@;rXFrwQ<
z&kJjT*WhpA|KM`LLmY|)!hk@rBr8NQr$6cZ9e<lTK+53OfI98WX)glIyCg}UIYd7h
zpS7&8Z=xjM-huEyc=32lU|1Goaz-iu;DDd7KPd^N=x8y>EKx017-IPr9S+8lghE0d
zQJ~1LywIltVez@IE$St;8z*_PkILl7Cm=w4ts1E&MfUcs!~+Ssp(p_V*4UU<?DAP~
zr<TiR9O48^`0h)Aw)OdbK<)Rl#Rd&me?}xWtr+4EH&vgSPT=YZg#``ggYZ5{&3Jks
zeW2=A=lX@(ES-^X4xg6L<x^o(%neDRm)Gj+>Zst3@Obk%tjMVNyFN;9fN1ENw9i15
zzn%IZ*p|KSIqcHXR;)2%go5Ar>!SL@rSCeNUx}cy+&A5Pv0G=Dc}tu^U3bO!putMi
z`^u60%GR`M-u70}-gto5xg0cVTo5k_NvxK`<8<6<Cy+N4&4%k;-De<AyrIQF_fPH!
z$h(}JnRzd3p87e}^+ZUg=3x)+8zGm^BR(Y^fl!B}yQKY-_{?0)(a#!j{Z<^tjBVkF
zv)X-7yXs-)loifBg&RDZ-yx5mulBh+FYdDGe${#r&{3<zw+w~;l{3Ord!yc}2&IVt
zZl9TbN!UN6!J<8g3!DwyFFNHHZQ_hz=0E}h5#>Ru{?+kLOTB`o>v`qLa_W}>c-H*A
zXdG*7y^A<!91FK4C{J9rS%=?OQsNRLVCT~HNY9qU@!&xLW}802+|enmeOvZURh%<5
z%m+KnI}07-um<BQn7cze{T|E>sc7x99=4-fa8o#9(=gnp2kx~P<QFql2!pe45J|09
z*V$VaUYF<{{!4eBzN_hOxF2vc#b$L@G-HTrYDT%M5O5@X)Z8RI`@m|gJ8q4qZ6A6o
z)I0NCO&w%z=vBmKnLhRP^5xs(wU_S~+89``slPzJ6%R}(z5|nEjjqicnVPBMtC5qs
z7m1yB#=>|Ma5AeyqRBQ%ZxBFXfnetppse4?7tC$xuY8dr)G4o{gS~O{-5;eyKX{S)
z;Zvb)!x!rY40qS;N-OFJW2K=9XJOQ>T^a3}kuWsO_UOM+u5B7w3vb?G#s!Nn#SDx7
zd^G5}jJgq#_cOv>fTN!0A^K`w`cn1U(b7)c#e735O`RS2i!i%!4xU}-rlBp+<iCRi
zTyQQt!f5t(1!B>~l%A+{RMHro<tjHoag7-EjR;HD_W1VB!?v4_xmP}7?c^6a)2D>V
z88=wauWhgM@4_p3`<6vZ!5nM#<(vJYlzVBE8;Ce2O0)+@Pg;1m{=KER)d5){tMVJi
z@fID%f7;h2X?0+clwwHd;@iX97~3tO9^rR!ZM6t?^tw}39Exk))7iqC0#^SMusr_v
zQQFa_QLKVm%H*uZ=e8HiqLF0|ma>0Ij67S_<RvvViSG_m5n}rKd97MM>|9jLp?3Lc
zL-Yaos&pQHJSYAU26FIqX2aYSW9>fYXZdQZW*~^HaLV~jWtSa7M<rkm`Qx2YN>IJM
zHNi6*|E)DwR=^kV)UNU}5KF_Ag-^ov`9>+lr&G->>P`?03C39+6cKT3C3c{RX31{v
zXEecl=a2gJ`>tjD>NOSFQ@yE7_a^o-@(uEaHB!UlPumsD0RKoihWN$S<g4S9)qi@p
zk#d_axVR1+RAD|?zp4v8s!{V{M3yWj=?J955;P5@w?3>fjgDe~2THjhcEUDuF-&C1
zx34?H48OJ2%EkTq^T;V7HGC=oQ@A0O%MCFx;hOTmtX;$z#IjB6h`4Ls4I6VfLd*ZB
ztQ)}0wy!Vw=S!dJ$*KwaqcO78n)5oDZRa(3I1Bev{k;hfccVAgs#8aQyHR^%-<GY7
zzNO6}gmj>Pe-fiQS{mi3Z84Sdnc_D2@WcI&KU{17^s%c{pW9C|Vi+KQF~4f`V`%9A
zq>uSI3l9?$vF>qb>G23fB3u3J8=%AY;dB+X34z5Ny7?42G4Mqk{g2SaCHBDm{h<;X
zmvmWsfYkb)v$?@i)(YmCbHPjbMY|#Sq52kU@t<iG4`C6(V(a6`w>D#q17+}v9lf0x
z1e2!~qc2`pk5Xh(^0;Krc`eW$2@jo4e20s{1fmeN$K%L62g3;w9js=UW>X(6&-41G
z;arOC)5WvSV$bR1rag&&5fHR)Nq!h~+FSd9r+of-)n!Rl#rt8tngEdim=JmfxzxkX
zGeYQ^&-wi$w85Wd?vEbbJ5`9@WW*mIB(e|3y@0JZ=Ie%vWU;`%;&Wuqt0tS~BAWG}
zX{DY=UoI#UYT|oorW0RY3s~})(_8>~a4Mok<je4v-$rSW)%#{rt*D!P3}=)i!+@#?
zJxq|f7g?Nb?{PE|wKWynW&bfL7;$6t)0^A2l&|#k|L)8)JEj2xl9(dTB#1F}Ma}D?
zHM{on3kSZ*D7AuO?VLe)KmW|D8dvk2kff=UpoF|Ewa_+ZZywiCH)7flO5M4<5$c35
z0ztaE`4bCj=fVb`Pv;Y-f^!@M+2c3JSSQ{s=;#Valqo$TEifwxRW9FMN7-k_A($#7
zq)HQm?@1qpW0jN^+Sl)6g;;b$Us_WI5TiQ18YduDOrmligAWr8X@hs)Clz8PjTsTd
z1XG<JHv$cMHee~uxaHu-F5@@Z?h0d}p%eToPhPx~j~mf(&XOk4xejz|bNP+xTrsCn
zt4|0D-%mZ}sMnlbQ3t%WZIQOCy*krV#D5m1oZ59wCiU_=j5v%%&@uTTXE{c%Cp-4^
zw!B0lISi(oU80Pyz>L#&xlRHYZiPrzk1#hqIbmNj32xi5jup}hxL%YuMi>eR{7Ho4
z><#3XCfag)a@7%2=YDPY!L7@+$q{oLO?4T++6}NLOyHx@Pz7;j5ijDUJ(w=>_UivR
z8VNMLHTP+Djco5C82!UObn$4ui*JvV+;sN_(_GZm<!a>oaWw+|jN^`ZE_jB2+tz%y
z;F$c>S7d5ucim;Pu_6(*-Bv~*L7?~W`&;-g-*F{f0jI6BO+$a;ueVOK!Eg*k8*V=a
zfxjEbM=W)#O}p<Ib{sixkj`6ErcZg4_XhV<UI^fwz9VF*JavZ^GCO(%;6HJ7*E!b%
zeuC!(GX!jJA)#oHD<|>jZ87E8V)3AzrmWX9RwqcDy()N0N8;>$J0B@f^&;+{S){Q*
z${50;>fV5P>3}1EY{C=2ck~;y3i-XbCJaZl6#|zF6@!6-kRv%nvs1THCf&b*us=Fw
zi@$dQ+(IE;)D%@3NRM&I(G34+<TCr-^-&aNgy!3P7lm{xL5r|MI(}pu3;ttou`~Ky
zzUv;z`LaD=f5+~M=rgP1BMH{7|9=9m7E$RQeAbFbNk9{rgxFhyHbz$gV&fv_WAopY
zAZ4@0oW7WO^#S1<g+rRL+;%toeEhM80|#B#nK4D6_!~TtATw0a5&?f`UUXQ5^u3gE
zR0D*jaLKsk`oh&3&`8Igs@)Z!pTN~C&5gUo+PHhEjR0ZX!gGV=wTWOsI3u*B6bh6u
z6Nv=B>P%Vt1L5ew>b_93K-e20fbWCSQnJ;SYQVk=YwEox6Yg-E26U};S-7rXVz_Zs
zXHdRBE}trkXF=GZz;eUo{<<<f<Fm$;hchfBTs9wnjMc!#?g2tJp9H3ekqwdq$r=Mb
zQqx?vgd-1L3MU!7CZRI^9)*Ox+PNbLy9kg&vWkQ&yAM~?p9CxcUYC<`U#tJnJ755M
zt~NE9NS2N~?D_nq+Iu;fQJQkGywS+-D>sVOG7Js8F2c{X**0c=zkv31Ed15!cqpO6
zo{Q&SBf2O8@I6YOX3i}I$mfik=kWJYxL1{A(gfz(eHQm3K*1wFV|Ao43>)TD-yfA2
z2!QpNl_j26;{hnWI>b)<nE<?$jSgwi3jsoUr50b>7p{STHaXwRg<x5@+iN45N&Oo#
zsi$dy^sNZiSaF5ehTmb+;FHdoC^hCLQ@e^IgIpoMpHL};&%Iym0>pjRUM$xD`t-6u
z#3ZrW_U3GiCVuw>B})K(E1C5UTsIn*G}w|xJ}HiuYXT*n{{|&gl=pu`7Vds^Cepwe
zA1St4qpV;wtn;$3U7vJg+<|gC7pv(~Tx|hbm%0EkTmz)(;_4Y^X*jJp|KNS`j7wxW
zD&S5+PQV^+I?fGfT}X(_I6&{w_-fBrHsUkVVRqZDL@r!d6-cg$mudr*@3(dcC<)n;
z>KpPSyC%oN_OU=_B{cEDW`Qu`fPNDo&LD_onC2t*)gJ`tnRDJuv4;hcXv8fx)>!`b
zNzbCz{nT8zA_K08qXf(X$A>JVZ#~h$zX!CQm&S$<-*IH)7adLOUw)_WpEd2DmI6f9
z^jU%bKTFEfuvSGb{7~yro+0{FKz~Z^pt=R3nl9F~%f2FJX$tQSdjjDZ;5^{KVJ_Pv
zXYC<XIo~><H4;T2X!rOQ(dH$La&|*s3uFdN`P-PUF%FpM?Q#%JKNDaR;mSluV-7Iw
zc&ac%0n*w6QG&%6d)lXh_&G_U@25$Ccu-hwn<;_l4~F!2NocJ}a|Zui@JeB)r?~Un
zy^OaRXtct4ti%5#p|$0icljO{Ain2GK2Qc%i`FzbGw)Vz&HLWqnt5xcs4<a{;7K9o
zRajUcZG-1XZz0j#PQTFAjFWIc^N=+oMw9)Dvlk%d!bttH#O(3uy8v<Gacxm!U{hv`
zg>+2`NA*o|Gye>?Kyq&X_5OaczjDfG-;eN3R+Fb>=2(Q|cv8()cq4PnT|i`A$$iB&
zUDk;#MWwgro@G318gz`Xbvnj^PXc6<tgV1f0)z~=fUa>z?fJ(gD`>}s*qoh6==<ul
z#Wgn_4~rN`ORWzxE)n25Eg%B+EDDg_1{7N$aJXt4k_DnQfdc8XaA9e4bz$CY_AUYh
zOHJ)Wyr`1-k|h<el!1HmxXvU2B0TW7EId8!c}8x<9rH{7SEUD3!g05rPguwjAg&as
zDPIfPABdJ|O%wNiIx*%a!;pab`uCd)T?MiQGNAxj20Gvn`gnN~!k4J7YMw0+$^ilo
z=ca<nrw6p9>xBTJFVw1A3{fbhb|ig(lup-1aysKwEs%Qi#$}o)vZ>KD$OR|Wkl;Ca
z{RDs^LYc1>0pe-AFVaTQSj+z}Ak~z51Ja%=P1^<?Iu{?f3rp9J=$XXzhAUhr0e*e|
zkEPREAbLxF?i<srqllB553-LM+=h<h<^A5rI+1?v3<Qe=y!Hix(714oA-zl$-jy*m
zj+cExCL^^c&=wv8a1eC-k0dq(ywR1K-WEvUHlT|D8HkTikEJ>D%v=LDhXQ1v=9nh%
z*WI#iiHAi77K9_Fs8lv8y|E}DT(U^ofa(Cq#L6bMQURwaK%7`01hOaCRHX&Oa{^wA
zJEBz1U!!^t2t8HA0^3aj#H|qdxB;~-0lbnHLM#pAo?ROI{Q=1Zx%;Sslk;qW=x2nk
zHZ8!t6z&D+nyJwvYgp(3*zznP?}!j|`d;$(sWn2t;bzM*y9$nZmn??!#|e-wv=6gn
zec1zh%+#JoGf8uE4r<LCNvEgq4JFK*f)anC3LZBiLbaju0Wf<DBnc2=Qxt59_RF*0
zrg_b;0I`^@;lb0!7XqY(2};$bGkh2=Rlj6q1f1=l-&NqV0aqp$#HI>~rscwN27tgq
zYi(?}cgzHZfeVmPMSx^Wgo;`31EuPF?@g4NxoK`6q3;#U&fPH(^Sld?Q80B2lI|AQ
z-R}oX%g3E9y?d$cgjM}-6xeY^04ROEu7eriQltyPJ}vBr)|B(A)Yj!1=(s}TXYKR*
zO}Er2q{{*%k7;yd^gYEQzOdSwCqb&n-Z=;h1mT(8c60&Ai8Hgy!s;(Tpaa^bxC@h%
z?sl=g#YX|Kr==_u2(vech^<=rs+GfsPX<iO0vTHH|18(Syo$J~BPSaz7|rFlo%mS{
zs;vM~OOMhjWX(5v5-4bk>shGqjld)O#|U*Wk1j0zOq>jc?E)mMvEL1tM1a)0{nCzx
z_8M3`3C9Je>)=>zcTg0(`67&=w8LKlSig){{Pb4*x;+*8S93r$2BZZ&S!6bbL`%2i
z9`8NH{Kj_u&3g=i6SSNZwyjwUkkonitLYEsw29TEXUwwz;d;7lKsRnNb`yRJ0rJ!=
zK&1Um3Z<vf2L9WCNd-vGh}tyEY13LST&8mdh)d8p7k@n&KJ?&Wb1@zSP@5on79!5%
zqQ?|I>Hnr@)hJwlJZFsH@@}<TE=<T+^RA<FEI|HYi~#u^7a+3`A_}ZyWzso-fTwr9
z1#)NH+`NxwmEM@IE<oHpG&#`vJh#Vi?Va`@?yi&7qPh&UVO*i*yo@`N<_rUccCqRa
z1f-r%F$=4+0HIq2mRGhwT!7503k&*&SGWM7Cs?MJ#izXsON{)b<vfJvK)`*VXkIU*
zO|%8nde?#Y=I0Crr3zcmowI03LAF#Irb@1VR{^4b*|)A*2{ttWPV(YQ_Rag^=WA25
zw{35_2Xj>Gg?YC?ysNP{D4Ydtjw#}!+v``t9EmGYKnINx=hEhP9DB=tod=@%Gv@5V
z@}6ig{YhvaVE+(6k1_tGTOWEiZT8)2knp0nTDahTx@~VU8XIc=9)t^vWCm;OxV{h|
zH?uChXg3~2CskDq{$>cB1&ANE<OO}|xut&o4iG@@+oggu-qBZp$Qt39HKJv65!}W4
zDGX`b+-Umwd}2AuSeer-tUnaa<!(V6RuFxbN{+XoZ#rhS(91uK==iECdB&=BC8%o*
zP0vFh;RZ@U^hbi%8G&~leyB12?VR%KVA+O;bZ)xnnC=M&DL@EB<C0Y%nr{>*ucf)^
z36RCdi?{Bc>o#cB9x%%m9i0V;ex@+1Z1n$cd`Fg0saDRtp=y=reFaFxwKX)z?^fLA
z;#^Bojup+7|MMe2$P7w#AlY)7{YQ+yj^iS%bJNE)PbE(Q;Ey{a%`uA^9-Z*P)Hmx&
z)k{IgEqc8T)c*c}Tv&F%+KD%&I*_xeu?P^p7Xsua_VFyJ|H%D&@?lUQazdC?fOz58
zi&bYLfk#nbK!sRmD?qA(#j2-uXpwh*^&VV#101vf5gtgx*0ol#`<Q@(&X<?qKBPic
zfHP`D(^l~L>uS^C)(GwvuC1rtPL1}xV*QE~H+XTU;H{mXazGY{@5$%bo`g28qgE$C
z^faGYSPKEt|C4(><tBmNOl}5X0<5C|u?=4s!zb(r(ZM_k5dWw7QVf>g%UK2iO-TdZ
zjn~r+AMOQDvk)M9KbrBFera#CeEGqgDMiq<$84afzYY*hy9WQXtUX)no#70McSU>P
z-W7re1auB!AD9JV&tvRaU}Lp<+-Y){XA5L;2Krh9F&~-}7nW;`Z%M7UKc=eWc@`jk
zt_Z1@Y=VUE#_p+f2B5&R-Xdcrbsz(+73WN_(aiF@V&2Y?);MVI?J3%fTc_v=2ZoDV
z=PX3E^q!Rfp|I2iNKzsO-37=2v@#J6m8F+@nE6SYb8ms1SO|~_{jta24*^&p{gbBE
z59dgLu;Jg7g8t_c3=QZaK)jiv`}J=dFjE1-33=2nlt6FpD>bb7%stb^D`sbCfq1gT
z<Bid7m+Yp$3|Nx;=%7LCMl;ZCRg<9?ASN#Q^J@Ve1a<d-X}9!t3*=kDqYDu5+o^y}
zbnHQN@5VcO7nZj}`av&bw8VvhXy~RF16h2Q$C;pNRiQHx*hDScZZsU`lRkYa(T%7%
z_dA~?sF+Q~<tCz078XqT>+?Afq~8WK5~7~L-}3=GKrQ&I_Y&k)RX0#Oe<B}xlw2(z
z)A5~^!-@pG1&G$k58y(pFZaL4vvDfgbE1g~J@v#f*BedUZH!Chmk@SdcVou|pXFy`
zU?Ix7V%<76X%q}AS#`(8xCGzXg5fT!*O!Dgw3GJ3#%k<`fUJ<r%!P%r2|cQ!KNp)a
z*33g{9fyH4Nq{WkAa>dw1W>f&>pAp3U`fEjR*q@~mS<#v_*m~MMurxbJHtY(JR7J9
zKZ**Cfo}OZ<7oVuh+E9f8Ki&fL)z#OVm8Hck_K8kn8|(hk8?%=&;ldCHmEV%>A0{m
z)4MF6Vy9S)Lz;iJ1MQS?tRmAZy|!ay0wJyIK>gr6rMBSawcfvsYbU4w<Pt1n%m*VO
zw7ABhNg0FovkQ*Kp#e*b-^Vm<3&iQel~7ApKQEt$K4uM<&s+;+@ezXZ8R06<Tc_26
zS~GV6n#_?s)SylEt^@HydqhMqWA$cg0yZUW>ItS&Ic`0>c17@PsytW65y=HuDFkVQ
zaep^VRcF4}fVvuv%cW<KALL(-(fxp|lZ-3JlQhkdESFMrb~rTXfTbqjnG?FOJXrd`
zv{t)fw%|l(=r;kHD(*(IknE_}<%HvZz^_jb_BgSEuU$DJOREN~1#u39g>Y=$3Z9#@
zn{qr%0^JWqqG2Pa?MaZd1@Hwf6pS};hWkKw3F<5orO-D41%^>*_``Akt!UTc3I)%B
zrcgElmITau)&gV|9GX|a=5#fChK|@ZOAaN7agneAFouNyIfJYa0&govOJQEoBCKiP
zB^;0skx>Cm4M6$69l<|}qDbqc0+(Vg;uH`lZJp7&14L-OTv)jhog;UxW&ExY)Kg;)
ze~T~)Ve!Wlm&G{lOv{iM;|H*+ykC;sNFsVwBEzg<DjvL7JNMJHrzp&`^wjz|-A75o
z45s%)Tmc0id_S%<)4TAL^-7YNU+ND2C?GTLyg?Os^$p6rVHW35{Ki_)wuPUmf@ZyF
zE*RfGr+ST^7D(gim5f2mRvAnIucn0zv_g?;>6rU+)(i$&8WnD8-pN8d1U^rXPI}L)
zOG<a+H`CdGXM@{#_Ct9GIOlJ;ofwDrqf#SH+M#56%EA%rbM?f^9_>2=1fXMRD8_S7
z(LUdFTV@QbcYHqy_bS2^|9@P637w$>oOYWk(YKBME@B-yTD2%ef5v$z9IO?8dr4`T
zlRNS5-JjauzZ7Px^U;B6yRb42;RU6A(Wc|DB#K;1-zjL5cNKUH${g-liVwkaN$7d?
z@5EXKXgp^~5Pi|w{jaTI+m`zCbnOqM>tWcTO`Hm76d=J|6a-w?X4tP67Ts38t-2Z(
z`uly%xe;H!mfv}6b~XWNv$8Hka1gsJGgUlWXV@n2eps9Gv#+LOM5{5B@<Ed>8+1Ky
z&<qHO({U|rNJiRRKxvsS-0>WsCP19=VQCcn73~?2Ag|DgH3IabUj2L&tP&WBjm_7x
z3P!V=g=Wh;kN-nJC9YtdSz~>{ud3Kv%_{-4AR0p8ncD`)7TrC$4*CO+0QdTHm_vT{
zxV6vi?==Qh)+;U}0ips*H3W5G*H?gGMPL;RhpdBmh&Q{ete@uco@|wic8ROVJ!!Q2
zV|@h(!k*{ZiJPzOSdX*#IMEcX=aMl@cVirA!@36K?auT0(pi9zMv2Dh%p#v3l8IHq
zZd_Y+F=>PCG2L)4p+^@jI&dLD@S3Xy);}dTi-2pfK)freTB`8gCj4j&)}s8XQ50~(
z*a7C$M!@6VK+7+hGO*L|-c3spzNJ!9m8C>6qvk9?C<oLwp)<apgaP^H7t?LP!Irxm
z5NsNkpTCW(58U|JG|xg~H5~6GhI(G1<u*)lD4N8YNVEc^c^Q=Mxi&wa<11Gx0)%hU
zvGcn!9XtL~U$u|WC=?5Ydsb~NWNoK<p`j87XiUlVHdYCmzQ-{Sbto9`%s51Ws^L$2
ziF;7q<o?S7<W%fgJy)O@V%zLVe<m5I&>QdP8-WtA1oXqhA}dS5-n+vjl$EuQ_UD?>
zRWM(&N-+EFINL$Pk-GmtJc8gd*)Y^Q5UY^TsR=vs{Yhtq2y0_2X7NXYIXpgm+JEf5
zzUV_m$5vb`+MvZv^=Z|Y2sgz&_6%GmTwk8MuZC<^%X`A&x{Ld{9WQN#NEyRg?Y$b8
z<>L>u30F>>_)}V{uukBdxe$DA)0)Js1!4}krlh^KppR`BJ8l?n#;EoDs)&)m5JNe5
z7On;Qgyjy#8S<GR)Cp19uhj0Yg?W5%`<14MmsQ`JEUPlsi#X+w_ylvQq*)I<?o;+!
zjedYDz&C;O*i}F6u^C*@qre;2$SVH&l~cLKXz!g^)}`Y9Lf(t}k8ZzN*!2}6QZf*Z
ztaoMo^8BtOEg!yNF|vU_`_$3VFVjAr{aN<lS#{d2Tb<<u!b`{^qYog*TV$`m;?t7|
zI1(2BG1@+i2tO>rKZp{7BRED=y<p0JLeP`IG6B*YOsy>hn}E%}`n6xnF}izDHAR!K
zQ%wiwYv7Y+e7J`2Q3u2S7lNP&q!b9v9bXlk{3%>3^xGnkTRT;aaZ=O4M!}ztMZxKK
z+$$Ure}T!;p*KYGH+#K=dO7u78!S6Iz2dt^YbG{e>+;X^*CK8*E|800L~yRI7Murk
zsd>m76+CcI7Md_~F5`G0KZ8e7fT0gullbKIu6+)D8X)MYnSh}y766W+LtHK#9>qGx
z@BR(f8mZadskSSQv-XW5Mfxu>F`pN{e#Sxk4i_PA73hF21I&+o6R@-&I9(w;Nf2R<
zxVD&Ip`}{}9sdo_AKNfArM(`H4{L$&f-a!{fK0>7&;>NWzT;bCo)j_;+1q57F$cU2
z%t>?O|LiyLN9I@@k8mo}YX)3fj2D{CwA%;R_l^g-t>+2!!x;k}aP1Fm(=z*ix{eXz
zHkZk=*Bx|V;DbrWJYjL>a85L%!IWFwh#n42jAO-BdUpWk{;A-2xnJx0I)I}*M_F>S
z*k}E5$oLkYoAYM?A*6iwT=1jdtcV(D??;ty)}Ps<<#!%q9vi=FGgt0u!K9ZZWDP(5
z{`O<&&zOA9xlqs7W6-0sZ9n`stU*IzU@N-dp0vJo98Z^7^8UuP1$=I~@UhQc^Zk?C
zxVK!VVVjzuTu+m)n=KCW+-x7EG0&KG9S{CJ`_Cfaz8K#ejbT}EGg^aX;3mAT%QuJm
zv;S)kjs*Y!000L0ThC#4#RLEV0000000000000000000000000K&3ZYniptjF8}}l
M07*qoM6N<$f`GRF(*OVf

diff --git a/public/app/plugins/datasource/elasticsearch/plugin.json b/public/app/plugins/datasource/elasticsearch/plugin.json
index d4b07ac8e00..62d6a93b3b0 100644
--- a/public/app/plugins/datasource/elasticsearch/plugin.json
+++ b/public/app/plugins/datasource/elasticsearch/plugin.json
@@ -11,8 +11,8 @@
     },
     "keywords": ["elasticsearch"],
     "logos": {
-      "small": "img/logo_large.png",
-      "large": "img/logo_large.png"
+      "small": "img/elasticsearch.svg",
+      "large": "img/elasticsearch.svg"
     },
     "links": [
       {"name": "elastic.co", "url": "https://www.elastic.co/products/elasticsearch"}

From 2749dd8711cf77cce04340c18b157202f86c8ad7 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Mon, 13 Feb 2017 18:47:01 -0800
Subject: [PATCH 084/301] elasticsearch svg

---
 .../elasticsearch/img/elasticsearch.svg       | 80 ++++++++++++++++---
 1 file changed, 68 insertions(+), 12 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
index 7c3078468a0..e9034bcf3c4 100755
--- a/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
+++ b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
@@ -1,12 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet">
-	<g>
-		<path d="M255.95919,134.393266 C255.95919,112.8718 242.586628,94.2755811 222.736732,86.9624613 C223.572517,82.3656432 223.99041,77.9777714 223.99041,73.172007 C223.99041,33.263268 191.603737,0.876594931 151.694998,0.876594931 C128.501961,0.876594931 106.771548,11.9507476 93.1900399,30.9648589 C86.503759,25.741202 78.3548541,23.0249004 69.7880568,23.0249004 C48.6844827,23.0249004 31.3419417,40.1584951 31.3419417,61.4710155 C31.3419417,66.0678336 32.1777268,70.6646517 33.6403507,74.8435772 C13.5815081,81.7388044 0,100.961862 0,122.274382 C0,143.795849 13.3725618,162.601014 33.4314044,169.914134 C32.5956193,174.302005 32.1777268,178.898824 32.1777268,183.704588 C32.1777268,223.404381 64.5643998,255.791054 104.264193,255.791054 C127.666176,255.791054 149.187642,244.507955 162.76915,225.70279 C169.455431,230.926447 177.813282,233.851695 186.38008,233.851695 C207.483654,233.851695 224.826195,216.7181 224.826195,195.405579 C224.826195,190.808761 223.99041,186.211943 222.527786,182.033018 C242.168736,174.928844 255.95919,155.705787 255.95919,134.393266 L255.95919,134.393266 Z" fill="#FFFFFF"></path>
-		<path d="M100.085267,110.364444 L157.127601,136.482729 L214.796773,85.91773 C215.632559,81.7388044 216.050451,77.5598788 216.050451,73.172007 C216.050451,37.6511398 187.215865,8.81655348 151.694998,8.81655348 C130.382477,8.81655348 110.532581,19.2638674 98.6226431,36.8153547 L89.0111143,86.5445688 L100.085267,110.364444 L100.085267,110.364444 Z" fill="#F4BD19"></path>
-		<path d="M40.9534704,170.749919 C40.1176853,174.928844 39.6997928,179.316716 39.6997928,183.704588 C39.6997928,219.225455 68.7433254,248.268988 104.264193,248.268988 C125.785659,248.268988 145.635556,237.612728 157.75444,220.06124 L167.157022,170.332026 L154.411299,146.094258 L97.1600191,119.975973 L40.9534704,170.749919 L40.9534704,170.749919 Z" fill="#3CBEB1"></path>
-		<path d="M40.5355779,71.9183293 L79.6085318,81.1119656 L88.3842755,36.6064084 C82.9516722,32.4274829 76.4743376,30.3380201 69.5791105,30.3380201 C52.654462,30.3380201 38.6550614,44.1284744 38.6550614,61.2620692 C38.6550614,64.8141559 39.2819002,68.5751889 40.5355779,71.9183293 L40.5355779,71.9183293 Z" fill="#E9478C"></path>
-		<path d="M37.1924374,81.3209118 C19.6409501,86.9624613 7.522066,103.88711 7.522066,122.274382 C7.522066,140.243762 18.5962187,156.332626 35.3119209,162.601014 L90.264792,112.8718 L80.2353706,91.3503332 L37.1924374,81.3209118 L37.1924374,81.3209118 Z" fill="#2C458F"></path>
-		<path d="M167.783861,219.852294 C173.216464,224.03122 179.693799,226.329629 186.38008,226.329629 C203.304728,226.329629 217.304129,212.539174 217.304129,195.405579 C217.304129,191.644546 216.67729,188.09246 215.423612,184.749319 L176.350658,175.555683 L167.783861,219.852294 L167.783861,219.852294 Z" fill="#95C63D"></path>
-		<path d="M175.72382,165.317315 L218.766753,175.346737 C236.31824,169.496241 248.437124,152.780539 248.437124,134.393266 C248.437124,116.423886 237.362971,100.543969 220.647269,94.0666348 L164.231774,143.377956 L175.72382,165.317315 L175.72382,165.317315 Z" fill="#176655"></path>
-	</g>
-</svg>
\ No newline at end of file
+
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+   viewBox="0 0 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
+<style type="text/css">
+  .st0{clip-path:url(#SVGID_2_);fill:#F0BF1A;}
+  .st1{clip-path:url(#SVGID_4_);fill:#3EBEB0;}
+  .st2{clip-path:url(#SVGID_6_);fill:#07A5DE;}
+  .st3{clip-path:url(#SVGID_8_);fill:#231F20;}
+  .st4{fill:#D7A229;}
+  .st5{fill:#019B8F;}
+  .st6{fill:none;}
+</style>
+<g>
+  <g>
+    <g>
+      <g>
+        <g>
+          <defs>
+            <circle id="SVGID_1_" cx="40" cy="40" r="32"/>
+          </defs>
+          <clipPath id="SVGID_2_">
+            <use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+          </clipPath>
+          <path class="st0" d="M53.7,26H10c-1.1,0-2-0.9-2-2V10c0-1.1,0.9-2,2-2h57c1.1,0,2,0.9,2,2v0.7C68.9,19.1,62.1,26,53.7,26z"/>
+        </g>
+      </g>
+      <g>
+        <g>
+          <defs>
+            <circle id="SVGID_3_" cx="40" cy="40" r="32"/>
+          </defs>
+          <clipPath id="SVGID_4_">
+            <use xlink:href="#SVGID_3_"  style="overflow:visible;"/>
+          </clipPath>
+          <path class="st1" d="M69.1,72H8.2l0,0V54l0,0h45.7c8.4,0,15.2,6.8,15.2,15.2V72L69.1,72z"/>
+        </g>
+      </g>
+      <g>
+        <g>
+          <defs>
+            <circle id="SVGID_5_" cx="40" cy="40" r="32"/>
+          </defs>
+          <clipPath id="SVGID_6_">
+            <use xlink:href="#SVGID_5_"  style="overflow:visible;"/>
+          </clipPath>
+          <path class="st2" d="M50.1,49H4.8V31h45.3c5,0,9,4,9,9l0,0C59.1,45,55,49,50.1,49z"/>
+        </g>
+      </g>
+      <g>
+        <g>
+          <defs>
+            <circle id="SVGID_7_" cx="40" cy="40" r="32"/>
+          </defs>
+          <clipPath id="SVGID_8_">
+            <use xlink:href="#SVGID_7_"  style="overflow:visible;"/>
+          </clipPath>
+          <path class="st3" d="M36,31H6.4v18H36c0.7-2.7,1.1-5.7,1.1-9S36.7,33.7,36,31z"/>
+        </g>
+      </g>
+    </g>
+    <path class="st4" d="M23.9,12.3c-5.4,3.2-9.9,8-12.7,13.7h23.6C32.4,20.5,28.6,15.9,23.9,12.3z"/>
+    <path class="st5" d="M24.9,68.2c4.6-3.7,8.3-8.6,10.6-14.2H11.2C14.2,60,19,65,24.9,68.2z"/>
+  </g>
+</g>
+<rect class="st6" width="80" height="80"/>
+</svg>

From a1e071d3c565c273ab153e836b8d43cca845701f Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Mon, 13 Feb 2017 18:47:59 -0800
Subject: [PATCH 085/301] missing space

---
 .../app/plugins/datasource/elasticsearch/img/elasticsearch.svg   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
index e9034bcf3c4..33a4d656061 100755
--- a/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
+++ b/public/app/plugins/datasource/elasticsearch/img/elasticsearch.svg
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

From 7867a24d87f2179196a4b94b65f1515b64ccf803 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Mon, 13 Feb 2017 23:30:15 -0800
Subject: [PATCH 086/301] Adding more physics units

---
 public/app/core/utils/kbn.js | 44 ++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js
index 182ab0e309a..819206bf94a 100644
--- a/public/app/core/utils/kbn.js
+++ b/public/app/core/utils/kbn.js
@@ -459,11 +459,19 @@ function($, _) {
   kbn.valueFormats.humidity  = kbn.formatBuilders.fixedUnit('%H');
 
   // Pressure
-  kbn.valueFormats.pressurembar = kbn.formatBuilders.fixedUnit('mbar');
+  kbn.valueFormats.pressurebar  = kbn.formatBuilders.decimalSIPrefix('bar');
+  kbn.valueFormats.pressurembar = kbn.formatBuilders.decimalSIPrefix('bar', -1);
+  kbn.valueFormats.pressurekbar = kbn.formatBuilders.decimalSIPrefix('bar', 1);
   kbn.valueFormats.pressurehpa  = kbn.formatBuilders.fixedUnit('hPa');
   kbn.valueFormats.pressurehg   = kbn.formatBuilders.fixedUnit('"Hg');
   kbn.valueFormats.pressurepsi  = kbn.formatBuilders.scaledUnits(1000, [' psi', ' ksi', ' Mpsi']);
 
+  // Force
+  kbn.valueFormats.forceNm  = kbn.formatBuilders.decimalSIPrefix('Nm');
+  kbn.valueFormats.forcekNm = kbn.formatBuilders.decimalSIPrefix('Nm', 1);
+  kbn.valueFormats.forceN   = kbn.formatBuilders.decimalSIPrefix('N');
+  kbn.valueFormats.forcekN  = kbn.formatBuilders.decimalSIPrefix('N', 1);
+
   // Length
   kbn.valueFormats.lengthm  = kbn.formatBuilders.decimalSIPrefix('m');
   kbn.valueFormats.lengthmm = kbn.formatBuilders.decimalSIPrefix('m', -1);
@@ -480,6 +488,13 @@ function($, _) {
   kbn.valueFormats.litre  = kbn.formatBuilders.decimalSIPrefix('L');
   kbn.valueFormats.mlitre = kbn.formatBuilders.decimalSIPrefix('L', -1);
   kbn.valueFormats.m3     = kbn.formatBuilders.decimalSIPrefix('m3');
+  kbn.valueFormats.gallons  = kbn.formatBuilders.fixedUnit('gal');
+
+  // Flow
+  kbn.valueFormats.flowgpm  = kbn.formatBuilders.fixedUnit('gpm');
+  kbn.valueFormats.flowcms  = kbn.formatBuilders.fixedUnit('cms');
+  kbn.valueFormats.flowcfs  = kbn.formatBuilders.fixedUnit('cfs');
+  kbn.valueFormats.flowcfm  = kbn.formatBuilders.fixedUnit('cfm');
 
   // Time
   kbn.valueFormats.hertz = kbn.formatBuilders.decimalSIPrefix('Hz');
@@ -790,9 +805,10 @@ function($, _) {
       {
         text: 'volume',
         submenu: [
-          {text: 'millilitre',  value: 'mlitre'},
-          {text: 'litre',       value: 'litre' },
-          {text: 'cubic metre', value: 'm3'    },
+          {text: 'millilitre',  value: 'mlitre' },
+          {text: 'litre',       value: 'litre'  },
+          {text: 'cubic metre', value: 'm3'     },
+          {text: 'gallons',     value: 'gallons'},
         ]
       },
       {
@@ -827,10 +843,30 @@ function($, _) {
         text: 'pressure',
         submenu: [
           {text: 'Millibars',         value: 'pressurembar'},
+          {text: 'Bars',              value: 'pressurebar' },
+          {text: 'Kilobars',          value: 'pressurekbar'},
           {text: 'Hectopascals',      value: 'pressurehpa' },
           {text: 'Inches of mercury', value: 'pressurehg'  },
           {text: 'PSI',               value: 'pressurepsi' },
         ]
+      },
+      {
+        text: 'force',
+        submenu: [
+          {text: 'Newton-meters (Nm)',      value: 'forceNm'  },
+          {text: 'Kilonewton-meters (kNm)', value: 'forcekNm' },
+          {text: 'Newtons (N)',             value: 'forceN'   },
+          {text: 'Kilonewtons (kN)',        value: 'forcekN'  },
+        ]
+      },
+      {
+        text: 'flow',
+        submenu: [
+          {text: 'Gallons/min (gpm)',       value: 'flowgpm'  },
+          {text: 'Cubic meters/sec (cms)',  value: 'flowcms'  },
+          {text: 'Cubic feet/sec (cfs)',    value: 'flowcfs'  },
+          {text: 'Cubic feet/min (cfm)',    value: 'flowcfm'  },
+        ]
       }
     ];
   };

From 1c8509ea58cd1be46a29f9aff1fe3c4d3fb57ec9 Mon Sep 17 00:00:00 2001
From: xginn8 <xginn8@users.noreply.github.com>
Date: Tue, 14 Feb 2017 02:49:43 -0500
Subject: [PATCH 087/301] wrap text in annotations modal (#7549)

annotation: wrap text in drop_element, fixes #7542
---
 public/sass/mixins/_drop_element.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/sass/mixins/_drop_element.scss b/public/sass/mixins/_drop_element.scss
index 290e49f4cad..0f7eda19efe 100644
--- a/public/sass/mixins/_drop_element.scss
+++ b/public/sass/mixins/_drop_element.scss
@@ -12,6 +12,7 @@
       color: $theme-color;
       padding: 0.65rem;
       font-size: $font-size-sm;
+      word-wrap: break-word;
       max-width: 20rem;
 
       &:before {

From 0523830716b4fdced7727fd7d38d43065f304926 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 14 Feb 2017 08:56:00 +0100
Subject: [PATCH 088/301] changelog: add note about closing #7542

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c10b14a128a..769d099f702 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 * **Sidemenu**: Disable sign out in sidemenu for AuthProxyEnabled [#7377](https://github.com/grafana/grafana/pull/7377), thx [@solugebefola](https://github.com/solugebefola)
 * **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
 * **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
+* **Annotations**: Wrap text in annotations tooltip [#7549](https://github.com/grafana/grafana/pull/7549), thx [@xginn8](https://github.com/xginn8)
 
 # 4.1.2 (2017-02-13)
 

From 6761661e106de004b97f4f63995ab0301f1f5b8c Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 14 Feb 2017 10:03:23 +0100
Subject: [PATCH 089/301] changelog: adds note about closing #7542

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 769d099f702..316939bac54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@
 * **Sidemenu**: Disable sign out in sidemenu for AuthProxyEnabled [#7377](https://github.com/grafana/grafana/pull/7377), thx [@solugebefola](https://github.com/solugebefola)
 * **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
 * **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
-* **Annotations**: Wrap text in annotations tooltip [#7549](https://github.com/grafana/grafana/pull/7549), thx [@xginn8](https://github.com/xginn8)
+* **Annotations**: Wrap text in annotations tooltip [#7542](https://github.com/grafana/grafana/pull/7542), thx [@xginn8](https://github.com/xginn8)
 
 # 4.1.2 (2017-02-13)
 

From 9f80e8c03dcf2e219ac0259530fbdab3dcdcb78f Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 14 Feb 2017 10:06:31 +0100
Subject: [PATCH 090/301] changelog: rearrange closed issues

---
 CHANGELOG.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 316939bac54..1b92c861bce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,27 @@
 # 4.2.0 (unreleased)
 
 ## Enhancements
-* **Alerting**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
+* **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
 * **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any datasource (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
 * **S3 Image Store**: External s3 image store (used in alert notifications) now support AWS IAM Roles, closes [#6985](https://github.com/grafana/grafana/issues/6985), [#7058](https://github.com/grafana/grafana/issues/7058) thx [@mtanda](https://github.com/mtanda)
-* **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)
-* **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
 * **SingleStat**: Implements diff aggregation method for singlestat [#7234](https://github.com/grafana/grafana/issues/7234), thx [@oliverpool](https://github.com/oliverpool)
 * **Dataproxy**: Added setting to enable more verbose logging in dataproxy [#7209](https://github.com/grafana/grafana/pull/7209), thx [@Ricky-N](https://github.com/Ricky-N)
 * **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
 * **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
+* **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
+* **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+
+## Minor Enhancements
+* **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)
+* **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
 * **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [@lpic10](https://github.com/lpic10)
 * **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
-* **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
-* **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
-* **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 * **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
 * **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
 * **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
 * **Database**: Allow max db connection pool configuration [#7427](https://github.com/grafana/grafana/issues/7427), thx [@huydx](https://github.com/huydx)
 * **Datasources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
+* **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 
 ## Tech
 

From 0c9f664ea088859282566403a2d47abecabd37df Mon Sep 17 00:00:00 2001
From: Ryuichi Sakai <ryu1.sakai@gmail.com>
Date: Sat, 4 Feb 2017 18:42:00 +0900
Subject: [PATCH 091/301] Make timeout for snapshot creation configurable

---
 .../app/features/dashboard/partials/shareModal.html | 13 +++++++++++++
 public/app/features/dashboard/shareSnapshotCtrl.js  |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/partials/shareModal.html
index bab75a7f523..f9bf5ccf4ad 100644
--- a/public/app/features/dashboard/partials/shareModal.html
+++ b/public/app/features/dashboard/partials/shareModal.html
@@ -148,6 +148,19 @@
 					</div>
 				</div>
 
+				<div ng-if="step === 1">
+					<p class="share-modal-info-text">
+						You may need to configure the timeout value if it takes a long time to collect your dashboard's metrics.
+					</p>
+				</div>
+
+				<div class="gf-form-group share-modal-options">
+					<div class="gf-form" ng-if="step === 1">
+						<span class="gf-form-label width-12">Timeout (seconds)</span>
+						<input type="number" ng-model="snapshot.timeoutSeconds" class="gf-form-input max-width-15" >
+					</div>
+				</div>
+
 				<div ng-if="step === 1" class="gf-form-button-row">
 					<button class="btn gf-form-btn width-10 btn-success" ng-click="createSnapshot()" ng-disabled="loading">
 						<i class="fa fa-save"></i>
diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js
index f9dd78dba43..361db2d55b4 100644
--- a/public/app/features/dashboard/shareSnapshotCtrl.js
+++ b/public/app/features/dashboard/shareSnapshotCtrl.js
@@ -12,6 +12,7 @@ function (angular, _) {
     $scope.snapshot = {
       name: $scope.dashboard.title,
       expires: 0,
+      timeoutSeconds: 4,
     };
 
     $scope.step = 1;
@@ -55,7 +56,7 @@ function (angular, _) {
 
       $timeout(function() {
         $scope.saveSnapshot(external);
-      }, 4000);
+      }, $scope.snapshot.timeoutSeconds * 1000);
     };
 
     $scope.saveSnapshot = function(external) {

From 6861c6033c482dcca8a7013d6a5d102fbcff6f30 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 14 Feb 2017 10:21:07 +0100
Subject: [PATCH 092/301] Changelog: add 7449 - minor enhancement to 4.2.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b92c861bce..b6f91df4e83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 * **Database**: Allow max db connection pool configuration [#7427](https://github.com/grafana/grafana/issues/7427), thx [@huydx](https://github.com/huydx)
 * **Datasources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
+* **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
 
 ## Tech
 

From 73bec813fcca8594f13acc460bb4ca16a0058278 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 14 Feb 2017 10:40:55 +0100
Subject: [PATCH 093/301] docs: adds delete datasource by name

---
 docs/sources/http_api/data_source.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md
index dd8cbc9aa74..f15411e5eff 100644
--- a/docs/sources/http_api/data_source.md
+++ b/docs/sources/http_api/data_source.md
@@ -195,7 +195,7 @@ parent = "http_api"
 
     {"message":"Datasource updated", "id": 1, "name": "test_datasource"}
 
-## Delete an existing data source
+## Delete an existing data source by id
 
 `DELETE /api/datasources/:datasourceId`
 
@@ -213,6 +213,24 @@ parent = "http_api"
 
     {"message":"Data source deleted"}
 
+## Delete an existing data source by name
+
+`DELETE /api/datasources/name/:datasourceName`
+
+**Example Request**:
+
+    DELETE /api/datasources/name/test_datasource HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+**Example Response**:
+
+    HTTP/1.1 200
+    Content-Type: application/json
+
+    {"message":"Data source deleted"}
+
 ## Data source proxy calls
 
 `GET /api/datasources/proxy/:datasourceId/*`

From 5304e7b22097c71c9c599c1fd3c31c541d62a248 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 14 Feb 2017 11:22:47 +0100
Subject: [PATCH 094/301] changelog: adds #7554 - minor enhancement to 4.2.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6f91df4e83..82772007f08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * **Datasources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
+* **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
 
 ## Tech
 

From e97cab9964ee06ff4f5a1273fed626210be7d3ad Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 14 Feb 2017 11:59:48 +0100
Subject: [PATCH 095/301] docs: removes version selector from influxdb

---
 docs/sources/features/datasources/influxdb.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/sources/features/datasources/influxdb.md b/docs/sources/features/datasources/influxdb.md
index c271571aa31..03dc26bcc26 100644
--- a/docs/sources/features/datasources/influxdb.md
+++ b/docs/sources/features/datasources/influxdb.md
@@ -23,7 +23,6 @@ Grafana ships with very feature rich data source plugin for InfluxDB. Supporting
     > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
 
 3. Click the `Add new` link in the top header.
-4. Select `InfluxDB 0.9.x` or `InfluxDB 0.8.x` from the dropdown.
 
 Name | Description
 ------------ | -------------

From 423e8686ef98694351a02c78ccab71d7f9a9f1d9 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 14 Feb 2017 12:56:49 +0100
Subject: [PATCH 096/301] docs: fixes markdown formating

---
 docs/sources/http_api/user.md | 47 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/docs/sources/http_api/user.md b/docs/sources/http_api/user.md
index 2309b56fa2a..6f849947416 100644
--- a/docs/sources/http_api/user.md
+++ b/docs/sources/http_api/user.md
@@ -71,36 +71,35 @@ parent = "http_api"
 
 ## Get single user by Username(login) or Email
 
-    `GET /api/users/lookup`
+`GET /api/users/lookup?loginOrEmail=user@mygraf.com`
 
-    **Parameter:** `loginOrEmail`
+**Example Request using the email as option**:
 
-    **Example Request using the email as option**:
+    GET /api/users/lookup?loginOrEmail=user@mygraf.com HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
-        GET /api/users/lookup?loginOrEmail=user@mygraf.com HTTP/1.1
-        Accept: application/json
-        Content-Type: application/json
-        Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+**Example Request using the username as option**:
+    
+    GET /api/users/lookup?loginOrEmail=admin HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
-    **Example Request using the username as option**:
-        GET /api/users/lookup?loginOrEmail=admin HTTP/1.1
-        Accept: application/json
-        Content-Type: application/json
-        Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+**Example Response**:
 
-    **Example Response**:
+    HTTP/1.1 200
+    Content-Type: application/json
 
-        HTTP/1.1 200
-        Content-Type: application/json
-
-        {
-          "email": "user@mygraf.com"
-          "name": "admin",
-          "login": "admin",
-          "theme": "light",
-          "orgId": 1,
-          "isGrafanaAdmin": true
-        }
+    {
+      "email": "user@mygraf.com"
+      "name": "admin",
+      "login": "admin",
+      "theme": "light",
+      "orgId": 1,
+      "isGrafanaAdmin": true
+    }
 
 
 ## User Update

From c9d46545925f6e0ce946d3de660944cff481a7cb Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 07:43:16 +1100
Subject: [PATCH 097/301] s/from_adress/from_address

---
 pkg/services/notifications/notifications.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index 095ce15ef32..01e1d5478ac 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -48,7 +48,7 @@ func Init() error {
 	}
 
 	if !util.IsEmail(setting.Smtp.FromAddress) {
-		return errors.New("Invalid email address for smpt from_adress config")
+		return errors.New("Invalid email address for smpt from_address config")
 	}
 
 	if setting.EmailCodeValidMinutes == 0 {

From 7dc6b69c8b5e1d447ec06bb1144a5097cc853e53 Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 07:43:59 +1100
Subject: [PATCH 098/301] s/smpt/SMTP

---
 pkg/services/notifications/notifications.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index 01e1d5478ac..c765774d062 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -48,7 +48,7 @@ func Init() error {
 	}
 
 	if !util.IsEmail(setting.Smtp.FromAddress) {
-		return errors.New("Invalid email address for smpt from_address config")
+		return errors.New("Invalid email address for SMTP from_address config")
 	}
 
 	if setting.EmailCodeValidMinutes == 0 {

From 90cbfacacf4d0e6a5d4ce65ccf3e861883b9aeb2 Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 07:45:28 +1100
Subject: [PATCH 099/301] Add `FromName` to SmtpSettings struct

Updates the `SmtpSettings` struct to include a value for setting the
name of the email sender.
---
 pkg/setting/setting_smtp.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/setting/setting_smtp.go b/pkg/setting/setting_smtp.go
index e84b61634cc..db065070620 100644
--- a/pkg/setting/setting_smtp.go
+++ b/pkg/setting/setting_smtp.go
@@ -8,6 +8,7 @@ type SmtpSettings struct {
 	CertFile    string
 	KeyFile     string
 	FromAddress string
+	FromName    string
 	SkipVerify  bool
 
 	SendWelcomeEmailOnSignUp bool
@@ -23,6 +24,7 @@ func readSmtpSettings() {
 	Smtp.CertFile = sec.Key("cert_file").String()
 	Smtp.KeyFile = sec.Key("key_file").String()
 	Smtp.FromAddress = sec.Key("from_address").String()
+	Smtp.FromName = sec.Key("from_name").String()
 	Smtp.SkipVerify = sec.Key("skip_verify").MustBool(false)
 
 	emails := Cfg.Section("emails")

From 66445faeb597dacd44337473aaa271ca7f39586f Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 07:51:41 +1100
Subject: [PATCH 100/301] Format mailer `From` field to include name

Updates the messafe `From` field to include the name and email of the
sender.
---
 pkg/services/notifications/mailer.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go
index 1ca4df8877a..ae1348cbf99 100644
--- a/pkg/services/notifications/mailer.go
+++ b/pkg/services/notifications/mailer.go
@@ -150,7 +150,7 @@ func buildEmailMessage(cmd *m.SendEmailCommand) (*Message, error) {
 
 	return &Message{
 		To:           cmd.To,
-		From:         setting.Smtp.FromAddress,
+		From:         fmt.Sprintf("%s <%s>", setting.Smtp.FromName, setting.Smtp.FromAddress),
 		Subject:      subject,
 		Body:         buffer.String(),
 		EmbededFiles: cmd.EmbededFiles,

From 796957c8c6e17c3e55a69a328d635821c1d911d9 Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 08:04:21 +1100
Subject: [PATCH 101/301] Update mailer tests to include `FromName`

---
 pkg/services/notifications/notifications_test.go          | 1 +
 pkg/services/notifications/send_email_integration_test.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go
index 79db664e893..3a5ff5fedb7 100644
--- a/pkg/services/notifications/notifications_test.go
+++ b/pkg/services/notifications/notifications_test.go
@@ -23,6 +23,7 @@ func TestNotifications(t *testing.T) {
 		setting.Smtp.Enabled = true
 		setting.Smtp.TemplatesPattern = "emails/*.html"
 		setting.Smtp.FromAddress = "from@address.com"
+		setting.Smtp.FromName = "Grafana Admin"
 
 		err := Init()
 		So(err, ShouldBeNil)
diff --git a/pkg/services/notifications/send_email_integration_test.go b/pkg/services/notifications/send_email_integration_test.go
index 1a4406dc13a..7a616b7e40d 100644
--- a/pkg/services/notifications/send_email_integration_test.go
+++ b/pkg/services/notifications/send_email_integration_test.go
@@ -18,6 +18,7 @@ func TestEmailIntegrationTest(t *testing.T) {
 		setting.Smtp.Enabled = true
 		setting.Smtp.TemplatesPattern = "emails/*.html"
 		setting.Smtp.FromAddress = "from@address.com"
+		setting.Smtp.FromName = "Grafana Admin"
 		setting.BuildVersion = "4.0.0"
 
 		err := Init()

From 7520b4f4043b57dfeac3bc9f2827274727e4a9f5 Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 08:06:58 +1100
Subject: [PATCH 102/301] Update default configuration to include `from_name`
 values

---
 conf/defaults.ini | 1 +
 conf/sample.ini   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 4606de9212e..95161ac3a3d 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -296,6 +296,7 @@ cert_file =
 key_file =
 skip_verify = false
 from_address = admin@grafana.localhost
+from_name = Grafana Admin
 
 [emails]
 welcome_email_on_sign_up = false
diff --git a/conf/sample.ini b/conf/sample.ini
index eaedfcc6f5e..df6b18833e2 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -282,6 +282,7 @@
 ;key_file =
 ;skip_verify = false
 ;from_address = admin@grafana.localhost
+;from_name = Grafana Admin
 
 [emails]
 ;welcome_email_on_sign_up = false

From 6a9247500a418789fae8d337c1e6a32076fd2110 Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Wed, 15 Feb 2017 08:07:29 +1100
Subject: [PATCH 103/301] Update documentation to include information about
 from_name values

---
 docs/sources/http_api/admin.md             | 3 ++-
 docs/sources/installation/configuration.md | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/sources/http_api/admin.md b/docs/sources/http_api/admin.md
index 8aa00d08618..9a77e7fb2a4 100644
--- a/docs/sources/http_api/admin.md
+++ b/docs/sources/http_api/admin.md
@@ -158,6 +158,7 @@ with Grafana admin permission.
         "cert_file":"",
         "enabled":"false",
         "from_address":"admin@grafana.localhost",
+        "from_name":"Grafana Admin",
         "host":"localhost:25",
         "key_file":"",
         "password":"************",
@@ -292,4 +293,4 @@ Change password for specific user
     HTTP/1.1 200
     Content-Type: application/json
 
-    {state: "new state", message: "alerts pause/un paused", "alertsAffected": 100}    
+    {state: "new state", message: "alerts pause/un paused", "alertsAffected": 100}
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 4d22d12dd9b..01f805ff175 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -542,6 +542,9 @@ Verify SSL for smtp server? defaults to `false`
 ### from_address
 Address used when sending out emails, defaults to `admin@grafana.localhost`
 
+### from_name
+Name to be used when sending out emails, defaults to `Grafana Admin`
+
 ## [log]
 
 ### mode

From 79cd48f64c7e0ca876c4fa903796750c41be4985 Mon Sep 17 00:00:00 2001
From: Jan Garaj <info@monitoringartist.com>
Date: Wed, 15 Feb 2017 07:12:24 +0000
Subject: [PATCH 104/301] Cloudwatch AWS/SES metrics (#7568)

---
 pkg/api/cloudwatch/metrics.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
index 0df8eaa089c..6b953bdf0fc 100644
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -82,6 +82,7 @@ func init() {
 		"AWS/RDS":              {"ActiveTransactions", "AuroraBinlogReplicaLag", "AuroraReplicaLag", "AuroraReplicaLagMaximum", "AuroraReplicaLagMinimum", "BinLogDiskUsage", "BlockedTransactions", "BufferCacheHitRatio", "CommitLatency", "CommitThroughput", "CPUCreditBalance", "CPUCreditUsage", "CPUUtilization", "DatabaseConnections", "DDLLatency", "DDLThroughput", "Deadlocks", "DiskQueueDepth", "DMLLatency", "DMLThroughput", "FailedSqlStatements", "FreeableMemory", "FreeStorageSpace", "LoginFailures", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "ReadIOPS", "ReadLatency", "ReadThroughput", "ReplicaLag", "ResultSetCacheHitRatio", "SelectLatency", "SelectThroughput", "SwapUsage", "TotalConnections", "VolumeReadIOPS", "VolumeWriteIOPS", "WriteIOPS", "WriteLatency", "WriteThroughput"},
 		"AWS/Route53":          {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"},
 		"AWS/S3":               {"BucketSizeBytes", "NumberOfObjects"},
+		"AWS/SES":              {"Bounce", "Complaint", "Delivery", "Reject", "Send"},
 		"AWS/SNS":              {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"},
 		"AWS/SQS":              {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"},
 		"AWS/StorageGateway": {"CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "CloudBytesDownloaded", "CloudDownloadLatency", "CloudBytesUploaded", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "QueuedWrites", "ReadBytes", "ReadTime", "TotalCacheSize", "WriteBytes", "WriteTime", "TimeSinceLastRecoveryPoint", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed",
@@ -123,6 +124,7 @@ func init() {
 		"AWS/RDS":              {"DBInstanceIdentifier", "DBClusterIdentifier", "DatabaseClass", "EngineName"},
 		"AWS/Route53":          {"HealthCheckId"},
 		"AWS/S3":               {"BucketName", "StorageType"},
+		"AWS/SES":              {},
 		"AWS/SNS":              {"Application", "Platform", "TopicName"},
 		"AWS/SQS":              {"QueueName"},
 		"AWS/StorageGateway":   {"GatewayId", "GatewayName", "VolumeId"},

From e573006283edffa0cc9e8d25acc22b74e1457cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 15 Feb 2017 08:40:20 +0100
Subject: [PATCH 105/301] docs(): added cla

---
 docs/sources/contribute/cla.md   | 92 ++++++++++++++++++++++++++++++++
 docs/sources/contribute/index.md | 12 +++++
 2 files changed, 104 insertions(+)
 create mode 100644 docs/sources/contribute/cla.md
 create mode 100644 docs/sources/contribute/index.md

diff --git a/docs/sources/contribute/cla.md b/docs/sources/contribute/cla.md
new file mode 100644
index 00000000000..ab35770eb30
--- /dev/null
+++ b/docs/sources/contribute/cla.md
@@ -0,0 +1,92 @@
++++
+title = "Contributor Licence Agreement (CLA)"
+description = "Contributer Licence Agreement (CLA)"
+type = "docs"
+aliases = ["/project/cla"]
+[menu.docs]
+parent = "contribute"
+weight = 1
++++
+
+# Grafana Contributor License Agreement
+
+## Why is this agreement necessary?
+We very much appreciate your wanting to contribute to Grafana,
+but we need to add you to the contributors list first.
+
+
+Note that the following agreement is not a transfer of copyright ownership,
+this simply is a license agreement for contributions. You also do not change
+your rights to use your own contributions for any other purpose.
+
+
+For some background on why contributor license agreements are necessary,
+you can read FAQs from many other open source projects:
+
+- [Django's excellent CLA FAQ](https://www.djangoproject.com/foundation/cla/faq/)
+- [A well-written chapter from Karl Fogel's Producing Open Source Software on CLAs](http://producingoss.com/en/copyright-assignment.html)
+- [The Wikipedia article on CLAs](http://en.wikipedia.org/wiki/Contributor_license_agreement)
+
+This is part of the legal framework of the open-source ecosystem that adds some red tape,
+but protects both the contributor and the company / foundation behind the project.
+It also gives us the option to relicense the code with a more permissive license in the future.
+
+
+If you have more questions, shoot us an [email](mailto:torkel@grafana.org) or drop by #grafana on IRC (freenode).
+
+Many thanks to [RethinkDB](http://rethinkdb.com) for permission to re-use their CLA!
+
+## Terms of the Agreement
+
+<hr>
+
+This Contributor License Agreement (“Agreement”) is entered into between Coding Instinct AB,
+a Swedish corporation (“Grafana,” “we” or “us” etc.) and you (as defined and further identified below).
+Accordingly, you hereby agree to the following terms for your past, present and future contributions
+submitted to Grafana:
+
+
+**1. Definitions:**
+<strong>(a)</strong> "You" (or "your") shall mean the contribution copyright owner (whether an individual or organization) or legal entity authorized by the copyright owner that is making this Agreement with Grafana.
+
+
+<strong>(b)</strong> "Contribution(s)" shall mean the code, documentation or other original works of authorship, including any modifications or additions to an existing work, submitted by you to Grafana for inclusion in, or documentation of, any of the products or projects owned or managed by Grafana (the "work(s)"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Grafana or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Grafana for the purpose of discussing and/or improving the work, but excluding communication that is conspicuously marked or otherwise designated in writing by you as "Not a Contribution."
+
+**2. Grant of Copyright License.**
+You hereby grant to Grafana and to recipients of software distributed by Grafana a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works.
+
+
+**3. Grant of Patent License.**
+With respect to any patents you own, or that you can license without payment to any third party, you hereby grant Grafana a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free license to: (i) make, have made, use, sell, offer to sell, import, and otherwise distribute and exploit your contributions in whole or in part, alone or in combination with or included in any product, work or materials arising out of or relating to the Works to which your contributions were submitted; and (ii) sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements.
+
+
+**4. Rights.**
+Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under this agreement are effective on the date you first submitted a contribution to us, even if your submission took place before the date you entered this agreement.
+
+
+**5. You represent and warrant that:**
+<strong>(i)</strong> the contributions are an original work and that you can legally grant the rights set out in this agreement;
+
+
+<strong>(ii)</strong> the contributions and Grafana’s exercise of any license rights granted hereunder, does not and will not, infringe the rights of any third party;
+
+
+<strong>(iii)</strong> you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions, including without limitation any claims or allegations that any or all of the contributions infringes, violates, or misappropriate the intellectual property rights of any third party (you further agree that you will notify Grafana immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges).
+
+
+**6. Employer Rights.**
+If your employer(s) has rights to intellectual property that you create that includes your contributions, you represent and warrant that your employer has waived such rights for your contributions to Grafana, or that you have received permission to make contributions on behalf of that employer and that you are authorized to execute this agreement on behalf of your employer.
+
+
+**7. Support.**
+You are not expected to provide support for your contributions, except to the extent you desire to provide support. You may provide support for free, for a fee, or not at all. Except as set forth herein, and unless required by applicable law or agreed to in writing, you provide your contributions on an "as is" basis, without warranties or conditions of any kind.
+
+
+**8. Enforcement.**
+
+The failure of either party to enforce its rights under this agreement for any period shall not be construed as a waiver of such rights. No changes or modifications or waivers to this Agreement will be effective unless in writing and signed by both parties. In the event that any provision of this agreement shall be determined to be illegal or unenforceable, that provision will be limited or eliminated to the minimum extent necessary so that this agreement shall otherwise remain in full force and effect and enforceable. This agreement shall be governed by and construed in accordance with the laws of the State of California in the United States without regard to the conflicts of laws provisions thereof. In any action or proceeding to enforce rights under this agreement, the prevailing party will be entitled to recover costs and attorneys’ fees.
+
+### Sign using CLA-Assistant
+
+[https://cla-assistant.io/grafana/grafana](https://cla-assistant.io/grafana/grafana)
+
diff --git a/docs/sources/contribute/index.md b/docs/sources/contribute/index.md
new file mode 100644
index 00000000000..6a8d47ddf3f
--- /dev/null
+++ b/docs/sources/contribute/index.md
@@ -0,0 +1,12 @@
++++
+title = "Contribute"
+description = "Contribute"
+type = "docs"
+[menu.docs]
+name = "Contribute"
+identifier = "contribute"
+weight = 20
++++
+
+### Contribute info
+

From 8b25ba6a7c8c26191704ddfe77dec524072cf13c Mon Sep 17 00:00:00 2001
From: Dennis Wiemer <dvotion@users.noreply.github.com>
Date: Wed, 15 Feb 2017 08:47:20 +0100
Subject: [PATCH 106/301] Added click events in graph to core eventbus (#7511)

---
 public/app/plugins/panel/graph/graph.ts         | 1 +
 public/app/plugins/panel/graph/graph_tooltip.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 910ef335599..3b120edcd4a 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -253,6 +253,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
             backgroundColor: null,
             borderWidth: 0,
             hoverable: true,
+            clickable: true,
             color: '#c8c8c8',
             margin: { left: 0, right: 0 },
           },
diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js
index 1de99c42da7..ba1458d66d0 100644
--- a/public/app/plugins/panel/graph/graph_tooltip.js
+++ b/public/app/plugins/panel/graph/graph_tooltip.js
@@ -162,6 +162,10 @@ function ($, core) {
       appEvents.emit('graph-hover', {pos: pos, panel: panel});
     });
 
+    elem.bind("plotclick", function (event, pos, item) {
+      appEvents.emit('graph-click', {pos: pos, panel: panel, item: item});
+    });
+
     this.clear = function(plot) {
       $tooltip.detach();
       plot.clearCrosshair();

From 8144b73544b51503a8bbada7c21afe5e60993715 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 15 Feb 2017 10:44:43 +0100
Subject: [PATCH 107/301] changelog: adds note about closing #2131

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82772007f08..777ce084d53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
 * **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
+* **Email**: Add sender's name on email [#2131](https://github.com/grafana/grafana/issues/2131) thx [@jacobbednarz](https://github.com/jacobbednarz)
 
 ## Tech
 

From 6dfdcd7ca565d7cacafc4ec0ce69091cdc0d7374 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 15 Feb 2017 10:45:04 +0100
Subject: [PATCH 108/301] email: change default from name to Grafana

Changes default from name in smtp settings
from Grafana Admin to Grafana.

Fix for integration test (which is skipped but that
did not work)
---
 conf/defaults.ini                                         | 2 +-
 conf/sample.ini                                           | 2 +-
 docs/sources/http_api/admin.md                            | 2 +-
 docs/sources/installation/configuration.md                | 2 +-
 pkg/services/notifications/send_email_integration_test.go | 5 ++++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 95161ac3a3d..d8b53b167ca 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -296,7 +296,7 @@ cert_file =
 key_file =
 skip_verify = false
 from_address = admin@grafana.localhost
-from_name = Grafana Admin
+from_name = Grafana
 
 [emails]
 welcome_email_on_sign_up = false
diff --git a/conf/sample.ini b/conf/sample.ini
index df6b18833e2..969c64cb036 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -282,7 +282,7 @@
 ;key_file =
 ;skip_verify = false
 ;from_address = admin@grafana.localhost
-;from_name = Grafana Admin
+;from_name = Grafana
 
 [emails]
 ;welcome_email_on_sign_up = false
diff --git a/docs/sources/http_api/admin.md b/docs/sources/http_api/admin.md
index 9a77e7fb2a4..950ea4c8202 100644
--- a/docs/sources/http_api/admin.md
+++ b/docs/sources/http_api/admin.md
@@ -158,7 +158,7 @@ with Grafana admin permission.
         "cert_file":"",
         "enabled":"false",
         "from_address":"admin@grafana.localhost",
-        "from_name":"Grafana Admin",
+        "from_name":"Grafana",
         "host":"localhost:25",
         "key_file":"",
         "password":"************",
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 01f805ff175..6805188be05 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -543,7 +543,7 @@ Verify SSL for smtp server? defaults to `false`
 Address used when sending out emails, defaults to `admin@grafana.localhost`
 
 ### from_name
-Name to be used when sending out emails, defaults to `Grafana Admin`
+Name to be used when sending out emails, defaults to `Grafana`
 
 ## [log]
 
diff --git a/pkg/services/notifications/send_email_integration_test.go b/pkg/services/notifications/send_email_integration_test.go
index 7a616b7e40d..a9a5215d3ca 100644
--- a/pkg/services/notifications/send_email_integration_test.go
+++ b/pkg/services/notifications/send_email_integration_test.go
@@ -25,6 +25,8 @@ func TestEmailIntegrationTest(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		addToMailQueue = func(msg *Message) {
+			So(msg.From, ShouldEqual, "Grafana Admin <from@address.com>")
+			So(msg.To[0], ShouldEqual, "asdf@asdf.com")
 			ioutil.WriteFile("../../../tmp/test_email.html", []byte(msg.Body), 0777)
 		}
 
@@ -41,6 +43,7 @@ func TestEmailIntegrationTest(t *testing.T) {
 					"RuleUrl":       "http://localhost:3000/dashboard/db/graphite-dashboard",
 					"ImageLink":     "http://localhost:3000/render/dashboard-solo/db/graphite-dashboard?panelId=1&from=1471008499616&to=1471012099617&width=1000&height=500",
 					"AlertPageUrl":  "http://localhost:3000/alerting",
+					"EmbededImage":  "test.png",
 					"EvalMatches": []map[string]string{
 						{
 							"Metric": "desktop",
@@ -52,7 +55,7 @@ func TestEmailIntegrationTest(t *testing.T) {
 						},
 					},
 				},
-				To:       []string{"asdf@asdf.com "},
+				To:       []string{"asdf@asdf.com"},
 				Template: "alert_notification.html",
 			}
 

From c8c30219875e270c062bed97bae2523449c1b290 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 15 Feb 2017 09:46:33 +0100
Subject: [PATCH 109/301] docs: tutorial for setting up grafana as HA

ref #7541
---
 docs/sources/tutorials/ha_setup.md | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 docs/sources/tutorials/ha_setup.md

diff --git a/docs/sources/tutorials/ha_setup.md b/docs/sources/tutorials/ha_setup.md
new file mode 100644
index 00000000000..998b382a43f
--- /dev/null
+++ b/docs/sources/tutorials/ha_setup.md
@@ -0,0 +1,40 @@
++++
+title = "Setup Grafana for High availability"
+type = "docs"
+keywords = ["grafana", "tutorials", "HA", "high availability"]
+[menu.docs]
+parent = "tutorials"
+weight = 10
++++
+
+# How to setup Grafana for high availability
+
+> Alerting does not support high availability yet.
+
+Setting up Grafana for high availability is fairly simple. It comes down to two things:
+
+  * Use a shared database for multiple grafana instances.
+  * Consider how user sessions are stored.
+
+## Configure multiple servers to use the same database
+
+First you need to do is to setup mysql or postgres on another server and configure Grafana to use that database.
+You can find the configuration for doing that in the [[database]]({{< relref "configuration.md" >}}#database) section in the grafana config.
+Grafana will now persist all long term data in the database. 
+It also worth considering how to setup the database for high availability but thats outside the scope of this guide.
+
+## User sessions
+
+The second thing to consider is how to deal with user sessions and how to balance the load between servers. 
+By default Grafana stores user sessions on disk which works fine if you use `sticky sessions` in your load balancer. 
+Grafana also supports storing the session data in the database, redis or memcache which makes it possible to use round robin in your load balancer. 
+If you use mysql/postgres for session storage you first need a table to store the session data in. More details about that in [[sessions]]({{< relref "configuration.md" >}}#session) 
+
+For Grafana itself it doesn't really matter if you store your sessions on disk or database/redis/memcache.
+But we suggest that you store the session in redis/memcache since it makes it easier to add/remote instances from the group. 
+
+## Alerting
+
+Currently alerting does not support high availability. But this is something that we will be working on in the future. 
+
+

From f14e25612e759ffd9d1bacded421bfa938760dac Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 15 Feb 2017 14:15:42 +0100
Subject: [PATCH 110/301] annotations: go vet fixes

---
 pkg/services/annotations/annotations.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/services/annotations/annotations.go b/pkg/services/annotations/annotations.go
index 3fc3bafe5c5..d9d15bca34b 100644
--- a/pkg/services/annotations/annotations.go
+++ b/pkg/services/annotations/annotations.go
@@ -11,14 +11,14 @@ type Repository interface {
 type ItemQuery struct {
 	OrgId       int64    `json:"orgId"`
 	From        int64    `json:"from"`
-	To          int64    `json:"from"`
+	To          int64    `json:"to"`
 	Type        ItemType `json:"type"`
 	AlertId     int64    `json:"alertId"`
 	DashboardId int64    `json:"dashboardId"`
 	PanelId     int64    `json:"panelId"`
 	NewState    []string `json:"newState"`
 
-	Limit int64 `json:"alertId"`
+	Limit int64 `json:"limit"`
 }
 
 type DeleteParams struct {
@@ -48,7 +48,7 @@ type Item struct {
 	OrgId       int64    `json:"orgId"`
 	DashboardId int64    `json:"dashboardId"`
 	PanelId     int64    `json:"panelId"`
-	CategoryId  int64    `json:"panelId"`
+	CategoryId  int64    `json:"categoryId"`
 	Type        ItemType `json:"type"`
 	Title       string   `json:"title"`
 	Text        string   `json:"text"`

From bd010289b23afb637b36245d12a592274a6a9605 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 13 Feb 2017 12:43:12 +0100
Subject: [PATCH 111/301] alerting: images in alert notifications is now
 optional

its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.

closes #7419
---
 pkg/services/alerting/interfaces.go           | 12 +++++
 pkg/services/alerting/notifier.go             | 50 ++++++++-----------
 pkg/services/alerting/notifiers/base.go       | 22 ++++----
 pkg/services/alerting/result_handler.go       |  6 +--
 pkg/services/alerting/test_notification.go    | 10 ++--
 .../alerting/notification_edit_ctrl.ts        |  3 +-
 .../alerting/partials/notification_edit.html  | 23 +++++----
 7 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go
index 566fbdb2898..0955155575c 100644
--- a/pkg/services/alerting/interfaces.go
+++ b/pkg/services/alerting/interfaces.go
@@ -21,6 +21,18 @@ type Notifier interface {
 	GetIsDefault() bool
 }
 
+type NotifierSlice []Notifier
+
+func (notifiers NotifierSlice) ShouldUploadImage() bool {
+	for _, notifier := range notifiers {
+		if notifier.NeedsImage() {
+			return true
+		}
+	}
+
+	return false
+}
+
 type ConditionResult struct {
 	Firing      bool
 	NoDataFound bool
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
index 7e213058cd0..e831b566b22 100644
--- a/pkg/services/alerting/notifier.go
+++ b/pkg/services/alerting/notifier.go
@@ -21,37 +21,25 @@ type NotifierPlugin struct {
 	Factory         NotifierFactory `json:"-"`
 }
 
-type RootNotifier struct {
+type NotificationService interface {
+	Send(context *EvalContext) error
+}
+
+func NewNotificationService() NotificationService {
+	return newNotificationService()
+}
+
+type notificationService struct {
 	log log.Logger
 }
 
-func NewRootNotifier() *RootNotifier {
-	return &RootNotifier{
+func newNotificationService() *notificationService {
+	return &notificationService{
 		log: log.New("alerting.notifier"),
 	}
 }
 
-func (n *RootNotifier) GetType() string {
-	return "root"
-}
-
-func (n *RootNotifier) NeedsImage() bool {
-	return false
-}
-
-func (n *RootNotifier) PassesFilter(rule *Rule) bool {
-	return false
-}
-
-func (n *RootNotifier) GetNotifierId() int64 {
-	return 0
-}
-
-func (n *RootNotifier) GetIsDefault() bool {
-	return false
-}
-
-func (n *RootNotifier) Notify(context *EvalContext) error {
+func (n *notificationService) Send(context *EvalContext) error {
 	notifiers, err := n.getNotifiers(context.Rule.OrgId, context.Rule.Notifications, context)
 	if err != nil {
 		return err
@@ -63,14 +51,16 @@ func (n *RootNotifier) Notify(context *EvalContext) error {
 		return nil
 	}
 
-	if err = n.uploadImage(context); err != nil {
-		n.log.Error("Failed to upload alert panel image.", "error", err)
+	if notifiers.ShouldUploadImage() {
+		if err = n.uploadImage(context); err != nil {
+			n.log.Error("Failed to upload alert panel image.", "error", err)
+		}
 	}
 
 	return n.sendNotifications(context, notifiers)
 }
 
-func (n *RootNotifier) sendNotifications(context *EvalContext, notifiers []Notifier) error {
+func (n *notificationService) sendNotifications(context *EvalContext, notifiers []Notifier) error {
 	g, _ := errgroup.WithContext(context.Ctx)
 
 	for _, notifier := range notifiers {
@@ -82,7 +72,7 @@ func (n *RootNotifier) sendNotifications(context *EvalContext, notifiers []Notif
 	return g.Wait()
 }
 
-func (n *RootNotifier) uploadImage(context *EvalContext) (err error) {
+func (n *notificationService) uploadImage(context *EvalContext) (err error) {
 	uploader, err := imguploader.NewImageUploader()
 	if err != nil {
 		return err
@@ -116,7 +106,7 @@ func (n *RootNotifier) uploadImage(context *EvalContext) (err error) {
 	return nil
 }
 
-func (n *RootNotifier) getNotifiers(orgId int64, notificationIds []int64, context *EvalContext) ([]Notifier, error) {
+func (n *notificationService) getNotifiers(orgId int64, notificationIds []int64, context *EvalContext) (NotifierSlice, error) {
 	query := &m.GetAlertNotificationsToSendQuery{OrgId: orgId, Ids: notificationIds}
 
 	if err := bus.Dispatch(query); err != nil {
@@ -137,7 +127,7 @@ func (n *RootNotifier) getNotifiers(orgId int64, notificationIds []int64, contex
 	return result, nil
 }
 
-func (n *RootNotifier) createNotifierFor(model *m.AlertNotification) (Notifier, error) {
+func (n *notificationService) createNotifierFor(model *m.AlertNotification) (Notifier, error) {
 	notifierPlugin, found := notifierFactories[model.Type]
 	if !found {
 		return nil, errors.New("Unsupported notification type")
diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go
index f1e748207d8..dc22e1acaa0 100644
--- a/pkg/services/alerting/notifiers/base.go
+++ b/pkg/services/alerting/notifiers/base.go
@@ -6,18 +6,22 @@ import (
 )
 
 type NotifierBase struct {
-	Name     string
-	Type     string
-	Id       int64
-	IsDeault bool
+	Name        string
+	Type        string
+	Id          int64
+	IsDeault    bool
+	UploadImage bool
 }
 
 func NewNotifierBase(id int64, isDefault bool, name, notifierType string, model *simplejson.Json) NotifierBase {
+	uploadImage := model.Get("uploadImage").MustBool(true)
+
 	return NotifierBase{
-		Id:       id,
-		Name:     name,
-		IsDeault: isDefault,
-		Type:     notifierType,
+		Id:          id,
+		Name:        name,
+		IsDeault:    isDefault,
+		Type:        notifierType,
+		UploadImage: uploadImage,
 	}
 }
 
@@ -30,7 +34,7 @@ func (n *NotifierBase) GetType() string {
 }
 
 func (n *NotifierBase) NeedsImage() bool {
-	return true
+	return n.UploadImage
 }
 
 func (n *NotifierBase) GetNotifierId() int64 {
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
index 6b31dd4f951..80e6ba5bf51 100644
--- a/pkg/services/alerting/result_handler.go
+++ b/pkg/services/alerting/result_handler.go
@@ -16,14 +16,14 @@ type ResultHandler interface {
 }
 
 type DefaultResultHandler struct {
-	notifier Notifier
+	notifier NotificationService
 	log      log.Logger
 }
 
 func NewResultHandler() *DefaultResultHandler {
 	return &DefaultResultHandler{
 		log:      log.New("alerting.resultHandler"),
-		notifier: NewRootNotifier(),
+		notifier: NewNotificationService(),
 	}
 }
 
@@ -85,7 +85,7 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
 		}
 
 		if evalContext.ShouldSendNotification() {
-			handler.notifier.Notify(evalContext)
+			handler.notifier.Send(evalContext)
 		}
 	}
 
diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go
index a40d0ac3c5c..d5def91d1c5 100644
--- a/pkg/services/alerting/test_notification.go
+++ b/pkg/services/alerting/test_notification.go
@@ -23,7 +23,7 @@ func init() {
 }
 
 func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
-	notifier := NewRootNotifier()
+	notifier := newNotificationService()
 
 	model := &m.AlertNotification{
 		Name:     cmd.Name,
@@ -38,10 +38,10 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
 		return err
 	}
 
-	return notifier.sendNotifications(createTestEvalContext(), []Notifier{notifiers})
+	return notifier.sendNotifications(createTestEvalContext(cmd), []Notifier{notifiers})
 }
 
-func createTestEvalContext() *EvalContext {
+func createTestEvalContext(cmd *NotificationTestCommand) *EvalContext {
 	testRule := &Rule{
 		DashboardId: 1,
 		PanelId:     1,
@@ -51,7 +51,9 @@ func createTestEvalContext() *EvalContext {
 	}
 
 	ctx := NewEvalContext(context.TODO(), testRule)
-	ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png"
+	if cmd.Settings.Get("uploadImage").MustBool(true) {
+		ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png"
+	}
 	ctx.IsTestRun = true
 	ctx.Firing = true
 	ctx.Error = nil
diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts
index 39c9d8ca468..6ad11cb9023 100644
--- a/public/app/features/alerting/notification_edit_ctrl.ts
+++ b/public/app/features/alerting/notification_edit_ctrl.ts
@@ -17,6 +17,7 @@ export class AlertNotificationEditCtrl {
     settings: {
       httpMethod: 'POST',
       autoResolve: true,
+      uploadImage: true,
     },
     isDefault: false
   };
@@ -32,7 +33,7 @@ export class AlertNotificationEditCtrl {
       }
 
       if (!this.$routeParams.id) {
-        return this.model;
+        return _.defaults(this.model, this.defaults);
       }
 
       return this.backendSrv.get(`/api/alert-notifications/${this.$routeParams.id}`).then(result => {
diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html
index dfdfb115f4b..6bf45eff660 100644
--- a/public/app/features/alerting/partials/notification_edit.html
+++ b/public/app/features/alerting/partials/notification_edit.html
@@ -24,15 +24,20 @@
           </select>
         </div>
       </div>
-      <div class="gf-form">
-        <gf-form-switch
-           class="gf-form"
-           label="Send on all alerts"
-           label-class="width-12"
-           checked="ctrl.model.isDefault"
-           tooltip="Use this notification for all alerts">
-        </gf-form-switch>
-      </div>
+      <gf-form-switch
+          class="gf-form"
+          label="Send on all alerts"
+          label-class="width-12"
+          checked="ctrl.model.isDefault"
+          tooltip="Use this notification for all alerts">
+      </gf-form-switch>
+      <gf-form-switch
+          class="gf-form"
+          label="Include image"
+          label-class="width-12"
+          checked="ctrl.model.settings.uploadImage"
+          tooltip="Captures an image and include it in the notification">
+      </gf-form-switch>
     </div>
 
     <div class="gf-form-group" ng-include src="ctrl.notifierTemplateId">

From 902cf5f8899ab31a7fd143fbcb61d29c5238ceac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 15 Feb 2017 14:26:35 +0100
Subject: [PATCH 112/301] fix(): google analytics fix

---
 pkg/api/frontendsettings.go           |  1 +
 public/app/core/services/analytics.js | 32 ++++++++++++++++++---------
 public/views/index.html               | 12 ----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 3690784375d..c0e27897ff4 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -141,6 +141,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 		"authProxyEnabled":  setting.AuthProxyEnabled,
 		"ldapEnabled":       setting.LdapEnabled,
 		"alertingEnabled":   setting.AlertingEnabled,
+		"googleAnalyticsId": setting.GoogleAnalyticsId,
 		"buildInfo": map[string]interface{}{
 			"version":       setting.BuildVersion,
 			"commit":        setting.BuildCommit,
diff --git a/public/app/core/services/analytics.js b/public/app/core/services/analytics.js
index 982cdd23d1d..a20a11bb2b6 100644
--- a/public/app/core/services/analytics.js
+++ b/public/app/core/services/analytics.js
@@ -1,27 +1,39 @@
 define([
   'angular',
-  '../core_module',
+  'jquery',
+  'app/core/core_module',
+  'app/core/config',
 ],
-function(angular, coreModule) {
+function(angular, $, coreModule, config) {
   'use strict';
 
   coreModule.default.service('googleAnalyticsSrv', function($rootScope, $location) {
-    var first = true;
+
+    function gaInit() {
+      $.getScript('https://www.google-analytics.com/analytics.js'); // jQuery shortcut
+      var ga = window.ga = window.ga || function () { (ga.q = ga.q || []).push(arguments); }; ga.l = +new Date;
+      ga('create', config.googleAnalyticsId, 'auto');
+      return ga;
+    }
 
     this.init = function() {
+
       $rootScope.$on('$viewContentLoaded', function() {
-        // skip first
-        if (first) {
-          first = false;
-          return;
-        }
-        window.ga('send', 'pageview', { page: $location.url() });
+        var track =  { page: $location.url() };
+
+        var ga = window.ga || gaInit();
+
+        ga('set', track);
+        ga('send', 'pageview');
       });
+
     };
 
   }).run(function(googleAnalyticsSrv) {
-    if (window.ga) {
+
+    if (config.googleAnalyticsId) {
       googleAnalyticsSrv.init();
     }
+
   });
 });
diff --git a/public/views/index.html b/public/views/index.html
index 8d231ed2b68..55fe9408a73 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -91,18 +91,6 @@
 	<script src="[[.AppSubUrl]]/public/app/boot.js"></script>
 	<!-- endbuild -->
 
-	[[if .GoogleAnalyticsId]]
-	<script>
-		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-		ga('create', '[[.GoogleAnalyticsId]]', 'auto');
-		ga('send', 'pageview');
-		</script>
-	[[end]]
-
 	[[if .GoogleTagManagerId]]
 		<script>
 			dataLayer = [{

From 4fcd5eab29e073d37a31d06982f3e8d2a753b73c Mon Sep 17 00:00:00 2001
From: Roman Vynar <roman.vynar@centricient.com>
Date: Wed, 15 Feb 2017 15:29:20 +0200
Subject: [PATCH 113/301] Add advanced TLS settings to harden setup. (#7347)

* Hardcoded the most secured TLS options.
---
 pkg/api/http_server.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 442eae60e02..b1024e2da9f 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"net/http"
@@ -75,7 +76,32 @@ func (hs *HttpServer) listenAndServeTLS(listenAddr, certfile, keyfile string) er
 		return fmt.Errorf(`Cannot find SSL key_file at %v`, setting.KeyFile)
 	}
 
-	return http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, hs.macaron)
+	tlsCfg := &tls.Config{
+		MinVersion:               tls.VersionTLS12,
+		PreferServerCipherSuites: true,
+		CipherSuites: []uint16{
+			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+		},
+	}
+	srv := &http.Server{
+		Addr:         listenAddr,
+		Handler:      hs.macaron,
+		TLSConfig:    tlsCfg,
+		TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler), 0),
+	}
+
+	return srv.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
 }
 
 func (hs *HttpServer) newMacaron() *macaron.Macaron {

From 9b4d95ff250cf8e6ce17df614beff55cb838982c Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 15 Feb 2017 14:35:25 +0100
Subject: [PATCH 114/301] changelog: note about closing #7347

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 777ce084d53..7870a15b51c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 * **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
 * **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
 * **Email**: Add sender's name on email [#2131](https://github.com/grafana/grafana/issues/2131) thx [@jacobbednarz](https://github.com/jacobbednarz)
+* **HTTPS**: Set tls 1.2 as lowest tls version. [#7347](https://github.com/grafana/grafana/pull/7347) thx [@roman-vynar](https://github.com/roman-vynar)
 
 ## Tech
 

From 3c0f61511d5ecd3d436e829c6628179bba0faa43 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 16 Feb 2017 09:10:55 +0100
Subject: [PATCH 115/301] build: deps-go is not required for building grafana

setup compiles the backend and caches it which is nice
when developing grafana since incremental compiles are
much faster. But its not required for building grafana.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c52e707c4b1..d003cda6dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ deps-go:
 deps-js:
 	yarn install --pure-lockfile --no-progress
 
-deps: deps-go deps-js
+deps: deps-js
 
 build-go:
 	go run build.go build

From 17d02a70658fee365d003387e29753e70c918aff Mon Sep 17 00:00:00 2001
From: Senkevich Alexsandr <a.siankevich@altoros.com>
Date: Thu, 16 Feb 2017 14:35:42 +0300
Subject: [PATCH 116/301] added suppressing of empty results in table plugin

---
 public/app/plugins/panel/table/editor.html     |  4 ++++
 public/app/plugins/panel/table/module.ts       |  1 +
 public/app/plugins/panel/table/transformers.ts | 12 ++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/table/editor.html b/public/app/plugins/panel/table/editor.html
index 5847e140c82..448669ca6a9 100644
--- a/public/app/plugins/panel/table/editor.html
+++ b/public/app/plugins/panel/table/editor.html
@@ -21,6 +21,10 @@
 				<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
 			</div>
 		</div>
+    <gf-form-switch class="gf-form" label-class="width-10"
+                    label="Filter null values"
+                    checked="editor.panel.filterNull"
+                    on-change="editor.render()"></gf-form-switch>
 	</div>
 
 	<div class="section gf-form-group">
diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts
index 35448d6a296..bf872b47d27 100644
--- a/public/app/plugins/panel/table/module.ts
+++ b/public/app/plugins/panel/table/module.ts
@@ -42,6 +42,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
     scroll: true,
     fontSize: '100%',
     sort: {col: 0, desc: true},
+    filterNull: false,
   };
 
   /** @ngInject */
diff --git a/public/app/plugins/panel/table/transformers.ts b/public/app/plugins/panel/table/transformers.ts
index f48932a54ac..58e9758a6b9 100644
--- a/public/app/plugins/panel/table/transformers.ts
+++ b/public/app/plugins/panel/table/transformers.ts
@@ -5,6 +5,7 @@ import moment from 'moment';
 import flatten from '../../../core/utils/flatten';
 import TimeSeries from '../../../core/time_series2';
 import TableModel from '../../../core/table_model';
+import angular from "angular";
 
 var transformers = {};
 
@@ -219,7 +220,8 @@ transformers['json'] = {
 };
 
 function transformDataToTable(data, panel) {
-  var model = new TableModel();
+  var model = new TableModel(),
+    copyData = angular.copy(data);
 
   if (!data || data.length === 0) {
     return model;
@@ -230,7 +232,13 @@ function transformDataToTable(data, panel) {
     throw {message: 'Transformer ' + panel.transformer + ' not found'};
   }
 
-  transformer.transform(data, panel, model);
+  if (panel.filterNull) {
+    for (var i = 0; i < copyData.length; i++) {
+      copyData[i].datapoints = copyData[i].datapoints.filter((dp) => dp[0] != null);
+    }
+  }
+
+  transformer.transform(copyData, panel, model);
   return model;
 }
 

From 927b39fa63c0ba8f4132d8f205da2cf52c24db8b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 16 Feb 2017 10:41:47 +0100
Subject: [PATCH 117/301] templating: adds test for sorting template values

---
 .../app/features/templating/query_variable.ts | 11 +++---
 .../templating/specs/query_variable_specs.ts  | 39 +++++++++++++++++--
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index 7dfcb854194..0a5eeae3629 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -138,7 +138,6 @@ export class QueryVariable implements Variable {
     if (this.regex) {
       regex = kbn.stringToJsRegex(this.templateSrv.replace(this.regex, {}, 'regex'));
     }
-
     for (i = 0; i < metricNames.length; i++) {
       var item = metricNames[i];
       var value = item.value || item.text;
@@ -181,11 +180,11 @@ export class QueryVariable implements Variable {
     } else if (sortType === 2) {
       options = _.sortBy(options, function(opt) {
         var matches = opt.text.match(/.*?(\d+).*/);
-  if (!matches) {
-    return 0;
-  } else {
-    return parseInt(matches[1], 10);
-  }
+        if (!matches || matches.length < 2) {
+          return 0;
+        } else {
+          return parseInt(matches[1], 10);
+        }
       });
     }
 
diff --git a/public/app/features/templating/specs/query_variable_specs.ts b/public/app/features/templating/specs/query_variable_specs.ts
index 591362e0d84..5b886eb442a 100644
--- a/public/app/features/templating/specs/query_variable_specs.ts
+++ b/public/app/features/templating/specs/query_variable_specs.ts
@@ -2,11 +2,11 @@ import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/co
 
 import {QueryVariable} from '../query_variable';
 
-describe('QueryVariable', function() {
+describe('QueryVariable', () => {
 
-  describe('when creating from model', function() {
+  describe('when creating from model', () => {
 
-    it('should set defaults', function() {
+    it('should set defaults', () => {
       var variable = new QueryVariable({}, null, null, null, null);
       expect(variable.datasource).to.be(null);
       expect(variable.refresh).to.be(0);
@@ -42,5 +42,38 @@ describe('QueryVariable', function() {
       expect(model.options.length).to.be(0);
     });
   });
+
+  describe('can convert and sort metric names',() => {
+    var variable = new QueryVariable({}, null, null, null, null);
+    variable.sort = 51;
+
+    describe('can sort a mixed array of metric variables', () => {
+      var input = [
+        {text: '0', value: '0'},
+        {text: '1', value: '1'},
+        {text: '', value: ''},
+        {text: null, value: 3},
+        {text: undefined, value: 4},
+        {text: '5', value: null},
+        {text: '6', value: undefined},
+        {text: null, value: '3'},
+        {text: undefined, value: '4'},
+        {text: 5, value: null},
+        {text: 6, value: undefined},
+      ];
+
+      var result = variable.metricNamesToVariableValues(input);
+
+      it('should return in same order', () => {
+        expect(result[0].text).to.be('0');
+        expect(result[1].text).to.be('1');
+        expect(result[2].text).to.be('');
+        expect(result[3].text).to.be('3');
+        expect(result[4].text).to.be('4');
+        expect(result[5].text).to.be('5');
+        expect(result[6].text).to.be('6');
+      });
+    });
+  });
 });
 

From d72011589ec3f2458c7b03552a30ce5c5290bd53 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 16 Feb 2017 14:22:38 +0100
Subject: [PATCH 118/301] templating: refactor sorting test

---
 .../app/features/templating/query_variable.ts  |  2 +-
 .../templating/specs/query_variable_specs.ts   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index 0a5eeae3629..da3b71c0254 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -181,7 +181,7 @@ export class QueryVariable implements Variable {
       options = _.sortBy(options, function(opt) {
         var matches = opt.text.match(/.*?(\d+).*/);
         if (!matches || matches.length < 2) {
-          return 0;
+          return -1;
         } else {
           return parseInt(matches[1], 10);
         }
diff --git a/public/app/features/templating/specs/query_variable_specs.ts b/public/app/features/templating/specs/query_variable_specs.ts
index 5b886eb442a..5d59ec53d64 100644
--- a/public/app/features/templating/specs/query_variable_specs.ts
+++ b/public/app/features/templating/specs/query_variable_specs.ts
@@ -45,7 +45,7 @@ describe('QueryVariable', () => {
 
   describe('can convert and sort metric names',() => {
     var variable = new QueryVariable({}, null, null, null, null);
-    variable.sort = 51;
+    variable.sort = 3; // Numerical (asc)
 
     describe('can sort a mixed array of metric variables', () => {
       var input = [
@@ -63,15 +63,15 @@ describe('QueryVariable', () => {
       ];
 
       var result = variable.metricNamesToVariableValues(input);
-
       it('should return in same order', () => {
-        expect(result[0].text).to.be('0');
-        expect(result[1].text).to.be('1');
-        expect(result[2].text).to.be('');
-        expect(result[3].text).to.be('3');
-        expect(result[4].text).to.be('4');
-        expect(result[5].text).to.be('5');
-        expect(result[6].text).to.be('6');
+        var i = 0;
+        expect(result[i++].text).to.be('');
+        expect(result[i++].text).to.be('0');
+        expect(result[i++].text).to.be('1');
+        expect(result[i++].text).to.be('3');
+        expect(result[i++].text).to.be('4');
+        expect(result[i++].text).to.be('5');
+        expect(result[i++].text).to.be('6');
       });
     });
   });

From a747d333730c2e79319b9234c6e4bb87458fe94a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 16 Feb 2017 15:09:37 +0100
Subject: [PATCH 119/301] templating: allow whitespace values

closes #7382
---
 public/app/features/templating/query_variable.ts    | 11 ++++++++---
 .../templating/specs/query_variable_specs.ts        | 13 ++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index da3b71c0254..a40aade24ef 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -140,8 +140,13 @@ export class QueryVariable implements Variable {
     }
     for (i = 0; i < metricNames.length; i++) {
       var item = metricNames[i];
-      var value = item.value || item.text;
-      var text = item.text || item.value;
+      var text = item.text === undefined || item.text === null
+        ? item.value
+        : item.text;
+
+      var value = item.value === undefined || item.value === null
+        ? item.text
+        : item.value;
 
       if (_.isNumber(value)) {
         value = value.toString();
@@ -178,7 +183,7 @@ export class QueryVariable implements Variable {
     if (sortType === 1) {
       options = _.sortBy(options, 'text');
     } else if (sortType === 2) {
-      options = _.sortBy(options, function(opt) {
+      options = _.sortBy(options, (opt) => {
         var matches = opt.text.match(/.*?(\d+).*/);
         if (!matches || matches.length < 2) {
           return -1;
diff --git a/public/app/features/templating/specs/query_variable_specs.ts b/public/app/features/templating/specs/query_variable_specs.ts
index 5d59ec53d64..4d3539fb7c6 100644
--- a/public/app/features/templating/specs/query_variable_specs.ts
+++ b/public/app/features/templating/specs/query_variable_specs.ts
@@ -51,20 +51,23 @@ describe('QueryVariable', () => {
       var input = [
         {text: '0', value: '0'},
         {text: '1', value: '1'},
-        {text: '', value: ''},
         {text: null, value: 3},
         {text: undefined, value: 4},
         {text: '5', value: null},
         {text: '6', value: undefined},
-        {text: null, value: '3'},
-        {text: undefined, value: '4'},
-        {text: 5, value: null},
-        {text: 6, value: undefined},
+        {text: null, value: '7'},
+        {text: undefined, value: '8'},
+        {text: 9, value: null},
+        {text: 10, value: undefined},
+        {text: '', value: undefined},
+        {text: undefined, value: ''},
       ];
 
       var result = variable.metricNamesToVariableValues(input);
       it('should return in same order', () => {
         var i = 0;
+
+        expect(result.length).to.be(11);
         expect(result[i++].text).to.be('');
         expect(result[i++].text).to.be('0');
         expect(result[i++].text).to.be('1');

From c924510deb07fa682b9f69b3364b7da6f7ca937b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 16 Feb 2017 16:01:57 +0100
Subject: [PATCH 120/301] alertlist: adds pause as filter option

closes #7400
---
 public/app/features/alerting/alert_list_ctrl.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/alerting/alert_list_ctrl.ts b/public/app/features/alerting/alert_list_ctrl.ts
index 78713ee0c4c..c74f61c8a1c 100644
--- a/public/app/features/alerting/alert_list_ctrl.ts
+++ b/public/app/features/alerting/alert_list_ctrl.ts
@@ -15,6 +15,7 @@ export class AlertListCtrl {
     {text: 'OK', value: 'ok'},
     {text: 'Alerting', value: 'alerting'},
     {text: 'No Data', value: 'no_data'},
+    {text: 'Paused', value: 'paused'},
   ];
 
   filters = {

From a32b7dfb9dc04cd63a7389a6564f437e347be244 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 09:05:52 +0100
Subject: [PATCH 121/301] build: upgrade to golang 1.8

---
 circle.yml               | 2 +-
 scripts/build/Dockerfile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index 6d61acd6f6a..faa50cb5c81 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.8rc3.linux-amd64.tar.gz"
+    GODIST: "go1.8.linux-amd64.tar.gz"
   post:
     - mkdir -p ~/download
     - mkdir -p ~/docker
diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile
index 87a62a1a456..90302563546 100644
--- a/scripts/build/Dockerfile
+++ b/scripts/build/Dockerfile
@@ -23,10 +23,10 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
 
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
     yum install -y yarn --nogpgcheck && \
-    wget https://storage.googleapis.com/golang/go1.8rc3.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.8rc3.linux-amd64.tar.gz
+    wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
 
-ENV GOLANG_VERSION 1.8rc3
+ENV GOLANG_VERSION 1.8
 ENV PATH /usr/local/go/bin:$PATH
 
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go

From 52566376b2616f8648fbaab7ba78efa4c57939d0 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 6 Feb 2017 09:39:40 +0100
Subject: [PATCH 122/301] tech(server): remove unused code

---
 pkg/cmd/grafana-server/server.go | 14 --------------
 pkg/models/server.go             |  4 ----
 2 files changed, 18 deletions(-)

diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 94eb8e845ea..af8f79e9eda 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -95,17 +95,3 @@ func (g *GrafanaServerImpl) Shutdown(code int, reason string) {
 	log.Close()
 	os.Exit(code)
 }
-
-// implement context.Context
-func (g *GrafanaServerImpl) Deadline() (deadline time.Time, ok bool) {
-	return g.context.Deadline()
-}
-func (g *GrafanaServerImpl) Done() <-chan struct{} {
-	return g.context.Done()
-}
-func (g *GrafanaServerImpl) Err() error {
-	return g.context.Err()
-}
-func (g *GrafanaServerImpl) Value(key interface{}) interface{} {
-	return g.context.Value(key)
-}
diff --git a/pkg/models/server.go b/pkg/models/server.go
index 876fc91dd01..4d683835256 100644
--- a/pkg/models/server.go
+++ b/pkg/models/server.go
@@ -1,10 +1,6 @@
 package models
 
-import "context"
-
 type GrafanaServer interface {
-	context.Context
-
 	Start()
 	Shutdown(code int, reason string)
 }

From cf871b1284972166db94248d26e6254210ff53fc Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 6 Feb 2017 09:40:07 +0100
Subject: [PATCH 123/301] http: close http server gracefully.

---
 pkg/api/http_server.go           | 21 +++++++++++++++++++--
 pkg/cmd/grafana-server/server.go | 14 ++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index b1024e2da9f..c1a3b238041 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -25,6 +25,8 @@ type HttpServer struct {
 	macaron       *macaron.Macaron
 	context       context.Context
 	streamManager *live.StreamManager
+
+	httpSrv *http.Server
 }
 
 func NewHttpServer() *HttpServer {
@@ -46,11 +48,20 @@ func (hs *HttpServer) Start(ctx context.Context) error {
 	listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
 	hs.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl)
 
+	hs.httpSrv = &http.Server{Addr: listenAddr, Handler: hs.macaron}
 	switch setting.Protocol {
 	case setting.HTTP:
-		err = http.ListenAndServe(listenAddr, hs.macaron)
+		err = hs.httpSrv.ListenAndServe()
+		if err == http.ErrServerClosed {
+			hs.log.Debug("server was shutdown gracefully")
+			return nil
+		}
 	case setting.HTTPS:
-		err = hs.listenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile)
+		err = hs.httpSrv.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
+		if err == http.ErrServerClosed {
+			hs.log.Debug("server was shutdown gracefully")
+			return nil
+		}
 	default:
 		hs.log.Error("Invalid protocol", "protocol", setting.Protocol)
 		err = errors.New("Invalid Protocol")
@@ -59,6 +70,12 @@ func (hs *HttpServer) Start(ctx context.Context) error {
 	return err
 }
 
+func (hs *HttpServer) Shutdown(ctx context.Context) error {
+	err := hs.httpSrv.Shutdown(ctx)
+	hs.log.Info("stopped http server")
+	return err
+}
+
 func (hs *HttpServer) listenAndServeTLS(listenAddr, certfile, keyfile string) error {
 	if certfile == "" {
 		return fmt.Errorf("cert_file cannot be empty when using HTTPS")
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index af8f79e9eda..30da2342c2b 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"os"
-	"time"
 
 	"golang.org/x/sync/errgroup"
 
@@ -39,6 +38,8 @@ type GrafanaServerImpl struct {
 	shutdownFn    context.CancelFunc
 	childRoutines *errgroup.Group
 	log           log.Logger
+
+	httpServer *api.HttpServer
 }
 
 func (g *GrafanaServerImpl) Start() {
@@ -74,9 +75,9 @@ func (g *GrafanaServerImpl) Start() {
 }
 
 func (g *GrafanaServerImpl) startHttpServer() {
-	httpServer := api.NewHttpServer()
+	g.httpServer = api.NewHttpServer()
 
-	err := httpServer.Start(g.context)
+	err := g.httpServer.Start(g.context)
 
 	if err != nil {
 		g.log.Error("Fail to start server", "error", err)
@@ -88,8 +89,13 @@ func (g *GrafanaServerImpl) startHttpServer() {
 func (g *GrafanaServerImpl) Shutdown(code int, reason string) {
 	g.log.Info("Shutdown started", "code", code, "reason", reason)
 
+	err := g.httpServer.Shutdown(g.context)
+	if err != nil {
+		g.log.Error("Failed to shutdown server", "error", err)
+	}
+
 	g.shutdownFn()
-	err := g.childRoutines.Wait()
+	err = g.childRoutines.Wait()
 
 	g.log.Info("Shutdown completed", "reason", err)
 	log.Close()

From 79daa71350b522292b333ffc7124f724428fde2a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 10:37:59 +0100
Subject: [PATCH 124/301] docs: update golang requirement to 1.8

---
 CHANGELOG.md                                 | 1 +
 README.md                                    | 2 +-
 appveyor.yml                                 | 2 +-
 build.go                                     | 2 +-
 docs/sources/project/building_from_source.md | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7870a15b51c..926492093a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 ## Tech
 
 * **Library Upgrade**: Upgraded angularjs from 1.5.8 to 1.6.1 [#7274](https://github.com/grafana/grafana/issues/7274)
+* **Backend**: Grafana is now built using golang 1.8
 
 ## Bugfixes
 * **Alerting**: Fixes missing support for no_data and execution error when testing alerts [#7149](https://github.com/grafana/grafana/issues/7149)
diff --git a/README.md b/README.md
index adf4270654a..041a94c8432 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ the latest master builds [here](http://grafana.org/builds)
 
 ### Dependencies
 
-- Go 1.7.3
+- Go 1.8
 - NodeJS v4+
 
 ### Get Code
diff --git a/appveyor.yml b/appveyor.yml
index d0c1bfb0eaa..07046264854 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
 environment:
   nodejs_version: "6"
   GOPATH: c:\gopath
-  GOVERSION: 1.7.4
+  GOVERSION: 1.8
 
 install:
   # install nodejs and npm
diff --git a/build.go b/build.go
index f525d798b76..73f641bfec3 100644
--- a/build.go
+++ b/build.go
@@ -42,7 +42,7 @@ var (
 	binaries              []string = []string{"grafana-server", "grafana-cli"}
 )
 
-const minGoVersion = 1.7
+const minGoVersion = 1.8
 
 func main() {
 	log.SetOutput(os.Stdout)
diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md
index 195c71d99a8..4b5291dc887 100644
--- a/docs/sources/project/building_from_source.md
+++ b/docs/sources/project/building_from_source.md
@@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 ## Dependencies
 
-- [Go 1.7.3](https://golang.org/dl/)
+- [Go 1.8](https://golang.org/dl/)
 - [NodeJS](https://nodejs.org/download/)
 
 ## Get Code

From 5fb4540358652281580c3d1fdc01d87690691237 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 10:41:15 +0100
Subject: [PATCH 125/301] changelog: adds note about closing #7382

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 926492093a4..532f55ead39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 * **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
 * **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
 * **Annotations**: Wrap text in annotations tooltip [#7542](https://github.com/grafana/grafana/pull/7542), thx [@xginn8](https://github.com/xginn8)
+* **Templating**: Fixes error when using numeric sort on empty strings [#7382](https://github.com/grafana/grafana/issues/7382)
 
 # 4.1.2 (2017-02-13)
 

From 774c1de892c97f339d326f365fd6c3607bd92324 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 10:42:52 +0100
Subject: [PATCH 126/301] changelog: adds note about closing #7319

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 532f55ead39..fc24bcda89d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+* **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From 76f617b862065cbba9986f25262b848f70d05fb7 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 12:06:24 +0100
Subject: [PATCH 127/301] build: disable setup for windows build

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 07046264854..c06ed516bdf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ install:
   - echo %GOPATH%
   - go version
   - go env
-  - go run build.go setup
+  # - go run build.go setup
 
 build_script:
   - go run build.go build

From 12f1ea71fd71e2f49a80aedf385dff8589e3ac71 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 12:07:46 +0100
Subject: [PATCH 128/301] chore: delete empty test

---
 pkg/api/api_test.go | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 pkg/api/api_test.go

diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go
deleted file mode 100644
index ea3588b0e67..00000000000
--- a/pkg/api/api_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package api
-
-import (
-	"testing"
-)
-
-func TestHttpApi(t *testing.T) {
-
-	// Convey("Given the grafana api", t, func() {
-	// 	ConveyApiScenario("Can sign up", func(c apiTestContext) {
-	// 		c.PostJson()
-	// 		So(c.Resp, ShouldEqualJsonApiResponse, "User created and logged in")
-	// 	})
-	//
-	// 	m := macaron.New()
-	// 	m.Use(middleware.GetContextHandler())
-	// 	m.Use(middleware.Sessioner(&session.Options{}))
-	// 	Register(m)
-	//
-	// 	var context *middleware.Context
-	// 	m.Get("/", func(c *middleware.Context) {
-	// 		context = c
-	// 	})
-	//
-	// 	resp := httptest.NewRecorder()
-	// 	req, err := http.NewRequest("GET", "/", nil)
-	// 	So(err, ShouldBeNil)
-	//
-	// 	m.ServeHTTP(resp, req)
-	//
-	// 	Convey("should red 200", func() {
-	// 		So(resp.Code, ShouldEqual, 200)
-	// 	})
-	// })
-}

From ac0d09c4197d95db076cff01c546b400f6915dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 17 Feb 2017 14:07:00 +0100
Subject: [PATCH 129/301] fix(): fixed issue with syncing refresh interval to
 url

---
 public/app/features/dashboard/time_srv.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/time_srv.ts b/public/app/features/dashboard/time_srv.ts
index c7a0804bed0..e6c5f1f6212 100644
--- a/public/app/features/dashboard/time_srv.ts
+++ b/public/app/features/dashboard/time_srv.ts
@@ -116,9 +116,11 @@ class TimeSrv {
     }
 
     // update url
-    var params = this.$location.search();
-    params.refresh = interval;
-    this.$location.search(params);
+    if (interval) {
+      var params = this.$location.search();
+      params.refresh = interval;
+      this.$location.search(params);
+    }
   }
 
   refreshDashboard() {

From 5174d050f2fb70da5e68b649cb63013aebb531a6 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 15:02:14 +0100
Subject: [PATCH 130/301] middlware: change org when url contains orgid

closes #6948
ref #1613
---
 pkg/api/http_server.go                |  1 +
 pkg/middleware/middleware_test.go     |  1 +
 pkg/middleware/org_redirect.go        | 41 ++++++++++++++++++
 pkg/middleware/org_redirect_test.go   | 60 +++++++++++++++++++++++++++
 pkg/services/alerting/eval_context.go |  2 +-
 pkg/services/sqlstore/user.go         | 16 +++++++
 6 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 pkg/middleware/org_redirect.go
 create mode 100644 pkg/middleware/org_redirect_test.go

diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index c1a3b238041..fe7ca21f402 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -150,6 +150,7 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron {
 	m.Use(middleware.GetContextHandler())
 	m.Use(middleware.Sessioner(&setting.SessionOptions))
 	m.Use(middleware.RequestMetrics())
+	m.Use(middleware.OrgRedirect())
 
 	// needs to be after context handler
 	if setting.EnforceDomain {
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 5cffa0a2884..a1836a6744e 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -326,6 +326,7 @@ func middlewareScenario(desc string, fn scenarioFunc) {
 		// mock out gc goroutine
 		startSessionGC = func() {}
 		sc.m.Use(Sessioner(&session.Options{}))
+		sc.m.Use(OrgRedirect())
 
 		sc.defaultHandler = func(c *Context) {
 			sc.context = c
diff --git a/pkg/middleware/org_redirect.go b/pkg/middleware/org_redirect.go
new file mode 100644
index 00000000000..7dda59c01e4
--- /dev/null
+++ b/pkg/middleware/org_redirect.go
@@ -0,0 +1,41 @@
+package middleware
+
+import (
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/models"
+
+	"gopkg.in/macaron.v1"
+)
+
+func OrgRedirect() macaron.Handler {
+	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
+		orgId := c.QueryInt64("org-id")
+		if orgId == 0 {
+			return
+		}
+
+		ctx, ok := c.Data["ctx"].(*Context)
+		if !ok || !ctx.IsSignedIn {
+			return
+		}
+
+		if orgId == ctx.OrgId {
+			return
+		}
+
+		cmd := models.SetUsingOrgCommand{UserId: ctx.UserId, OrgId: orgId}
+		if err := bus.Dispatch(&cmd); err != nil {
+			if ctx.IsApiRequest() {
+				ctx.JsonApiErr(404, "Not found", nil)
+			} else {
+				ctx.Error(404, "Not found")
+			}
+
+			return
+		}
+
+		c.Redirect(c.Req.URL.String(), 302)
+	}
+}
diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go
new file mode 100644
index 00000000000..1b0be22fd28
--- /dev/null
+++ b/pkg/middleware/org_redirect_test.go
@@ -0,0 +1,60 @@
+package middleware
+
+import (
+	"testing"
+
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/models"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestOrgRedirectMiddleware(t *testing.T) {
+
+	Convey("Can redirect to correct org", t, func() {
+		middlewareScenario("when setting a correct org for the user", func(sc *scenarioContext) {
+			sc.fakeReq("GET", "/").handler(func(c *Context) {
+				c.Session.Set(SESS_KEY_USERID, int64(12))
+			}).exec()
+
+			bus.AddHandler("test", func(query *models.SetUsingOrgCommand) error {
+				return nil
+			})
+
+			bus.AddHandler("test", func(query *models.GetSignedInUserQuery) error {
+				query.Result = &models.SignedInUser{OrgId: 1, UserId: 12}
+				return nil
+			})
+
+			sc.m.Get("/", sc.defaultHandler)
+			sc.fakeReq("GET", "/?org-id=3").exec()
+
+			Convey("change org and redirect", func() {
+				So(sc.resp.Code, ShouldEqual, 302)
+			})
+		})
+
+		middlewareScenario("when setting an invalid org for user", func(sc *scenarioContext) {
+			sc.fakeReq("GET", "/").handler(func(c *Context) {
+				c.Session.Set(SESS_KEY_USERID, int64(12))
+			}).exec()
+
+			bus.AddHandler("test", func(query *models.SetUsingOrgCommand) error {
+				return fmt.Errorf("")
+			})
+
+			bus.AddHandler("test", func(query *models.GetSignedInUserQuery) error {
+				query.Result = &models.SignedInUser{OrgId: 1, UserId: 12}
+				return nil
+			})
+
+			sc.m.Get("/", sc.defaultHandler)
+			sc.fakeReq("GET", "/?org-id=3").exec()
+
+			Convey("not allowed to change org", func() {
+				So(sc.resp.Code, ShouldEqual, 404)
+			})
+		})
+	})
+}
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index 2b252da8c4b..3bd2f54f509 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -113,7 +113,7 @@ func (c *EvalContext) GetRuleUrl() (string, error) {
 	if slug, err := c.GetDashboardSlug(); err != nil {
 		return "", err
 	} else {
-		ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d", setting.AppUrl, slug, c.Rule.PanelId)
+		ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d&org-id=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId)
 		return ruleUrl, nil
 	}
 }
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 791a38f2d01..2e3c5c673d6 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -6,6 +6,8 @@ import (
 
 	"github.com/go-xorm/xorm"
 
+	"fmt"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/events"
 	m "github.com/grafana/grafana/pkg/models"
@@ -260,6 +262,20 @@ func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
 }
 
 func SetUsingOrg(cmd *m.SetUsingOrgCommand) error {
+	getOrgsForUserCmd := &m.GetUserOrgListQuery{UserId: cmd.UserId}
+	GetUserOrgList(getOrgsForUserCmd)
+
+	valid := false
+	for _, other := range getOrgsForUserCmd.Result {
+		if other.OrgId == cmd.OrgId {
+			valid = true
+		}
+	}
+
+	if !valid {
+		return fmt.Errorf("user does not belong ot org")
+	}
+
 	return inTransaction(func(sess *xorm.Session) error {
 		user := m.User{}
 		sess.Id(cmd.UserId).Get(&user)

From 6115941df083462394d652469bcc6625cb19c21b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 15:18:40 +0100
Subject: [PATCH 131/301] middleware: rename org-id -> orgId

---
 pkg/middleware/org_redirect.go        | 2 +-
 pkg/middleware/org_redirect_test.go   | 4 ++--
 pkg/services/alerting/eval_context.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/middleware/org_redirect.go b/pkg/middleware/org_redirect.go
index 7dda59c01e4..b1146a500e1 100644
--- a/pkg/middleware/org_redirect.go
+++ b/pkg/middleware/org_redirect.go
@@ -11,7 +11,7 @@ import (
 
 func OrgRedirect() macaron.Handler {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
-		orgId := c.QueryInt64("org-id")
+		orgId := c.QueryInt64("orgId")
 		if orgId == 0 {
 			return
 		}
diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go
index 1b0be22fd28..1f3d01f30f2 100644
--- a/pkg/middleware/org_redirect_test.go
+++ b/pkg/middleware/org_redirect_test.go
@@ -28,7 +28,7 @@ func TestOrgRedirectMiddleware(t *testing.T) {
 			})
 
 			sc.m.Get("/", sc.defaultHandler)
-			sc.fakeReq("GET", "/?org-id=3").exec()
+			sc.fakeReq("GET", "/?orgId=3").exec()
 
 			Convey("change org and redirect", func() {
 				So(sc.resp.Code, ShouldEqual, 302)
@@ -50,7 +50,7 @@ func TestOrgRedirectMiddleware(t *testing.T) {
 			})
 
 			sc.m.Get("/", sc.defaultHandler)
-			sc.fakeReq("GET", "/?org-id=3").exec()
+			sc.fakeReq("GET", "/?orgId=3").exec()
 
 			Convey("not allowed to change org", func() {
 				So(sc.resp.Code, ShouldEqual, 404)
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index 3bd2f54f509..e92edd2af12 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -113,7 +113,7 @@ func (c *EvalContext) GetRuleUrl() (string, error) {
 	if slug, err := c.GetDashboardSlug(); err != nil {
 		return "", err
 	} else {
-		ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d&org-id=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId)
+		ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d&orgId=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId)
 		return ruleUrl, nil
 	}
 }

From 400bd8d2d39f5f414cdc39a8ebd2098a33aa4f5c Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 17 Feb 2017 16:16:17 +0100
Subject: [PATCH 132/301] build: reduce logs from npm install

---
 appveyor.yml           | 2 +-
 scripts/circle-test.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c06ed516bdf..b7d356ae832 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ environment:
 install:
   # install nodejs and npm
   - ps: Install-Product node $env:nodejs_version
-  - npm install -g yarn
+  - npm install -g yarn --quiet
   - yarn install --pure-lockfile --no-progress
   - npm install -g grunt-cli
   - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.zip
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 7b1b0c6ca30..e11007d8e76 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -13,7 +13,7 @@ function exit_if_fail {
 cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
 
 rm -rf node_modules
-npm install -g yarn
+npm install -g yarn --quiet
 yarn install --pure-lockfile --no-progress
 
 exit_if_fail npm test

From 48649951e44c9d783a420e136b0880cc7b863484 Mon Sep 17 00:00:00 2001
From: Tim De Pauw <timdp@users.noreply.github.com>
Date: Sat, 18 Feb 2017 17:20:44 +0100
Subject: [PATCH 133/301] =?UTF-8?q?Github=20=E2=86=92=20GitHub=20(#7607)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/app/partials/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index b6a37ba46c2..6ef9c3b1501 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -57,7 +57,7 @@
 					</a>
 					<a class="btn btn-large btn-github" href="login/github" target="_self" ng-if="oauth.github">
 						<i class="fa fa-github"></i>
-						with Github
+						with GitHub
 					</a>
 					<a class="btn btn-large btn-grafana-net" href="login/grafananet" target="_self" ng-if="oauth.grafananet">
 						with <span>Grafana.net</span>

From a4318e41f83e7b768defa421dcee10327ab3e5d7 Mon Sep 17 00:00:00 2001
From: Simon Effenberg <simon.effenberg@olx.com>
Date: Sat, 18 Feb 2017 17:21:29 +0100
Subject: [PATCH 134/301] fixing little spelling issue (#7603)

---
 .../datasource/prometheus/dashboards/prometheus_stats.json      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
index 3b5b73ea6d4..67fa58e68de 100644
--- a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
+++ b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
@@ -154,7 +154,7 @@
             }
           ],
           "thresholds": "0,500,4000",
-          "title": "Interal Storage Queue Length",
+          "title": "Internal Storage Queue Length",
           "type": "singlestat",
           "valueFontSize": "70%",
           "valueMaps": [

From 492b2bd42ff1f35a4ccfa21ce019524867518e87 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Sun, 19 Feb 2017 10:35:42 +0100
Subject: [PATCH 135/301] build: fixes golang 1.8 build on windows

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index b7d356ae832..25e4181ed80 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,9 +10,10 @@ environment:
   GOVERSION: 1.8
 
 install:
+  - rmdir c:\go /s /q
   # install nodejs and npm
   - ps: Install-Product node $env:nodejs_version
-  - npm install -g yarn --quiet
+  - npm install -g yarn --silent
   - yarn install --pure-lockfile --no-progress
   - npm install -g grunt-cli
   - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.zip

From 38126bc5950245be8e2284603dbae061b1390741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Feb 2017 09:31:50 +0100
Subject: [PATCH 136/301] fix(templating): fixed issue detecting template
 variable dependency, fixes #7354

---
 CHANGELOG.md                                           | 1 +
 public/app/features/templating/specs/variable_specs.ts | 7 ++++++-
 public/app/features/templating/variable.ts             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc24bcda89d..30dd5f132d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 * **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
 * **Annotations**: Wrap text in annotations tooltip [#7542](https://github.com/grafana/grafana/pull/7542), thx [@xginn8](https://github.com/xginn8)
 * **Templating**: Fixes error when using numeric sort on empty strings [#7382](https://github.com/grafana/grafana/issues/7382)
+* **Templating**: Fixed issue detecting template variable dependency [#7354](https://github.com/grafana/grafana/issues/7354)
 
 # 4.1.2 (2017-02-13)
 
diff --git a/public/app/features/templating/specs/variable_specs.ts b/public/app/features/templating/specs/variable_specs.ts
index 9a974eae695..0031c2df79a 100644
--- a/public/app/features/templating/specs/variable_specs.ts
+++ b/public/app/features/templating/specs/variable_specs.ts
@@ -12,10 +12,15 @@ describe('containsVariable', function() {
     });
 
     it('should not find it if only part matches with $var syntax', function() {
-      var contains = containsVariable('this.$ServerDomain.filters', 'Server');
+      var contains = containsVariable('this.$serverDomain.filters', 'server');
       expect(contains).to.be(false);
     });
 
+    it('should find it if it ends with variable and passing multiple test strings', function() {
+      var contains = containsVariable('show field keys from $pgmetric', 'test string2', 'pgmetric');
+      expect(contains).to.be(true);
+    });
+
     it('should find it with [[var]] syntax', function() {
       var contains = containsVariable('this.[[test]].filters', 'test');
       expect(contains).to.be(true);
diff --git a/public/app/features/templating/variable.ts b/public/app/features/templating/variable.ts
index 381f1ea7a3c..d451b66ffb1 100644
--- a/public/app/features/templating/variable.ts
+++ b/public/app/features/templating/variable.ts
@@ -23,7 +23,7 @@ export function containsVariable(...args: any[]) {
   var str = args[0] || '';
 
   for (var i = 1; i < args.length-1; i++) {
-    str += args[i] || '';
+    str += ' ' + args[i] || '';
   }
 
   variableName = kbn.regexEscape(variableName);

From b176f36889a5ce7491aa4766bbfc291cdb9c6fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Feb 2017 10:41:13 +0100
Subject: [PATCH 137/301] docs(): updated CLA

---
 docs/sources/contribute/cla.md | 106 ++++++++++++++++++++-------------
 docs/sources/project/cla.md    |  85 --------------------------
 2 files changed, 64 insertions(+), 127 deletions(-)
 delete mode 100644 docs/sources/project/cla.md

diff --git a/docs/sources/contribute/cla.md b/docs/sources/contribute/cla.md
index ab35770eb30..fdac83ea3c4 100644
--- a/docs/sources/contribute/cla.md
+++ b/docs/sources/contribute/cla.md
@@ -8,85 +8,107 @@ parent = "contribute"
 weight = 1
 +++
 
-# Grafana Contributor License Agreement
+# Grafana Labs Contributor License Agreement
 
-## Why is this agreement necessary?
-We very much appreciate your wanting to contribute to Grafana,
-but we need to add you to the contributors list first.
+Thank you for your interest in contributing to a Grafana Labs Project ("We" or "Us").
 
+This contributor agreement ("Agreement") documents the rights granted by contributors to Us.
+To make this document effective, please sign it following the instructions at
+[cla-assistant](https://cla-assistant.io/grafana/grafana). This is a legally binding document,
+so please read it carefully before agreeing to it. The Agreement may cover more than
+one software project managed by Us.
 
-Note that the following agreement is not a transfer of copyright ownership,
-this simply is a license agreement for contributions. You also do not change
-your rights to use your own contributions for any other purpose.
+## 1. Definitions
 
+"You" (Individual) means the individual who Submits a Contribution to Us.
 
-For some background on why contributor license agreements are necessary,
-you can read FAQs from many other open source projects:
+"You" (Entity) means any Legal Entity on behalf of whom a Contribution has been received by Us. "Legal Entity" means an entity which is not a natural person. "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.
 
-- [Django's excellent CLA FAQ](https://www.djangoproject.com/foundation/cla/faq/)
-- [A well-written chapter from Karl Fogel's Producing Open Source Software on CLAs](http://producingoss.com/en/copyright-assignment.html)
-- [The Wikipedia article on CLAs](http://en.wikipedia.org/wiki/Contributor_license_agreement)
+"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, you must notify us at contact@grafana.com before Submitting  such a Contribution.
 
-This is part of the legal framework of the open-source ecosystem that adds some red tape,
-but protects both the contributor and the company / foundation behind the project.
-It also gives us the option to relicense the code with a more permissive license in the future.
+"Copyright" means all rights protecting works of authorship owned or controlled by You [or Your Affiliates], including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.
 
+"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.
 
-If you have more questions, shoot us an [email](mailto:torkel@grafana.org) or drop by #grafana on IRC (freenode).
+"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
 
-Many thanks to [RethinkDB](http://rethinkdb.com) for permission to re-use their CLA!
+"Submission Date" means the date on which You Submit a Contribution to Us.
 
-## Terms of the Agreement
+"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier.
 
-<hr>
+"Media" means any portion of a Contribution which is not software.
 
-This Contributor License Agreement (“Agreement”) is entered into between Coding Instinct AB,
-a Swedish corporation (“Grafana,” “we” or “us” etc.) and you (as defined and further identified below).
-Accordingly, you hereby agree to the following terms for your past, present and future contributions
-submitted to Grafana:
+## 2. Grant of Rights
 
+### 2.1 Copyright License
 
-**1. Definitions:**
-<strong>(a)</strong> "You" (or "your") shall mean the contribution copyright owner (whether an individual or organization) or legal entity authorized by the copyright owner that is making this Agreement with Grafana.
+(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement.
 
+(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3.
 
-<strong>(b)</strong> "Contribution(s)" shall mean the code, documentation or other original works of authorship, including any modifications or additions to an existing work, submitted by you to Grafana for inclusion in, or documentation of, any of the products or projects owned or managed by Grafana (the "work(s)"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Grafana or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Grafana for the purpose of discussing and/or improving the work, but excluding communication that is conspicuously marked or otherwise designated in writing by you as "Not a Contribution."
+### 2.1 Copyright Assignment
 
-**2. Grant of Copyright License.**
-You hereby grant to Grafana and to recipients of software distributed by Grafana a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works.
+(a) At the time the Contribution is Submitted, You assign to Us all right, title, and interest worldwide in all Copyright covering the Contribution; provided that this transfer is conditioned upon compliance with Section 2.3.
 
+(b) To the extent that any of the rights in Section 2.1(a) cannot be assigned by You to Us, You grant to Us a perpetual, worldwide, exclusive, royalty-free, transferable, irrevocable license under such non-assigned rights, with rights to sublicense through multiple tiers of sublicensees, to practice such non-assigned rights, including, but not limited to, the right to reproduce, modify, display, perform and distribute the Contribution; provided that this license is conditioned upon compliance with Section 2.3.
 
-**3. Grant of Patent License.**
-With respect to any patents you own, or that you can license without payment to any third party, you hereby grant Grafana a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free license to: (i) make, have made, use, sell, offer to sell, import, and otherwise distribute and exploit your contributions in whole or in part, alone or in combination with or included in any product, work or materials arising out of or relating to the Works to which your contributions were submitted; and (ii) sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements.
+\(c) To the extent that any of the rights in Section 2.1(a) can neither be assigned nor licensed by You to Us, You irrevocably waive and agree never to assert such rights against Us, any of our successors in interest, or any of our licensees, either direct or indirect; provided that this agreement not to assert is conditioned upon compliance with Section 2.3.
 
+(d) Upon such transfer of rights to Us, to the maximum extent possible, We immediately grant to You a perpetual, worldwide, non-exclusive, royalty-free, transferable, irrevocable license under such rights covering the Contribution, with rights to sublicense through multiple tiers of sublicensees, to reproduce, modify, display, perform, and distribute the Contribution. The intention of the parties is that this license will be as broad as possible and to provide You with rights as similar as possible to the owner of the rights that You transferred. This license back is limited to the Contribution and does not provide any rights to the Material.
 
-**4. Rights.**
-Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under this agreement are effective on the date you first submitted a contribution to us, even if your submission took place before the date you entered this agreement.
+### 2.2 Patent License
 
+For patent claims including, without limitation, method, process, and apparatus claims which You [or Your Affiliates] own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3.
 
-**5. You represent and warrant that:**
-<strong>(i)</strong> the contributions are an original work and that you can legally grant the rights set out in this agreement;
+## 2.3 Outbound License
 
+As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or any licenses which are approved by the Open Source Initiative on or after the Effective Date, including both permissive and copyleft licenses, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license if permitted).
 
-<strong>(ii)</strong> the contributions and Grafana’s exercise of any license rights granted hereunder, does not and will not, infringe the rights of any third party;
+In addition, We may use the following licenses for Media in the Contribution: GNU Free Documentation License v1.3, Creative Commons Attribution 3.0, or Creative Commons Attribution No Derivatives 3.0 (including any right to adopt any future version of a license if permitted).
 
+2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect.
 
-<strong>(iii)</strong> you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions, including without limitation any claims or allegations that any or all of the contributions infringes, violates, or misappropriate the intellectual property rights of any third party (you further agree that you will notify Grafana immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges).
+2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate.
 
+2.6 Reservation of Rights. Any rights not expressly [assigned or] licensed under this section are expressly reserved by You.
 
-**6. Employer Rights.**
-If your employer(s) has rights to intellectual property that you create that includes your contributions, you represent and warrant that your employer has waived such rights for your contributions to Grafana, or that you have received permission to make contributions on behalf of that employer and that you are authorized to execute this agreement on behalf of your employer.
+## 3. Agreement
 
+You confirm that:
 
-**7. Support.**
-You are not expected to provide support for your contributions, except to the extent you desire to provide support. You may provide support for free, for a fee, or not at all. Except as set forth herein, and unless required by applicable law or agreed to in writing, you provide your contributions on an "as is" basis, without warranties or conditions of any kind.
+(a) You have the legal authority to enter into this Agreement.
 
+(b) You [or Your Affiliates] own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2.
 
-**8. Enforcement.**
+\(c)(Individual) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement.
 
-The failure of either party to enforce its rights under this agreement for any period shall not be construed as a waiver of such rights. No changes or modifications or waivers to this Agreement will be effective unless in writing and signed by both parties. In the event that any provision of this agreement shall be determined to be illegal or unenforceable, that provision will be limited or eliminated to the minimum extent necessary so that this agreement shall otherwise remain in full force and effect and enforceable. This agreement shall be governed by and construed in accordance with the laws of the State of California in the United States without regard to the conflicts of laws provisions thereof. In any action or proceeding to enforce rights under this agreement, the prevailing party will be entitled to recover costs and attorneys’ fees.
+\(c)(Entity) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties.
+
+## 4. Disclaimer
+
+EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US [AND BY US TO YOU]. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.
+
+## 5. Consequential Damage Waiver
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU [OR US] BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+## 6. Miscellaneous
+
+6.1 This Agreement will be governed by and construed in accordance with the laws of [JURISDICTION] excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
+
+6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
+
+6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement.
+
+6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety.
+
+6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
 
 ### Sign using CLA-Assistant
 
 [https://cla-assistant.io/grafana/grafana](https://cla-assistant.io/grafana/grafana)
 
+<br>
+<br>
+<br>
+This CLA aggreement is based on the [Harmony Contributor Aggrement Template (combined)](http://www.harmonyagreements.org/agreements.html), [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/)
diff --git a/docs/sources/project/cla.md b/docs/sources/project/cla.md
deleted file mode 100644
index 4554300249d..00000000000
--- a/docs/sources/project/cla.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-page_title: Grafana CLA
-page_description: Grafana Contributor License Agreement
-page_keywords: grafana, cla, contribute, documentation
----
-
-# Grafana Contributor License Agreement
-
-## Why is this agreement necessary?
-We very much appreciate your wanting to contribute to Grafana,
-but we need to add you to the contributors list first.
-
-
-Note that the following agreement is not a transfer of copyright ownership,
-this simply is a license agreement for contributions. You also do not change
-your rights to use your own contributions for any other purpose.
-
-
-For some background on why contributor license agreements are necessary,
-you can read FAQs from many other open source projects:
-
-- [Django's excellent CLA FAQ](https://www.djangoproject.com/foundation/cla/faq/)
-- [A well-written chapter from Karl Fogel's Producing Open Source Software on CLAs](http://producingoss.com/en/copyright-assignment.html)
-- [The Wikipedia article on CLAs](http://en.wikipedia.org/wiki/Contributor_license_agreement)
-
-This is part of the legal framework of the open-source ecosystem that adds some red tape,
-but protects both the contributor and the company / foundation behind the project.
-It also gives us the option to relicense the code with a more permissive license in the future.
-
-
-If you have more questions, shoot us an [email](mailto:torkel@grafana.org) or drop by #grafana on IRC (freenode).
-
-Many thanks to [RethinkDB](http://rethinkdb.com) for permission to re-use their CLA!
-
-## Terms of the Agreement
-
-<hr>
-
-This Contributor License Agreement (“Agreement”) is entered into between Coding Instinct AB,
-a Swedish corporation (“Grafana,” “we” or “us” etc.) and you (as defined and further identified below).
-Accordingly, you hereby agree to the following terms for your past, present and future contributions
-submitted to Grafana:
-
-
-**1. Definitions:**
-<strong>(a)</strong> "You" (or "your") shall mean the contribution copyright owner (whether an individual or organization) or legal entity authorized by the copyright owner that is making this Agreement with Grafana.
-
-
-<strong>(b)</strong> "Contribution(s)" shall mean the code, documentation or other original works of authorship, including any modifications or additions to an existing work, submitted by you to Grafana for inclusion in, or documentation of, any of the products or projects owned or managed by Grafana (the "work(s)"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Grafana or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Grafana for the purpose of discussing and/or improving the work, but excluding communication that is conspicuously marked or otherwise designated in writing by you as "Not a Contribution."
-
-**2. Grant of Copyright License.**
-You hereby grant to Grafana and to recipients of software distributed by Grafana a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works.
-
-
-**3. Grant of Patent License.**
-With respect to any patents you own, or that you can license without payment to any third party, you hereby grant Grafana a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free license to: (i) make, have made, use, sell, offer to sell, import, and otherwise distribute and exploit your contributions in whole or in part, alone or in combination with or included in any product, work or materials arising out of or relating to the Works to which your contributions were submitted; and (ii) sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements.
-
-
-**4. Rights.**
-Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under this agreement are effective on the date you first submitted a contribution to us, even if your submission took place before the date you entered this agreement.
-
-
-**5. You represent and warrant that:**
-<strong>(i)</strong> the contributions are an original work and that you can legally grant the rights set out in this agreement;
-
-
-<strong>(ii)</strong> the contributions and Grafana’s exercise of any license rights granted hereunder, does not and will not, infringe the rights of any third party;
-
-
-<strong>(iii)</strong> you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions, including without limitation any claims or allegations that any or all of the contributions infringes, violates, or misappropriate the intellectual property rights of any third party (you further agree that you will notify Grafana immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges).
-
-
-**6. Employer Rights.**
-If your employer(s) has rights to intellectual property that you create that includes your contributions, you represent and warrant that your employer has waived such rights for your contributions to Grafana, or that you have received permission to make contributions on behalf of that employer and that you are authorized to execute this agreement on behalf of your employer.
-
-
-**7. Support.**
-You are not expected to provide support for your contributions, except to the extent you desire to provide support. You may provide support for free, for a fee, or not at all. Except as set forth herein, and unless required by applicable law or agreed to in writing, you provide your contributions on an "as is" basis, without warranties or conditions of any kind.
-
-
-**8. Enforcement.**
-The failure of either party to enforce its rights under this agreement for any period shall not be construed as a waiver of such rights. No changes or modifications or waivers to this Agreement will be effective unless in writing and signed by both parties. In the event that any provision of this agreement shall be determined to be illegal or unenforceable, that provision will be limited or eliminated to the minimum extent necessary so that this agreement shall otherwise remain in full force and effect and enforceable. This agreement shall be governed by and construed in accordance with the laws of the State of California in the United States without regard to the conflicts of laws provisions thereof. In any action or proceeding to enforce rights under this agreement, the prevailing party will be entitled to recover costs and attorneys’ fees.
-
-
-<iframe src="https://docs.google.com/forms/d/1iagLZBotC4IIrz7TXvEdPU5tCtFDk__C5Rs92afXpCE/viewform?embedded=true" width="800" height="820" frameborder="0" marginheight="0" marginwidth="0">Loading CLA...</iframe>
\ No newline at end of file

From 072c1559bad71cf72ed3ff7947ee09c7201aeb05 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 20 Feb 2017 11:35:57 +0100
Subject: [PATCH 138/301] middlware: prevent orgredirect to open body stream

the org redirecter opened the body stream by misstake. Causing
downstream code to start reading from an empty stream and raise errors.
---
 pkg/middleware/org_redirect.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/middleware/org_redirect.go b/pkg/middleware/org_redirect.go
index b1146a500e1..5945663d4d1 100644
--- a/pkg/middleware/org_redirect.go
+++ b/pkg/middleware/org_redirect.go
@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"net/http"
+	"strconv"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/models"
@@ -11,8 +12,10 @@ import (
 
 func OrgRedirect() macaron.Handler {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
-		orgId := c.QueryInt64("orgId")
-		if orgId == 0 {
+		orgIdValue := req.URL.Query().Get("orgId")
+		orgId, err := strconv.ParseInt(orgIdValue, 10, 32)
+
+		if err != nil || orgId == 0 {
 			return
 		}
 

From b01fd3d0b5c0b9550e4c0bfa2b2678e5d5f22f55 Mon Sep 17 00:00:00 2001
From: tamayika <tamayika40@gmail.com>
Date: Tue, 21 Feb 2017 05:01:52 +0900
Subject: [PATCH 139/301] Support for all ad-hoc filter operators on
 Elasticsearch (#7612)

---
 .../datasource/elasticsearch/query_builder.js | 23 ++++++++++++++++++-
 .../specs/query_builder_specs.ts              | 12 +++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 0cd592b0846..11e8b69ddaa 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -120,7 +120,28 @@ function (queryDef) {
       filter = adhocFilters[i];
       condition = {};
       condition[filter.key] = filter.value;
-      query.query.bool.filter.push({"term": condition});
+      switch(filter.operator){
+        case "=":
+          query.query.bool.filter.push({"term": condition});
+          break;
+        case "!=":
+          query.query.bool.filter.push({"bool": {"must_not": {"term": condition}}});
+          break;
+        case "<":
+          condition[filter.key] = {"lt": filter.value};
+          query.query.bool.filter.push({"range": condition});
+          break;
+        case ">":
+          condition[filter.key] = {"gt": filter.value};
+          query.query.bool.filter.push({"range": condition});
+          break;
+        case "=~":
+          query.query.bool.filter.push({"regexp": condition});
+          break;
+        case "!~":
+          query.query.bool.filter.push({"bool": {"must_not": {"regexp": condition}}});
+          break;
+      }
     }
   };
 
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
index e5d58c9db53..e60cde7a163 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
@@ -255,9 +255,19 @@ describe('ElasticQueryBuilder', function() {
       timeField: '@timestamp',
       bucketAggs: [{type: 'date_histogram', field: '@timestamp', id: '3'}],
     }, [
-      {key: 'key1', operator: '=', value: 'value1'}
+      {key: 'key1', operator: '=', value: 'value1'},
+      {key: 'key2', operator: '!=', value: 'value2'},
+      {key: 'key3', operator: '<', value: 'value3'},
+      {key: 'key4', operator: '>', value: 'value4'},
+      {key: 'key5', operator: '=~', value: 'value5'},
+      {key: 'key6', operator: '!~', value: 'value6'},
     ]);
 
     expect(query.query.bool.filter[2].term["key1"]).to.be("value1");
+    expect(query.query.bool.filter[3].bool.must_not.term["key2"]).to.be("value2");
+    expect(query.query.bool.filter[4].range["key3"].lt).to.be("value3");
+    expect(query.query.bool.filter[5].range["key4"].gt).to.be("value4");
+    expect(query.query.bool.filter[6].regexp["key5"]).to.be("value5");
+    expect(query.query.bool.filter[7].bool.must_not.regexp["key6"]).to.be("value6");
   });
 });

From 99f1c30071e770a30abfb86b00e5aaf2dd150253 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 20 Feb 2017 21:44:15 +0100
Subject: [PATCH 140/301] tech: use context package over xperimental version

---
 pkg/api/login_oauth.go | 2 +-
 pkg/social/social.go   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 2bf9c484803..e4f8cae1fd6 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"golang.org/x/net/context"
+	"context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 860d068957e..5b966973be4 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	"golang.org/x/net/context"
+	"context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/setting"

From 70b36a02af3601862d00720d1410398a3f83cf3b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 20 Feb 2017 22:04:51 +0100
Subject: [PATCH 141/301] Revert "tech: use context package over xperimental
 version"

This reverts commit 99f1c30071e770a30abfb86b00e5aaf2dd150253.
---
 pkg/api/login_oauth.go | 2 +-
 pkg/social/social.go   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index e4f8cae1fd6..2bf9c484803 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 5b966973be4..860d068957e 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	"context"
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/setting"

From 4039e5edbc11a745856d33ed752e84ff28e441fe Mon Sep 17 00:00:00 2001
From: Aaron Roydhouse <aaron@roydhouse.com>
Date: Tue, 21 Feb 2017 04:09:50 -0500
Subject: [PATCH 142/301] Improve 'external_image_storage.s3' documentation
 (#7623)

Add documentation for 'external_image_storage.s3' to explain how to specify the AWS region for the S3 bucket, and the requires S3/IAM permissions.
---
 docs/sources/installation/configuration.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 6805188be05..4a2b60cb48d 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -602,13 +602,18 @@ You can choose between (s3, webdav). If left empty Grafana will ignore the uploa
 ## [external_image_storage.s3]
 
 ### bucket_url
-bucket url for s3. ex http://grafana.s3.amazonaws.com/
+Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g. 
+- http://grafana.s3.amazonaws.com/
+- https://grafana.s3-ap-southeast-2.amazonaws.com/
+- https://grafana.s3-cn-north-1.amazonaws.com.cn
 
 ### access_key
-access key. ex AAAAAAAAAAAAAAAAAAAA
+Access key. e.g. AAAAAAAAAAAAAAAAAAAA
+
+Access key requires permissions to the S3 bucket for the 's3:PutObject' and 's3:PutObjectAcl' actions.
 
 ### secret_key
-secret key. ex AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+Secret key. e.g. AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
 ## [external_image_storage.webdav]
 

From d5245fd19aa8351a5a8d20e40ed0de16a8d6aeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 21 Feb 2017 10:49:50 +0100
Subject: [PATCH 143/301] docs(): updated changelog with #7612

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30dd5f132d7..3c3395fa357 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
 * **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [@lpic10](https://github.com/lpic10)
 * **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
+* **Elasticsearch**: Ad-hoc filters now support all operators [#7612](https://github.com/grafana/grafana/issues/7612), thx [@tamayika](https://github.com/tamayika)
 * **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
 * **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
 * **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)

From 96a3ed0ac37ba20ba5cde8af64596ae14d16303a Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 21 Feb 2017 16:09:15 +0100
Subject: [PATCH 144/301] docs: new /api/users/search route

ref #7469. Description of new route that
adds paging for the users list.
---
 docs/sources/http_api/user.md | 43 ++++++++++++++++++++++++++++++++++-
 pkg/api/user.go               |  2 +-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/docs/sources/http_api/user.md b/docs/sources/http_api/user.md
index 6f849947416..9b759330489 100644
--- a/docs/sources/http_api/user.md
+++ b/docs/sources/http_api/user.md
@@ -13,7 +13,7 @@ parent = "http_api"
 
 ## Search Users
 
-`GET /api/users`
+`GET /api/users?perpage=10&page=1`
 
 **Example Request**:
 
@@ -22,6 +22,8 @@ parent = "http_api"
     Content-Type: application/json
     Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
+Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`.
+
 **Example Response**:
 
     HTTP/1.1 200
@@ -44,6 +46,45 @@ parent = "http_api"
       }
     ]
 
+## Search Users with Paging
+
+`GET /api/users/search?perpage=10&page=1`
+
+**Example Request**:
+
+    GET /api/users/search?perpage=10&page=1 HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the user list E.g. if `totalCount` is equal to 100 users and the `perpage` parameter is set to 10 then there are 10 pages of users.
+
+**Example Response**:
+
+    HTTP/1.1 200
+    Content-Type: application/json
+    {
+      "totalCount": 2,
+      "users": [
+        {
+          "id": 1,
+          "name": "Admin",
+          "login": "admin",
+          "email": "admin@mygraf.com",
+          "isAdmin": true
+        },
+        {
+          "id": 2,
+          "name": "User",
+          "login": "user",
+          "email": "user@mygraf.com",
+          "isAdmin": false
+        }
+      ],
+      "page": 1,
+      "perPage": 10
+    }
+
 ## Get single user by Id
 
 `GET /api/users/:id`
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 9a978503761..8dd6daab4bc 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -218,7 +218,7 @@ func SearchUsers(c *middleware.Context) Response {
 	return Json(200, query.Result.Users)
 }
 
-// GET /api/paged-users
+// GET /api/search
 func SearchUsersWithPaging(c *middleware.Context) Response {
 	query, err := searchUser(c)
 	if err != nil {

From 00dddca26ae42ad0671c223a36616dc30cdb0dfb Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 21 Feb 2017 14:47:02 +0100
Subject: [PATCH 145/301] alerting: dedupe alert notifications when running
 multiple servers

alert notifications will only be sent if the database value
is updated.

ref #6957
---
 pkg/models/alert.go                     | 1 +
 pkg/services/alerting/result_handler.go | 6 ++++++
 pkg/services/sqlstore/alert.go          | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/pkg/models/alert.go b/pkg/models/alert.go
index 61976677764..fa3f4b466a8 100644
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -35,6 +35,7 @@ const (
 
 var (
 	ErrCannotChangeStateOnPausedAlert error = fmt.Errorf("Cannot change state on pause alert")
+	ErrRequiresNewState               error = fmt.Errorf("update alert state requires a new state.")
 )
 
 func (s AlertStateType) IsValid() bool {
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
index 80e6ba5bf51..1298a5dda36 100644
--- a/pkg/services/alerting/result_handler.go
+++ b/pkg/services/alerting/result_handler.go
@@ -61,6 +61,12 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
 				handler.log.Error("Cannot change state on alert thats pause", "error", err)
 				return err
 			}
+
+			if err == m.ErrRequiresNewState {
+				handler.log.Info("Alert already updated")
+				return nil
+			}
+
 			handler.log.Error("Failed to save state", "error", err)
 		}
 
diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index 66f3b5b7250..4bf4cb5d0e9 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -240,6 +240,10 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
 			return m.ErrCannotChangeStateOnPausedAlert
 		}
 
+		if alert.State == cmd.State {
+			return m.ErrRequiresNewState
+		}
+
 		alert.State = cmd.State
 		alert.StateChanges += 1
 		alert.NewStateDate = time.Now()

From e5f5c1724a048e95395d894e29abcbaa540cb1fe Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 21 Feb 2017 17:27:21 +0100
Subject: [PATCH 146/301] templating: check for default data source (#7636)

For data source template variables, check if the
selected value is default and if so load the
default data source.

Fixes #7586
---
 public/app/core/services/datasource_srv.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/core/services/datasource_srv.js b/public/app/core/services/datasource_srv.js
index 7c876ebd941..e722aae355b 100644
--- a/public/app/core/services/datasource_srv.js
+++ b/public/app/core/services/datasource_srv.js
@@ -21,6 +21,10 @@ function (angular, _, coreModule, config) {
 
       name = templateSrv.replace(name);
 
+      if (name === 'default') {
+        return this.get(config.defaultDatasource);
+      }
+
       if (this.datasources[name]) {
         return $q.when(this.datasources[name]);
       }

From 9c84b9f94414081fffc68aeede69519a965347ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 22 Feb 2017 08:55:24 +0100
Subject: [PATCH 147/301] docs(): CLA fixes

---
 docs/sources/contribute/cla.md | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/docs/sources/contribute/cla.md b/docs/sources/contribute/cla.md
index fdac83ea3c4..1eef99b352a 100644
--- a/docs/sources/contribute/cla.md
+++ b/docs/sources/contribute/cla.md
@@ -10,7 +10,7 @@ weight = 1
 
 # Grafana Labs Contributor License Agreement
 
-Thank you for your interest in contributing to a Grafana Labs Project ("We" or "Us").
+Thank you for your interest in contributing to Grafana Labs ("We" or "Us").
 
 This contributor agreement ("Agreement") documents the rights granted by contributors to Us.
 To make this document effective, please sign it following the instructions at
@@ -46,21 +46,11 @@ one software project managed by Us.
 
 (b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3.
 
-### 2.1 Copyright Assignment
-
-(a) At the time the Contribution is Submitted, You assign to Us all right, title, and interest worldwide in all Copyright covering the Contribution; provided that this transfer is conditioned upon compliance with Section 2.3.
-
-(b) To the extent that any of the rights in Section 2.1(a) cannot be assigned by You to Us, You grant to Us a perpetual, worldwide, exclusive, royalty-free, transferable, irrevocable license under such non-assigned rights, with rights to sublicense through multiple tiers of sublicensees, to practice such non-assigned rights, including, but not limited to, the right to reproduce, modify, display, perform and distribute the Contribution; provided that this license is conditioned upon compliance with Section 2.3.
-
-\(c) To the extent that any of the rights in Section 2.1(a) can neither be assigned nor licensed by You to Us, You irrevocably waive and agree never to assert such rights against Us, any of our successors in interest, or any of our licensees, either direct or indirect; provided that this agreement not to assert is conditioned upon compliance with Section 2.3.
-
-(d) Upon such transfer of rights to Us, to the maximum extent possible, We immediately grant to You a perpetual, worldwide, non-exclusive, royalty-free, transferable, irrevocable license under such rights covering the Contribution, with rights to sublicense through multiple tiers of sublicensees, to reproduce, modify, display, perform, and distribute the Contribution. The intention of the parties is that this license will be as broad as possible and to provide You with rights as similar as possible to the owner of the rights that You transferred. This license back is limited to the Contribution and does not provide any rights to the Material.
-
 ### 2.2 Patent License
 
 For patent claims including, without limitation, method, process, and apparatus claims which You [or Your Affiliates] own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3.
 
-## 2.3 Outbound License
+### 2.3 Outbound License
 
 As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or any licenses which are approved by the Open Source Initiative on or after the Effective Date, including both permissive and copyleft licenses, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license if permitted).
 

From e3b71ed95e9e7ebab063dfe9333d56baa3ba23d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 22 Feb 2017 09:10:08 +0100
Subject: [PATCH 148/301] docs(): updated CLA

---
 docs/sources/contribute/cla.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/contribute/cla.md b/docs/sources/contribute/cla.md
index 1eef99b352a..7059463b21b 100644
--- a/docs/sources/contribute/cla.md
+++ b/docs/sources/contribute/cla.md
@@ -84,7 +84,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU [OR US]
 
 ## 6. Miscellaneous
 
-6.1 This Agreement will be governed by and construed in accordance with the laws of [JURISDICTION] excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
+6.1 This Agreement will be governed by and construed in accordance with the laws of New York State, United States excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
 
 6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
 

From 5a30b08b14a1587b39a85e60c006cc701b4711fd Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Mon, 13 Feb 2017 22:27:12 +0900
Subject: [PATCH 149/301] add keyboard shotcuts for collapse/expand rows

---
 public/app/core/services/keybindingSrv.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 7cff30ee903..c382d751188 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -187,6 +187,20 @@ export class KeybindingSrv {
       }
     });
 
+    // collapse all rows
+    this.bind('r C', () => {
+      _.each(dashboard.rows, function(row) {
+        row.collapse = true;
+      });
+    });
+
+    // expand all rows
+    this.bind('r E', () => {
+      _.each(dashboard.rows, function(row) {
+        row.collapse = false;
+      });
+    });
+
     this.bind('d r', () => {
       scope.broadcastRefresh();
     });

From e828f3a97b5e8ca41754a6d30cf5d27079b7d0a4 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 10:32:30 +0100
Subject: [PATCH 150/301] shortcuts: change init bind key to d

---
 public/app/core/services/keybindingSrv.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index c382d751188..e591351b875 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -188,14 +188,14 @@ export class KeybindingSrv {
     });
 
     // collapse all rows
-    this.bind('r C', () => {
+    this.bind('d C', () => {
       _.each(dashboard.rows, function(row) {
         row.collapse = true;
       });
     });
 
     // expand all rows
-    this.bind('r E', () => {
+    this.bind('d E', () => {
       _.each(dashboard.rows, function(row) {
         row.collapse = false;
       });

From c5a76fba875d4cb436cb3daecb3b904eb6abc52b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 10:33:24 +0100
Subject: [PATCH 151/301] shortcuts: add expand/collapse to shortcut help

---
 public/app/core/components/help/help.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/core/components/help/help.ts b/public/app/core/components/help/help.ts
index 3bc9b57077a..f7914a73a28 100644
--- a/public/app/core/components/help/help.ts
+++ b/public/app/core/components/help/help.ts
@@ -26,6 +26,8 @@ export class HelpCtrl {
         {keys: ['d', 's'], description: 'Dashboard settings'},
         {keys: ['d', 'v'], description: 'Toggle in-active / view mode'},
         {keys: ['d', 'k'], description: 'Toggle kiosk mode (hides top nav)'},
+        {keys: ['d', 'E'], description: 'Expand all rows'},
+        {keys: ['d', 'C'], description: 'Collapse all ros'},
         {keys: ['mod+o'], description: 'Toggle shared graph crosshair'},
       ],
       'Focused Panel': [

From 9ed1d12cc0fd587b5ab2df9f4a31d6beabd8395a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 10:36:30 +0100
Subject: [PATCH 152/301] style: use for loops over _.each in typescript

---
 public/app/core/services/keybindingSrv.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index e591351b875..7abc3993e9d 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -189,16 +189,16 @@ export class KeybindingSrv {
 
     // collapse all rows
     this.bind('d C', () => {
-      _.each(dashboard.rows, function(row) {
+      for (let row of dashboard.rows) {
         row.collapse = true;
-      });
+      }
     });
 
     // expand all rows
     this.bind('d E', () => {
-      _.each(dashboard.rows, function(row) {
+      for (let row of dashboard.rows) {
         row.collapse = false;
-      });
+      }
     });
 
     this.bind('d r', () => {

From c1d69358baba38a8a1f7f2cf76565390bc927519 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 10:39:52 +0100
Subject: [PATCH 153/301] changelog: adds note about closing #552

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c3395fa357..6716f46c611 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 * **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
+* **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From 607ee635d154e0246e3187a017b786ee615b3797 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 10:49:59 +0100
Subject: [PATCH 154/301] alerting: adds deduping of alert notifications

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6716f46c611..d2cb4b419f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
 * **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
 * **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
+* **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From dea2e5d7436c1c88f3c64e4e2024a82a9c1281ad Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 11:24:06 +0100
Subject: [PATCH 155/301] changelog: adds note about closing #6948

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2cb4b419f1..f602e5e8a21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
 * **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
+* **Orgs**: Change org when url contains a orgId query parameter [#6948](https://github.com/grafana/grafana/issues/6948)
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From fdb06c7c1033eb5dd1b3e1387e123a68de5da9fe Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 13:56:04 +0100
Subject: [PATCH 156/301] sharing: set orgId as query parameter when sharing a
 dashboard

to make sure an user opens the dashboard in the correct org, orgId will
always be added when sharing a dashboard. if the users current orgId
doesnt match the query parameter grafana will change it and redirect the
user.

closes #1613
---
 public/app/features/dashboard/shareModalCtrl.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js
index 54b09fbc6d2..d4075c1e641 100644
--- a/public/app/features/dashboard/shareModalCtrl.js
+++ b/public/app/features/dashboard/shareModalCtrl.js
@@ -51,6 +51,7 @@ function (angular, _, $, moment, require, config) {
       var range = timeSrv.timeRange();
       params.from = range.from.valueOf();
       params.to = range.to.valueOf();
+      params.orgId = config.bootData.user.orgId;
 
       if ($scope.options.includeTemplateVars) {
         templateSrv.fillVariableValuesForUrl(params);

From fe223cbc969390ba0ba1fb1d36090cb8b6152229 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 14:04:01 +0100
Subject: [PATCH 157/301] changelog: adds note about closing #1613

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f602e5e8a21..d0f30812cd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@
 * **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
 * **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
-* **Orgs**: Change org when url contains a orgId query parameter [#6948](https://github.com/grafana/grafana/issues/6948)
+* **Orgs**: Sharing dashboards using Grafana share feature will not redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
+
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From 73830a44fe391ce62efd2a3cf33022fc56403a8b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 22 Feb 2017 14:29:49 +0100
Subject: [PATCH 158/301] sharemodal: fixes broken unittests

---
 public/test/specs/shareModalCtrl-specs.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/public/test/specs/shareModalCtrl-specs.js b/public/test/specs/shareModalCtrl-specs.js
index 4bd3760ad5e..f23dcb61f3a 100644
--- a/public/test/specs/shareModalCtrl-specs.js
+++ b/public/test/specs/shareModalCtrl-specs.js
@@ -2,7 +2,8 @@ define([
   './helpers',
   'app/features/dashboard/shareModalCtrl',
   'app/features/panellinks/linkSrv',
-], function(helpers) {
+  'app/core/config',
+], function(helpers, shareModalCtrl, linkSrv, config) {
   'use strict';
 
   describe('ShareModalCtrl', function() {
@@ -12,6 +13,14 @@ define([
       ctx.timeSrv.timeRange = sinon.stub().returns(range);
     }
 
+    beforeEach(function() {
+      config.bootData = {
+        user: {
+          orgId: 1
+        }
+      };
+    });
+
     setTime({ from: new Date(1000), to: new Date(2000) });
 
     beforeEach(module('grafana.controllers'));
@@ -25,13 +34,12 @@ define([
     beforeEach(ctx.createControllerPhase('ShareModalCtrl'));
 
     describe('shareUrl with current time range and panel', function() {
-
       it('should generate share url absolute time', function() {
         ctx.$location.path('/test');
         ctx.scope.panel = { id: 22 };
 
         ctx.scope.init();
-        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&panelId=22&fullscreen');
+        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&panelId=22&fullscreen');
       });
 
       it('should generate render url', function() {
@@ -41,7 +49,7 @@ define([
 
         ctx.scope.init();
         var base = 'http://dashboards.grafana.com/render/dashboard-solo/db/my-dash';
-        var params = '?from=1000&to=2000&panelId=22&width=1000&height=500&tz=UTC';
+        var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
         expect(ctx.scope.imageUrl).to.contain(base + params);
       });
 
@@ -51,7 +59,7 @@ define([
         ctx.scope.panel = null;
 
         ctx.scope.init();
-        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000');
+        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1');
       });
 
       it('should add theme when specified', function() {
@@ -60,7 +68,7 @@ define([
         ctx.scope.panel = null;
 
         ctx.scope.init();
-        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&theme=light');
+        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&theme=light');
       });
 
       it('should include template variables in url', function() {
@@ -73,7 +81,7 @@ define([
         };
 
         ctx.scope.buildUrl();
-        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&var-app=mupp&var-server=srv-01');
+        expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&var-app=mupp&var-server=srv-01');
       });
 
     });

From d88286ab810cbfdf3455849aaa2376f42d86ca09 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 23 Feb 2017 11:03:37 +0100
Subject: [PATCH 159/301] orgs: set orgId as query param on load

ref #1613
---
 public/app/features/dashboard/viewStateSrv.js   |  4 +++-
 .../test/specs/dashboardViewStateSrv-specs.js   | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js
index 681e1377bad..70590e3c497 100644
--- a/public/app/features/dashboard/viewStateSrv.js
+++ b/public/app/features/dashboard/viewStateSrv.js
@@ -2,8 +2,9 @@ define([
   'angular',
   'lodash',
   'jquery',
+  'app/core/config'
 ],
-function (angular, _, $) {
+function (angular, _, $, config) {
   'use strict';
 
   var module = angular.module('grafana.services');
@@ -63,6 +64,7 @@ function (angular, _, $) {
       state.fullscreen = state.fullscreen ? true : null;
       state.edit =  (state.edit === "true" || state.edit === true) || null;
       state.editview = state.editview || null;
+      state.orgId = config.bootData.user.orgId;
       return state;
     };
 
diff --git a/public/test/specs/dashboardViewStateSrv-specs.js b/public/test/specs/dashboardViewStateSrv-specs.js
index 90e35810ac0..42bbf709655 100644
--- a/public/test/specs/dashboardViewStateSrv-specs.js
+++ b/public/test/specs/dashboardViewStateSrv-specs.js
@@ -1,6 +1,7 @@
 define([
-  'app/features/dashboard/viewStateSrv'
-], function() {
+  'app/features/dashboard/viewStateSrv',
+  'app/core/config'
+], function(viewStateSrv, config) {
   'use strict';
 
   describe('when updating view state', function() {
@@ -12,7 +13,13 @@ define([
         orgId: 19
       }
     };
-
+    beforeEach(function() {
+      config.bootData = {
+        user: {
+          orgId: 1
+        }
+      };
+    });
     beforeEach(module('grafana.services'));
     beforeEach(module(function($provide) {
       $provide.value('timeSrv', timeSrv);
@@ -31,7 +38,7 @@ define([
       it('should update querystring and view state', function() {
         var updateState = {fullscreen: true, edit: true, panelId: 1};
         viewState.update(updateState);
-        expect(location.search()).to.eql({fullscreen: true, edit: true, panelId: 1});
+        expect(location.search()).to.eql({fullscreen: true, edit: true, panelId: 1, orgId: 1});
         expect(viewState.dashboard.meta.fullscreen).to.be(true);
         expect(viewState.state.fullscreen).to.be(true);
       });
@@ -45,7 +52,5 @@ define([
         expect(viewState.state.fullscreen).to.be(null);
       });
     });
-
   });
-
 });

From 68bb417db9efee7793c3e30a8a33f0a06c633ef8 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Thu, 23 Feb 2017 23:02:35 +0900
Subject: [PATCH 160/301] support [[var]] in cloudwatch datasource (#7649)

* support [[var]] form in cloudwatch datasource

* support multi variable in single dimension

* fix test
---
 .../datasource/cloudwatch/datasource.js       | 22 ++++++++++---------
 .../cloudwatch/specs/datasource_specs.ts      | 11 ++++++++--
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index dc57c41b94d..60c7e167a06 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -4,9 +4,10 @@ define([
   'moment',
   'app/core/utils/datemath',
   'app/core/utils/kbn',
+  'app/features/templating/variable',
   './annotation_query',
 ],
-function (angular, _, moment, dateMath, kbn, CloudWatchAnnotationQuery) {
+function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnotationQuery) {
   'use strict';
 
   /** @ngInject */
@@ -390,7 +391,7 @@ function (angular, _, moment, dateMath, kbn, CloudWatchAnnotationQuery) {
       });
     }
 
-    this.getExpandedVariables = function(target, dimensionKey, variable) {
+    this.getExpandedVariables = function(target, dimensionKey, variable, templateSrv) {
       /* if the all checkbox is marked we should add all values to the targets */
       var allSelected = _.find(variable.options, {'selected': true, 'text': 'All'});
       return _.chain(variable.options)
@@ -403,15 +404,13 @@ function (angular, _, moment, dateMath, kbn, CloudWatchAnnotationQuery) {
       })
       .map(function(v) {
         var t = angular.copy(target);
-        t.dimensions[dimensionKey] = v.value;
+        var scopedVar = {};
+        scopedVar[variable.name] = v;
+        t.dimensions[dimensionKey] = templateSrv.replace(t.dimensions[dimensionKey], scopedVar);
         return t;
       }).value();
     };
 
-    this.containsVariable = function (str, variableName) {
-      return str.indexOf('$' + variableName) !== -1;
-    };
-
     this.expandTemplateVariable = function(targets, scopedVars, templateSrv) {
       var self = this;
       return _.chain(targets)
@@ -421,10 +420,13 @@ function (angular, _, moment, dateMath, kbn, CloudWatchAnnotationQuery) {
         });
 
         if (dimensionKey) {
-          var variable = _.find(templateSrv.variables, function(variable) {
-            return self.containsVariable(target.dimensions[dimensionKey], variable.name);
+          var multiVariable = _.find(templateSrv.variables, function(variable) {
+            return templatingVariable.containsVariable(target.dimensions[dimensionKey], variable.name) && variable.multi;
           });
-          return self.getExpandedVariables(target, dimensionKey, variable);
+          var variable = _.find(templateSrv.variables, function(variable) {
+            return templatingVariable.containsVariable(target.dimensions[dimensionKey], variable.name);
+          });
+          return self.getExpandedVariables(target, dimensionKey, multiVariable || variable, templateSrv);
         } else {
           return [target];
         }
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
index 93dfa24036d..afc0f4a5962 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
@@ -134,11 +134,18 @@ describe('CloudWatchDatasource', function() {
           {
             name: 'instance_id',
             options: [
-              { value: 'i-23456789', selected: false },
-              { value: 'i-34567890', selected: true }
+              { text: 'i-23456789', value: 'i-23456789', selected: false },
+              { text: 'i-34567890', value: 'i-34567890', selected: true }
             ]
           }
         ],
+        replace: function (target, scopedVars) {
+          if (target === '$instance_id' && scopedVars['instance_id']['text'] === 'i-34567890') {
+            return 'i-34567890';
+          } else {
+            return '';
+          }
+        },
         getVariableName: function (e) { return 'instance_id'; },
         variableExists: function (e) { return true; },
         containsVariable: function (str, variableName) { return str.indexOf('$' + variableName) !== -1; }

From d6eaaf3add7741e13da58b940496db5e6080dd11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 23 Feb 2017 15:56:37 +0100
Subject: [PATCH 161/301] refactor: minor refactoring

---
 public/app/plugins/panel/graph/module.ts      | 25 +++++++++----
 .../panel/graph/specs/graph_ctrl_specs.ts     | 12 +++----
 public/app/plugins/panel/graph/template.ts    | 13 ++-----
 public/test/core/time_series_specs.js         | 36 ++++++++++---------
 4 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 1a8fb3c0481..01f7a485aa6 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -26,8 +26,7 @@ class GraphCtrl extends MetricsPanelCtrl {
   alertState: any;
 
   annotationsPromise: any;
-  datapointsCount: number;
-  datapointsOutside: boolean;
+  dataWarning: any;
   colors: any = [];
   subTabIndex: number;
   processor: DataProcessor;
@@ -178,14 +177,26 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.dataList = dataList;
     this.seriesList = this.processor.getSeriesList({dataList: dataList, range: this.range});
 
-    this.datapointsCount = this.seriesList.reduce((prev, series) => {
+    this.dataWarning = null;
+    const datapointsCount = this.seriesList.reduce((prev, series) => {
       return prev + series.datapoints.length;
     }, 0);
 
-    this.datapointsOutside = false;
-    for (let series of this.seriesList) {
-      if (series.isOutsideRange) {
-        this.datapointsOutside = true;
+    if (datapointsCount === 0) {
+      this.dataWarning = {
+        title: 'No data points',
+        tip: 'No datapoints returned from data query'
+      };
+    } else {
+
+      for (let series of this.seriesList) {
+        if (series.isOutsideRange) {
+          this.dataWarning = {
+            title: 'Data points outside time range',
+            tip: 'Can be caused by timezone mismatch or missing time filter in query',
+          };
+          break;
+        }
       }
     }
 
diff --git a/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts b/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts
index d06c66e253a..ab91b87ece9 100644
--- a/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts
+++ b/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts
@@ -35,7 +35,7 @@ describe('GraphCtrl', function() {
     });
 
     it('should set datapointsOutside', function() {
-      expect(ctx.ctrl.datapointsOutside).to.be(true);
+      expect(ctx.ctrl.dataWarning.title).to.be('Data points outside time range');
     });
   });
 
@@ -55,21 +55,21 @@ describe('GraphCtrl', function() {
     });
 
     it('should set datapointsOutside', function() {
-      expect(ctx.ctrl.datapointsOutside).to.be(false);
+      expect(ctx.ctrl.dataWarning).to.be(null);
     });
   });
 
   describe('datapointsCount given 2 series', function() {
     beforeEach(function() {
       var data = [
-        {target: 'test.cpu1', datapoints: [[45, 1234567890], [60, 1234567899]]},
-        {target: 'test.cpu2', datapoints: [[45, 1234567890]]},
+        {target: 'test.cpu1', datapoints: []},
+        {target: 'test.cpu2', datapoints: []},
       ];
       ctx.ctrl.onDataReceived(data);
     });
 
-    it('should set datapointsCount to sum of datapoints', function() {
-      expect(ctx.ctrl.datapointsCount).to.be(3);
+    it('should set datapointsCount warning', function() {
+      expect(ctx.ctrl.dataWarning.title).to.be('No data points');
     });
   });
 
diff --git a/public/app/plugins/panel/graph/template.ts b/public/app/plugins/panel/graph/template.ts
index ec6cd8d0907..6ded97ce33a 100644
--- a/public/app/plugins/panel/graph/template.ts
+++ b/public/app/plugins/panel/graph/template.ts
@@ -2,17 +2,8 @@ var template = `
 <div class="graph-wrapper" ng-class="{'graph-legend-rightside': ctrl.panel.legend.rightSide}">
   <div class="graph-canvas-wrapper">
 
-    <div class="datapoints-warning" ng-show="ctrl.datapointsCount===0">
-      <span class="small" >
-        No datapoints <tip>No datapoints returned from metric query</tip>
-      </span>
-    </div>
-
-    <div class="datapoints-warning" ng-show="ctrl.datapointsOutside">
-      <span class="small">
-        Datapoints outside time range
-        <tip>Can be caused by timezone mismatch between browser and graphite server</tip>
-      </span>
+    <div class="datapoints-warning" ng-if="ctrl.dataWarning">
+      <span class="small" bs-tooltip="ctrl.dataWarning.tip">{{ctrl.dataWarning.title}}</span>
     </div>
 
     <div grafana-graph class="histogram-chart" ng-dblclick="ctrl.zoomOut()">
diff --git a/public/test/core/time_series_specs.js b/public/test/core/time_series_specs.js
index 829f74d3515..04efa8a2249 100644
--- a/public/test/core/time_series_specs.js
+++ b/public/test/core/time_series_specs.js
@@ -6,12 +6,16 @@ define([
   describe("TimeSeries", function() {
     var points, series;
     var yAxisFormats = ['short', 'ms'];
-    var testData = {
-      alias: 'test',
-      datapoints: [
-        [1,2],[null,3],[10,4],[8,5]
-      ]
-    };
+    var testData;
+
+    beforeEach(function() {
+      testData = {
+        alias: 'test',
+        datapoints: [
+          [1,2],[null,3],[10,4],[8,5]
+        ]
+      };
+    });
 
     describe('when getting flot pairs', function() {
       it('with connected style, should ignore nulls', function() {
@@ -51,40 +55,40 @@ define([
 
       it('the delta value should account for nulls', function() {
         series = new TimeSeries({
-                 datapoints: [[1,2],[3,3],[null,4],[10,5],[15,6]]
-               });
+          datapoints: [[1,2],[3,3],[null,4],[10,5],[15,6]]
+        });
         series.getFlotPairs('null', yAxisFormats);
         expect(series.stats.delta).to.be(14);
       });
 
       it('the delta value should account for nulls on first', function() {
         series = new TimeSeries({
-                 datapoints: [[null,2],[1,3],[10,4],[15,5]]
-               });
+          datapoints: [[null,2],[1,3],[10,4],[15,5]]
+        });
         series.getFlotPairs('null', yAxisFormats);
         expect(series.stats.delta).to.be(14);
       });
 
       it('the delta value should account for nulls on last', function() {
         series = new TimeSeries({
-                 datapoints: [[1,2],[5,3],[10,4],[null,5]]
-               });
+          datapoints: [[1,2],[5,3],[10,4],[null,5]]
+        });
         series.getFlotPairs('null', yAxisFormats);
         expect(series.stats.delta).to.be(9);
       });
 
       it('the delta value should account for resets', function() {
         series = new TimeSeries({
-                 datapoints: [[1,2],[5,3],[10,4],[0,5],[10,6]]
-               });
+          datapoints: [[1,2],[5,3],[10,4],[0,5],[10,6]]
+        });
         series.getFlotPairs('null', yAxisFormats);
         expect(series.stats.delta).to.be(19);
       });
 
       it('the delta value should account for resets on last', function() {
         series = new TimeSeries({
-                 datapoints: [[1,2],[2,3],[10,4],[8,5]]
-               });
+          datapoints: [[1,2],[2,3],[10,4],[8,5]]
+        });
         series.getFlotPairs('null', yAxisFormats);
         expect(series.stats.delta).to.be(17);
       });

From 67b8b9743bfc2640818dae80398cc02b9bbd4eef Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 24 Feb 2017 07:30:47 +0100
Subject: [PATCH 162/301] changelog: note about closing #7602

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0f30812cd7..40ae827d89f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
 * **Orgs**: Sharing dashboards using Grafana share feature will not redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
 
-
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)
 * **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
@@ -32,6 +31,7 @@
 * **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
 * **Email**: Add sender's name on email [#2131](https://github.com/grafana/grafana/issues/2131) thx [@jacobbednarz](https://github.com/jacobbednarz)
 * **HTTPS**: Set tls 1.2 as lowest tls version. [#7347](https://github.com/grafana/grafana/pull/7347) thx [@roman-vynar](https://github.com/roman-vynar)
+* **Table**: Added suppressing of empty results to table plugin. [#7602](https://github.com/grafana/grafana/pull/7602) thx [@LLIyRiK](https://github.com/LLIyRiK)
 
 ## Tech
 

From 785cecac2665726b67dfb58291eb8b28e6d2deb5 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 24 Feb 2017 07:35:45 +0100
Subject: [PATCH 163/301] changelog: adds note about closing #7526

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40ae827d89f..0209ac12d15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
 * **Orgs**: Sharing dashboards using Grafana share feature will not redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
+* **Pushover**: Add Pushover alert notifications [#7526](https://github.com/grafana/grafana/pull/7526) thx [@devkid](https://github.com/devkid)
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From 46ac8c098fdc7428cb351c71dc5cb2464b6bc3fd Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 24 Feb 2017 07:42:30 +0100
Subject: [PATCH 164/301] changelog: adds note about closing #7482

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0209ac12d15..3c540f02035 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
 * **Orgs**: Sharing dashboards using Grafana share feature will not redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
 * **Pushover**: Add Pushover alert notifications [#7526](https://github.com/grafana/grafana/pull/7526) thx [@devkid](https://github.com/devkid)
+* **Threema**: Add Threema Gateway alert notification integration [#7482](https://github.com/grafana/grafana/pull/7482) thx [@dbrgn](https://github.com/dbrgn)
 
 ## Minor Enhancements
 * **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)

From e73b306e0ccb7cbce1753f9f3015f38772e03429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 24 Feb 2017 08:16:37 +0100
Subject: [PATCH 165/301] fix(templating): fixed duplicate dashboard refresh
 when changing template variable, #7654

---
 public/app/features/dashboard/time_srv.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/time_srv.ts b/public/app/features/dashboard/time_srv.ts
index e6c5f1f6212..38577982953 100644
--- a/public/app/features/dashboard/time_srv.ts
+++ b/public/app/features/dashboard/time_srv.ts
@@ -96,11 +96,15 @@ class TimeSrv {
         this.initTimeFromUrl();
         this.setTime(this.time, true);
       }
-    } else {
+    } else if (this.timeHasChangedSinceLoad()) {
       this.setTime(this.timeAtLoad, true);
     }
   }
 
+  private timeHasChangedSinceLoad() {
+    return this.timeAtLoad.from !== this.time.from || this.timeAtLoad.to !== this.time.to;
+  }
+
   setAutoRefresh(interval) {
     this.dashboard.refresh = interval;
     if (interval) {

From 03354bc49a5a1250d83085e18297b2a934b8c7be Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 24 Feb 2017 09:20:21 +0100
Subject: [PATCH 166/301] tech: replace context.TODO with background ctx

---
 pkg/api/metrics.go                         | 2 +-
 pkg/services/alerting/engine.go            | 2 +-
 pkg/services/alerting/test_notification.go | 2 +-
 pkg/services/alerting/test_rule.go         | 2 +-
 pkg/services/notifications/webhook.go      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index dad3b159ad6..9194637af15 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -33,7 +33,7 @@ func QueryMetrics(c *middleware.Context, reqDto dtos.MetricRequest) Response {
 		})
 	}
 
-	resp, err := tsdb.HandleRequest(context.TODO(), request)
+	resp, err := tsdb.HandleRequest(context.Background(), request)
 	if err != nil {
 		return ApiError(500, "Metric request error", err)
 	}
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index b99b7506614..51d48287c14 100644
--- a/pkg/services/alerting/engine.go
+++ b/pkg/services/alerting/engine.go
@@ -98,7 +98,7 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
 		}
 	}()
 
-	alertCtx, cancelFn := context.WithTimeout(context.TODO(), alertTimeout)
+	alertCtx, cancelFn := context.WithTimeout(context.Background(), alertTimeout)
 
 	job.Running = true
 	evalContext := NewEvalContext(alertCtx, job.Rule)
diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go
index d5def91d1c5..91b3814ac7b 100644
--- a/pkg/services/alerting/test_notification.go
+++ b/pkg/services/alerting/test_notification.go
@@ -50,7 +50,7 @@ func createTestEvalContext(cmd *NotificationTestCommand) *EvalContext {
 		State:       m.AlertStateAlerting,
 	}
 
-	ctx := NewEvalContext(context.TODO(), testRule)
+	ctx := NewEvalContext(context.Background(), testRule)
 	if cmd.Settings.Get("uploadImage").MustBool(true) {
 		ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png"
 	}
diff --git a/pkg/services/alerting/test_rule.go b/pkg/services/alerting/test_rule.go
index 82b1a6276a1..e3aa95e0ede 100644
--- a/pkg/services/alerting/test_rule.go
+++ b/pkg/services/alerting/test_rule.go
@@ -49,7 +49,7 @@ func handleAlertTestCommand(cmd *AlertTestCommand) error {
 func testAlertRule(rule *Rule) *EvalContext {
 	handler := NewEvalHandler()
 
-	context := NewEvalContext(context.TODO(), rule)
+	context := NewEvalContext(context.Background(), rule)
 	context.IsTestRun = true
 
 	handler.Eval(context)
diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
index cf39af10478..bab8519f566 100644
--- a/pkg/services/notifications/webhook.go
+++ b/pkg/services/notifications/webhook.go
@@ -37,7 +37,7 @@ func processWebhookQueue() {
 	for {
 		select {
 		case webhook := <-webhookQueue:
-			err := sendWebRequestSync(context.TODO(), webhook)
+			err := sendWebRequestSync(context.Background(), webhook)
 
 			if err != nil {
 				webhookLog.Error("Failed to send webrequest ", "error", err)

From 05952688c53e9c4d144830d842af9ba565ddbde2 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 24 Feb 2017 17:22:12 +0100
Subject: [PATCH 167/301] tech: avoid using http.DefaultClient

---
 pkg/components/imguploader/webdavuploader.go | 16 +++++++++++++++-
 pkg/services/notifications/webhook.go        | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go
index 541a44d4b4a..93b3f9d2efa 100644
--- a/pkg/components/imguploader/webdavuploader.go
+++ b/pkg/components/imguploader/webdavuploader.go
@@ -4,9 +4,11 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/url"
 	"path"
+	"time"
 
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -17,6 +19,18 @@ type WebdavUploader struct {
 	password string
 }
 
+var netTransport = &http.Transport{
+	Dial: (&net.Dialer{
+		Timeout: 60 * time.Second,
+	}).Dial,
+	TLSHandshakeTimeout: 5 * time.Second,
+}
+
+var netClient = &http.Client{
+	Timeout:   time.Second * 60,
+	Transport: netTransport,
+}
+
 func (u *WebdavUploader) Upload(pa string) (string, error) {
 	url, _ := url.Parse(u.url)
 	url.Path = path.Join(url.Path, util.GetRandomString(20)+".png")
@@ -28,7 +42,7 @@ func (u *WebdavUploader) Upload(pa string) (string, error) {
 		req.SetBasicAuth(u.username, u.password)
 	}
 
-	res, err := http.DefaultClient.Do(req)
+	res, err := netClient.Do(req)
 
 	if err != nil {
 		return "", err
diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
index bab8519f566..25d015e2db4 100644
--- a/pkg/services/notifications/webhook.go
+++ b/pkg/services/notifications/webhook.go
@@ -5,7 +5,9 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
+	"time"
 
 	"golang.org/x/net/context/ctxhttp"
 
@@ -22,6 +24,17 @@ type Webhook struct {
 	HttpHeader map[string]string
 }
 
+var netTransport = &http.Transport{
+	Dial: (&net.Dialer{
+		Timeout: 30 * time.Second,
+	}).Dial,
+	TLSHandshakeTimeout: 5 * time.Second,
+}
+var netClient = &http.Client{
+	Timeout:   time.Second * 30,
+	Transport: netTransport,
+}
+
 var (
 	webhookQueue chan *Webhook
 	webhookLog   log.Logger
@@ -68,7 +81,7 @@ func sendWebRequestSync(ctx context.Context, webhook *Webhook) error {
 		request.Header.Set(k, v)
 	}
 
-	resp, err := ctxhttp.Do(ctx, http.DefaultClient, request)
+	resp, err := ctxhttp.Do(ctx, netClient, request)
 	if err != nil {
 		return err
 	}

From ffe0ecfaaa4fd8505ed08bb35cb3767945d3fc1e Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 27 Feb 2017 10:33:26 +0100
Subject: [PATCH 168/301] release 4.2.0 beta1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc3970bfe69..dd2045e7c2f 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "4.2.0-pre1",
+  "version": "4.2.0-beta1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

From 8087af9c89c1f87b1e8d9269f0594cdb42b3dd97 Mon Sep 17 00:00:00 2001
From: Archit Sharma <arcshams@gmail.com>
Date: Mon, 27 Feb 2017 15:27:00 +0530
Subject: [PATCH 169/301] ES Nested type bucket aggregation (#4694) (#4694)

* (elasticsearch): add nested agg (use bucket aggs). fixes #4693

* (elasticsearch): rebased after merge of #6043 refactored from #4527
---
 .../datasource/elasticsearch/bucket_agg.js    | 32 ++++++++
 .../datasource/elasticsearch/datasource.js    |  3 +-
 .../elasticsearch/elastic_response.js         | 74 ++++++++++++-----
 .../elasticsearch/partials/bucket_agg.html    | 13 +++
 .../datasource/elasticsearch/query_builder.js | 80 +++++++++++++------
 .../datasource/elasticsearch/query_def.js     |  1 +
 .../specs/query_builder_specs.ts              | 31 +++++++
 7 files changed, 190 insertions(+), 44 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/bucket_agg.js b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
index 28f1df08251..7b3685fca5a 100644
--- a/public/app/plugins/datasource/elasticsearch/bucket_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
@@ -17,6 +17,7 @@ function (angular, _, queryDef) {
         target: "=",
         index: "=",
         onChange: "&",
+        // getNestedKeys: "&",
         getFields: "&",
       }
     };
@@ -52,14 +53,25 @@ function (angular, _, queryDef) {
         case 'date_histogram':
         case 'terms':  {
           delete $scope.agg.query;
+          delete $scope.agg.settings.nested.path;
           $scope.agg.field = 'select field';
           break;
         }
         case 'filters': {
           delete $scope.agg.field;
+          delete $scope.agg.settings.nested.path;
           $scope.agg.query = '*';
           break;
         }
+        case 'nested': {
+          delete $scope.agg.field;
+          delete $scope.agg.query;
+          $scope.agg.settings.nested = {};
+          $scope.agg.settings.nested.path = 'select field (type: nested)';
+          $scope.agg.settings.nested.term = 'select nested term path';
+          $scope.agg.settings.nested.query = 'select query for Nested Term';
+          break;
+        }
         case 'geohash_grid': {
           $scope.agg.settings.precision = 3;
           break;
@@ -79,6 +91,12 @@ function (angular, _, queryDef) {
       var settings = $scope.agg.settings || {};
 
       switch($scope.agg.type) {
+        case 'nested': {
+          if (settingsLinkText === '') {
+            settingsLinkText = 'Options';
+          }
+          break;
+        }
         case 'terms': {
           settings.order = settings.order || "asc";
           settings.size = settings.size || "10";
@@ -170,6 +188,20 @@ function (angular, _, queryDef) {
       }
     };
 
+    $scope.getFieldsNestedPath = function() {
+      return $scope.getFields({$fieldType: 'nested'});
+    };
+
+    $scope.getFieldsNestedTerm = function() {
+      return $scope.getFields({$fieldType: 'string'});
+    };
+
+    // FIX THIS: add a method getNestedKeys to be called here
+    // for getting nested key string ids, based on term/path supplied.
+    // $scope.getFieldsNestedQuery = function() {
+    //   return $scope.getNestedKeys();
+    // };
+
     $scope.getIntervalOptions = function() {
       return $q.when(uiSegmentSrv.transformToSegments(true, 'interval')(queryDef.intervalOptions));
     };
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 4377d634982..14601314118 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -290,9 +290,10 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
         }
 
         // transform to array
-        return _.map(fields, function(value) {
+        var resp = _.map(fields, function(value) {
           return value;
         });
+        return resp;
       });
     };
 
diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.js b/public/app/plugins/datasource/elasticsearch/elastic_response.js
index 27285852e33..125abc8690a 100644
--- a/public/app/plugins/datasource/elasticsearch/elastic_response.js
+++ b/public/app/plugins/datasource/elasticsearch/elastic_response.js
@@ -97,6 +97,33 @@ function (_, queryDef) {
     }
   };
 
+  ElasticResponse.prototype.processNestedAggregationDocs = function(esAgg, aggDef, target, seriesList, props) {
+    var metric, y, i, newSeries, bucket, value;
+
+    for (y = 0; y < target.metrics.length; y++) {
+      metric = target.metrics[y];
+      if (metric.hide) {
+        continue;
+      }
+
+      newSeries = { datapoints: [], metric: metric.type, field: metric.field, props: props};
+      for (i = 0; i < esAgg.buckets.length; i++) {
+        bucket = esAgg.buckets[i][aggDef.id]['nested_aggs'];
+        if (bucket !== undefined) {
+          value = bucket[metric.id];
+          if (value !== undefined) {
+            if (value.normalized_value) {
+              newSeries.datapoints.push([value.normalized_value, esAgg.buckets[i].key]);
+            } else {
+              newSeries.datapoints.push([value.value, esAgg.buckets[i].key]);
+            }
+          }
+        }
+      }
+      seriesList.push(newSeries);
+    }
+  };
+
   ElasticResponse.prototype.processAggregationDocs = function(esAgg, aggDef, target, docs, props) {
     var metric, y, i, bucket, metricName, doc;
 
@@ -145,31 +172,39 @@ function (_, queryDef) {
   // This is quite complex
   // neeed to recurise down the nested buckets to build series
   ElasticResponse.prototype.processBuckets = function(aggs, target, seriesList, docs, props, depth) {
-    var bucket, aggDef, esAgg, aggId;
+    var bucket, aggDef, aggDefNested, esAgg, aggId;
     var maxDepth = target.bucketAggs.length-1;
 
+    aggDefNested = _.find(target.bucketAggs, {type: "nested"});
+
     for (aggId in aggs) {
-      aggDef = _.find(target.bucketAggs, {id: aggId});
       esAgg = aggs[aggId];
 
-      if (!aggDef) {
-        continue;
-      }
-
-      if (depth === maxDepth) {
-        if (aggDef.type === 'date_histogram')  {
-          this.processMetrics(esAgg, target, seriesList, props);
-        } else {
-          this.processAggregationDocs(esAgg, aggDef, target, docs, props);
-        }
+      if (aggDefNested) {
+        this.processNestedAggregationDocs(esAgg, aggDefNested, target, seriesList, props);
       } else {
-        for (var nameIndex in esAgg.buckets) {
-          bucket = esAgg.buckets[nameIndex];
-          props = _.clone(props);
-          if (bucket.key !== void 0) {
-            props[aggDef.field] = bucket.key;
+        aggDef = _.find(target.bucketAggs, {id: aggId});
+
+        if (!aggDef) {
+          continue;
+        }
+
+        if (depth === maxDepth) {
+          if (aggDef.type === 'date_histogram')  {
+            this.processMetrics(esAgg, target, seriesList, props);
           } else {
-            props["filter"] = nameIndex;
+            this.processAggregationDocs(esAgg, aggDef, target, docs, props);
+          }
+        } else {
+          for (var nameIndex in esAgg.buckets) {
+            bucket = esAgg.buckets[nameIndex];
+            props = _.clone(props);
+            if (bucket.key) {
+              props[aggDef.field] = bucket.key;
+            } else {
+              props["filter"] = nameIndex;
+            }
+            this.processBuckets(bucket, target, seriesList, docs, props, depth+1);
           }
           if (bucket.key_as_string) {
             props[aggDef.field] = bucket.key_as_string;
@@ -293,7 +328,7 @@ function (_, queryDef) {
     if (err.root_cause && err.root_cause.length > 0 && err.root_cause[0].reason) {
       result.message = err.root_cause[0].reason;
     } else {
-      result.message = err.reason || 'Unkown elatic error response';
+      result.message = err.reason || 'Unknown elastic error response';
     }
 
     if (response.$$config) {
@@ -325,7 +360,6 @@ function (_, queryDef) {
         this.processBuckets(aggregations, target, tmpSeriesList, docs, {}, 0);
         this.trimDatapoints(tmpSeriesList, target);
         this.nameSeries(tmpSeriesList, target);
-
         for (var y = 0; y < tmpSeriesList.length; y++) {
           seriesList.push(tmpSeriesList[y]);
         }
diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index 562f0b86e56..bc013cf519e 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -7,6 +7,7 @@
 
 		<metric-segment-model property="agg.type" options="bucketAggTypes" on-change="onTypeChanged()" custom="false" css-class="width-10"></metric-segment-model>
 		<metric-segment-model ng-if="agg.field" property="agg.field" get-options="getFieldsInternal()" on-change="onChange()" css-class="width-12"></metric-segment-model>
+		<metric-segment-model ng-if="agg.settings.nested.path" property="agg.settings.nested.path" get-options="getFieldsNestedPath()" on-change="onChange()" css-class="width-12"></metric-segment-model>
 	</div>
 
 	<div class="gf-form gf-form--grow">
@@ -52,6 +53,18 @@
 		</div>
 	</div>
 
+	<div ng-if="agg.type === 'nested'">
+		<div class="gf-form offset-width-7">
+			<label class="gf-form-label width-10">Nested Term</label>
+			<metric-segment-model property="agg.settings.nested.term" get-options="getFieldsNestedTerm()" on-change="onChangeInternal()" css-class="width-12" custom="true"></metric-segment-model>
+		</div>
+
+		<div class="gf-form offset-width-7">
+			<label class="gf-form-label width-10">Query</label>
+			<input type="text" class="gf-form-input max-width-12" ng-model="agg.settings.nested.query" spellcheck='false' placeholder="Nested string match query" ng-blur="onChangeInternal()">
+		</div>
+	</div>
+
 	<div ng-if="agg.type === 'terms'">
 		<div class="gf-form offset-width-7">
 			<label class="gf-form-label width-10">Order</label>
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 11e8b69ddaa..51aa748e6dc 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -59,6 +59,33 @@ function (queryDef) {
     return queryNode;
   };
 
+  ElasticQueryBuilder.prototype.buildNestedAgg = function(aggDef, queryNode, target) {
+    var metric, y;
+    if (!aggDef.settings) {
+      return queryNode;
+    }
+    var settings = aggDef.settings;
+    queryNode.nested = {};
+    queryNode.nested.path = settings.nested.path;
+
+    queryNode.aggs = {
+      nested_aggs: {
+        filter: {},
+        aggs: {}
+      }
+    };
+    queryNode.aggs.nested_aggs.filter.term = {};
+    queryNode.aggs.nested_aggs.filter.term[settings.nested.term] = settings.nested.query;
+
+    queryNode.aggs.nested_aggs.aggs = {};
+    for (y = 0; y < target.metrics.length; y++) {
+      metric = target.metrics[y];
+      queryNode.aggs.nested_aggs.aggs[metric.id] = {};
+      queryNode.aggs.nested_aggs.aggs[metric.id][metric.type] = {field: metric.field};
+    }
+    return queryNode;
+  };
+
   ElasticQueryBuilder.prototype.getDateHistogramAgg = function(aggDef) {
     var esAgg = {};
     var settings = aggDef.settings || {};
@@ -183,6 +210,7 @@ function (queryDef) {
 
     nestedAggs = query;
 
+    var foundNested = false;
     for (i = 0; i < target.bucketAggs.length; i++) {
       var aggDef = target.bucketAggs[i];
       var esAgg = {};
@@ -204,6 +232,10 @@ function (queryDef) {
           esAgg['geohash_grid'] = {field: aggDef.field, precision: aggDef.settings.precision};
           break;
         }
+        case 'nested': {
+          foundNested = true;
+          this.buildNestedAgg(aggDef, esAgg, target);
+        }
       }
 
       nestedAggs.aggs = nestedAggs.aggs || {};
@@ -211,35 +243,37 @@ function (queryDef) {
       nestedAggs = esAgg;
     }
 
-    nestedAggs.aggs = {};
+    if (!foundNested) {
+      nestedAggs.aggs = {};
 
-    for (i = 0; i < target.metrics.length; i++) {
-      metric = target.metrics[i];
-      if (metric.type === 'count') {
-        continue;
-      }
-
-      var aggField = {};
-      var metricAgg = null;
-
-      if (queryDef.isPipelineAgg(metric.type)) {
-        if (metric.pipelineAgg && /^\d*$/.test(metric.pipelineAgg)) {
-          metricAgg = { buckets_path: metric.pipelineAgg };
-        } else {
+      for (i = 0; i < target.metrics.length; i++) {
+        metric = target.metrics[i];
+        if (metric.type === 'count') {
           continue;
         }
-      } else {
-        metricAgg = {field: metric.field};
-      }
 
-      for (var prop in metric.settings) {
-        if (metric.settings.hasOwnProperty(prop) && metric.settings[prop] !== null) {
-          metricAgg[prop] = metric.settings[prop];
+        var aggField = {};
+        var metricAgg = null;
+
+        if (queryDef.isPipelineAgg(metric.type)) {
+          if (metric.pipelineAgg && /^\d*$/.test(metric.pipelineAgg)) {
+            metricAgg = { buckets_path: metric.pipelineAgg };
+          } else {
+            continue;
+          }
+        } else {
+          metricAgg = {field: metric.field};
         }
-      }
 
-      aggField[metric.type] = metricAgg;
-      nestedAggs.aggs[metric.id] = aggField;
+        for (var prop in metric.settings) {
+          if (metric.settings.hasOwnProperty(prop) && metric.settings[prop] !== null) {
+            metricAgg[prop] = metric.settings[prop];
+          }
+        }
+
+        aggField[metric.type] = metricAgg;
+        nestedAggs.aggs[metric.id] = aggField;
+      }
     }
 
     return query;
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.js b/public/app/plugins/datasource/elasticsearch/query_def.js
index 5afc908edba..ec7dc444437 100644
--- a/public/app/plugins/datasource/elasticsearch/query_def.js
+++ b/public/app/plugins/datasource/elasticsearch/query_def.js
@@ -22,6 +22,7 @@ function (_) {
     bucketAggTypes: [
       {text: "Terms",           value: 'terms', requiresField: true},
       {text: "Filters",         value: 'filters' },
+      {text: "Nested",          value: 'nested', requiresField: true},
       {text: "Geo Hash Grid",   value: 'geohash_grid', requiresField: true},
       {text: "Date Histogram",  value: 'date_histogram', requiresField: true},
     ],
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
index e60cde7a163..4fa3e6daf19 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
@@ -102,6 +102,37 @@ describe('ElasticQueryBuilder', function() {
     expect(firstLevel.aggs["1"].percentiles.percents).to.eql([1,2,3,4]);
   });
 
+  it('with nested aggs', function(){
+    var query = builder.build({
+      metrics: [{type: 'avg', field: 'disk.wr_sec', id: '1'}],
+      bucketAggs: [
+        {type: 'date_histogram', field: '@timestamp', id: '2'},
+        {
+          id: '3',
+          type: 'nested',
+          settings: {
+            nested: {
+              path: 'disk' ,
+              term: 'disk.disk-device',
+              query: 'dev8-0',
+            }
+          }
+        }
+      ],
+    });
+
+    var firstLevel = query.aggs["2"];
+    var secondLevel = firstLevel.aggs["3"];
+    var thirdLevel = secondLevel.aggs["nested_aggs"];
+    var fourthLevel = thirdLevel.aggs["1"];
+
+    expect(firstLevel.date_histogram.field).to.be("@timestamp");
+    expect(secondLevel.nested.path).to.be("disk");
+    expect(Object.keys(thirdLevel.filter.term)[0]).to.be("disk.disk-device");
+    expect(thirdLevel.filter.term["disk.disk-device"]).to.be("dev8-0");
+    expect(fourthLevel.avg.field).to.be("disk.wr_sec");
+  });
+
   it('with filters aggs', function() {
     var query = builder.build({
       metrics: [{type: 'count', id: '1'}],

From d2dac02a2844a68a8c46bccd928183601c796946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 27 Feb 2017 10:57:44 +0100
Subject: [PATCH 170/301] Revert "ES Nested type bucket aggregation (#4694)
 (#4694)"

This reverts commit 8087af9c89c1f87b1e8d9269f0594cdb42b3dd97.
---
 .../datasource/elasticsearch/bucket_agg.js    | 32 -------
 .../datasource/elasticsearch/datasource.js    |  3 +-
 .../elasticsearch/elastic_response.js         | 74 +++++-----------
 .../elasticsearch/partials/bucket_agg.html    | 13 ---
 .../datasource/elasticsearch/query_builder.js | 84 ++++++-------------
 .../datasource/elasticsearch/query_def.js     |  1 -
 .../specs/query_builder_specs.ts              | 31 -------
 7 files changed, 46 insertions(+), 192 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/bucket_agg.js b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
index 7b3685fca5a..28f1df08251 100644
--- a/public/app/plugins/datasource/elasticsearch/bucket_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
@@ -17,7 +17,6 @@ function (angular, _, queryDef) {
         target: "=",
         index: "=",
         onChange: "&",
-        // getNestedKeys: "&",
         getFields: "&",
       }
     };
@@ -53,25 +52,14 @@ function (angular, _, queryDef) {
         case 'date_histogram':
         case 'terms':  {
           delete $scope.agg.query;
-          delete $scope.agg.settings.nested.path;
           $scope.agg.field = 'select field';
           break;
         }
         case 'filters': {
           delete $scope.agg.field;
-          delete $scope.agg.settings.nested.path;
           $scope.agg.query = '*';
           break;
         }
-        case 'nested': {
-          delete $scope.agg.field;
-          delete $scope.agg.query;
-          $scope.agg.settings.nested = {};
-          $scope.agg.settings.nested.path = 'select field (type: nested)';
-          $scope.agg.settings.nested.term = 'select nested term path';
-          $scope.agg.settings.nested.query = 'select query for Nested Term';
-          break;
-        }
         case 'geohash_grid': {
           $scope.agg.settings.precision = 3;
           break;
@@ -91,12 +79,6 @@ function (angular, _, queryDef) {
       var settings = $scope.agg.settings || {};
 
       switch($scope.agg.type) {
-        case 'nested': {
-          if (settingsLinkText === '') {
-            settingsLinkText = 'Options';
-          }
-          break;
-        }
         case 'terms': {
           settings.order = settings.order || "asc";
           settings.size = settings.size || "10";
@@ -188,20 +170,6 @@ function (angular, _, queryDef) {
       }
     };
 
-    $scope.getFieldsNestedPath = function() {
-      return $scope.getFields({$fieldType: 'nested'});
-    };
-
-    $scope.getFieldsNestedTerm = function() {
-      return $scope.getFields({$fieldType: 'string'});
-    };
-
-    // FIX THIS: add a method getNestedKeys to be called here
-    // for getting nested key string ids, based on term/path supplied.
-    // $scope.getFieldsNestedQuery = function() {
-    //   return $scope.getNestedKeys();
-    // };
-
     $scope.getIntervalOptions = function() {
       return $q.when(uiSegmentSrv.transformToSegments(true, 'interval')(queryDef.intervalOptions));
     };
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 14601314118..4377d634982 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -290,10 +290,9 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
         }
 
         // transform to array
-        var resp = _.map(fields, function(value) {
+        return _.map(fields, function(value) {
           return value;
         });
-        return resp;
       });
     };
 
diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.js b/public/app/plugins/datasource/elasticsearch/elastic_response.js
index 125abc8690a..27285852e33 100644
--- a/public/app/plugins/datasource/elasticsearch/elastic_response.js
+++ b/public/app/plugins/datasource/elasticsearch/elastic_response.js
@@ -97,33 +97,6 @@ function (_, queryDef) {
     }
   };
 
-  ElasticResponse.prototype.processNestedAggregationDocs = function(esAgg, aggDef, target, seriesList, props) {
-    var metric, y, i, newSeries, bucket, value;
-
-    for (y = 0; y < target.metrics.length; y++) {
-      metric = target.metrics[y];
-      if (metric.hide) {
-        continue;
-      }
-
-      newSeries = { datapoints: [], metric: metric.type, field: metric.field, props: props};
-      for (i = 0; i < esAgg.buckets.length; i++) {
-        bucket = esAgg.buckets[i][aggDef.id]['nested_aggs'];
-        if (bucket !== undefined) {
-          value = bucket[metric.id];
-          if (value !== undefined) {
-            if (value.normalized_value) {
-              newSeries.datapoints.push([value.normalized_value, esAgg.buckets[i].key]);
-            } else {
-              newSeries.datapoints.push([value.value, esAgg.buckets[i].key]);
-            }
-          }
-        }
-      }
-      seriesList.push(newSeries);
-    }
-  };
-
   ElasticResponse.prototype.processAggregationDocs = function(esAgg, aggDef, target, docs, props) {
     var metric, y, i, bucket, metricName, doc;
 
@@ -172,39 +145,31 @@ function (_, queryDef) {
   // This is quite complex
   // neeed to recurise down the nested buckets to build series
   ElasticResponse.prototype.processBuckets = function(aggs, target, seriesList, docs, props, depth) {
-    var bucket, aggDef, aggDefNested, esAgg, aggId;
+    var bucket, aggDef, esAgg, aggId;
     var maxDepth = target.bucketAggs.length-1;
 
-    aggDefNested = _.find(target.bucketAggs, {type: "nested"});
-
     for (aggId in aggs) {
+      aggDef = _.find(target.bucketAggs, {id: aggId});
       esAgg = aggs[aggId];
 
-      if (aggDefNested) {
-        this.processNestedAggregationDocs(esAgg, aggDefNested, target, seriesList, props);
-      } else {
-        aggDef = _.find(target.bucketAggs, {id: aggId});
+      if (!aggDef) {
+        continue;
+      }
 
-        if (!aggDef) {
-          continue;
-        }
-
-        if (depth === maxDepth) {
-          if (aggDef.type === 'date_histogram')  {
-            this.processMetrics(esAgg, target, seriesList, props);
-          } else {
-            this.processAggregationDocs(esAgg, aggDef, target, docs, props);
-          }
+      if (depth === maxDepth) {
+        if (aggDef.type === 'date_histogram')  {
+          this.processMetrics(esAgg, target, seriesList, props);
         } else {
-          for (var nameIndex in esAgg.buckets) {
-            bucket = esAgg.buckets[nameIndex];
-            props = _.clone(props);
-            if (bucket.key) {
-              props[aggDef.field] = bucket.key;
-            } else {
-              props["filter"] = nameIndex;
-            }
-            this.processBuckets(bucket, target, seriesList, docs, props, depth+1);
+          this.processAggregationDocs(esAgg, aggDef, target, docs, props);
+        }
+      } else {
+        for (var nameIndex in esAgg.buckets) {
+          bucket = esAgg.buckets[nameIndex];
+          props = _.clone(props);
+          if (bucket.key !== void 0) {
+            props[aggDef.field] = bucket.key;
+          } else {
+            props["filter"] = nameIndex;
           }
           if (bucket.key_as_string) {
             props[aggDef.field] = bucket.key_as_string;
@@ -328,7 +293,7 @@ function (_, queryDef) {
     if (err.root_cause && err.root_cause.length > 0 && err.root_cause[0].reason) {
       result.message = err.root_cause[0].reason;
     } else {
-      result.message = err.reason || 'Unknown elastic error response';
+      result.message = err.reason || 'Unkown elatic error response';
     }
 
     if (response.$$config) {
@@ -360,6 +325,7 @@ function (_, queryDef) {
         this.processBuckets(aggregations, target, tmpSeriesList, docs, {}, 0);
         this.trimDatapoints(tmpSeriesList, target);
         this.nameSeries(tmpSeriesList, target);
+
         for (var y = 0; y < tmpSeriesList.length; y++) {
           seriesList.push(tmpSeriesList[y]);
         }
diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index bc013cf519e..562f0b86e56 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -7,7 +7,6 @@
 
 		<metric-segment-model property="agg.type" options="bucketAggTypes" on-change="onTypeChanged()" custom="false" css-class="width-10"></metric-segment-model>
 		<metric-segment-model ng-if="agg.field" property="agg.field" get-options="getFieldsInternal()" on-change="onChange()" css-class="width-12"></metric-segment-model>
-		<metric-segment-model ng-if="agg.settings.nested.path" property="agg.settings.nested.path" get-options="getFieldsNestedPath()" on-change="onChange()" css-class="width-12"></metric-segment-model>
 	</div>
 
 	<div class="gf-form gf-form--grow">
@@ -53,18 +52,6 @@
 		</div>
 	</div>
 
-	<div ng-if="agg.type === 'nested'">
-		<div class="gf-form offset-width-7">
-			<label class="gf-form-label width-10">Nested Term</label>
-			<metric-segment-model property="agg.settings.nested.term" get-options="getFieldsNestedTerm()" on-change="onChangeInternal()" css-class="width-12" custom="true"></metric-segment-model>
-		</div>
-
-		<div class="gf-form offset-width-7">
-			<label class="gf-form-label width-10">Query</label>
-			<input type="text" class="gf-form-input max-width-12" ng-model="agg.settings.nested.query" spellcheck='false' placeholder="Nested string match query" ng-blur="onChangeInternal()">
-		</div>
-	</div>
-
 	<div ng-if="agg.type === 'terms'">
 		<div class="gf-form offset-width-7">
 			<label class="gf-form-label width-10">Order</label>
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 51aa748e6dc..11e8b69ddaa 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -59,33 +59,6 @@ function (queryDef) {
     return queryNode;
   };
 
-  ElasticQueryBuilder.prototype.buildNestedAgg = function(aggDef, queryNode, target) {
-    var metric, y;
-    if (!aggDef.settings) {
-      return queryNode;
-    }
-    var settings = aggDef.settings;
-    queryNode.nested = {};
-    queryNode.nested.path = settings.nested.path;
-
-    queryNode.aggs = {
-      nested_aggs: {
-        filter: {},
-        aggs: {}
-      }
-    };
-    queryNode.aggs.nested_aggs.filter.term = {};
-    queryNode.aggs.nested_aggs.filter.term[settings.nested.term] = settings.nested.query;
-
-    queryNode.aggs.nested_aggs.aggs = {};
-    for (y = 0; y < target.metrics.length; y++) {
-      metric = target.metrics[y];
-      queryNode.aggs.nested_aggs.aggs[metric.id] = {};
-      queryNode.aggs.nested_aggs.aggs[metric.id][metric.type] = {field: metric.field};
-    }
-    return queryNode;
-  };
-
   ElasticQueryBuilder.prototype.getDateHistogramAgg = function(aggDef) {
     var esAgg = {};
     var settings = aggDef.settings || {};
@@ -210,7 +183,6 @@ function (queryDef) {
 
     nestedAggs = query;
 
-    var foundNested = false;
     for (i = 0; i < target.bucketAggs.length; i++) {
       var aggDef = target.bucketAggs[i];
       var esAgg = {};
@@ -232,10 +204,6 @@ function (queryDef) {
           esAgg['geohash_grid'] = {field: aggDef.field, precision: aggDef.settings.precision};
           break;
         }
-        case 'nested': {
-          foundNested = true;
-          this.buildNestedAgg(aggDef, esAgg, target);
-        }
       }
 
       nestedAggs.aggs = nestedAggs.aggs || {};
@@ -243,37 +211,35 @@ function (queryDef) {
       nestedAggs = esAgg;
     }
 
-    if (!foundNested) {
-      nestedAggs.aggs = {};
+    nestedAggs.aggs = {};
 
-      for (i = 0; i < target.metrics.length; i++) {
-        metric = target.metrics[i];
-        if (metric.type === 'count') {
+    for (i = 0; i < target.metrics.length; i++) {
+      metric = target.metrics[i];
+      if (metric.type === 'count') {
+        continue;
+      }
+
+      var aggField = {};
+      var metricAgg = null;
+
+      if (queryDef.isPipelineAgg(metric.type)) {
+        if (metric.pipelineAgg && /^\d*$/.test(metric.pipelineAgg)) {
+          metricAgg = { buckets_path: metric.pipelineAgg };
+        } else {
           continue;
         }
-
-        var aggField = {};
-        var metricAgg = null;
-
-        if (queryDef.isPipelineAgg(metric.type)) {
-          if (metric.pipelineAgg && /^\d*$/.test(metric.pipelineAgg)) {
-            metricAgg = { buckets_path: metric.pipelineAgg };
-          } else {
-            continue;
-          }
-        } else {
-          metricAgg = {field: metric.field};
-        }
-
-        for (var prop in metric.settings) {
-          if (metric.settings.hasOwnProperty(prop) && metric.settings[prop] !== null) {
-            metricAgg[prop] = metric.settings[prop];
-          }
-        }
-
-        aggField[metric.type] = metricAgg;
-        nestedAggs.aggs[metric.id] = aggField;
+      } else {
+        metricAgg = {field: metric.field};
       }
+
+      for (var prop in metric.settings) {
+        if (metric.settings.hasOwnProperty(prop) && metric.settings[prop] !== null) {
+          metricAgg[prop] = metric.settings[prop];
+        }
+      }
+
+      aggField[metric.type] = metricAgg;
+      nestedAggs.aggs[metric.id] = aggField;
     }
 
     return query;
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.js b/public/app/plugins/datasource/elasticsearch/query_def.js
index ec7dc444437..5afc908edba 100644
--- a/public/app/plugins/datasource/elasticsearch/query_def.js
+++ b/public/app/plugins/datasource/elasticsearch/query_def.js
@@ -22,7 +22,6 @@ function (_) {
     bucketAggTypes: [
       {text: "Terms",           value: 'terms', requiresField: true},
       {text: "Filters",         value: 'filters' },
-      {text: "Nested",          value: 'nested', requiresField: true},
       {text: "Geo Hash Grid",   value: 'geohash_grid', requiresField: true},
       {text: "Date Histogram",  value: 'date_histogram', requiresField: true},
     ],
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
index 4fa3e6daf19..e60cde7a163 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
@@ -102,37 +102,6 @@ describe('ElasticQueryBuilder', function() {
     expect(firstLevel.aggs["1"].percentiles.percents).to.eql([1,2,3,4]);
   });
 
-  it('with nested aggs', function(){
-    var query = builder.build({
-      metrics: [{type: 'avg', field: 'disk.wr_sec', id: '1'}],
-      bucketAggs: [
-        {type: 'date_histogram', field: '@timestamp', id: '2'},
-        {
-          id: '3',
-          type: 'nested',
-          settings: {
-            nested: {
-              path: 'disk' ,
-              term: 'disk.disk-device',
-              query: 'dev8-0',
-            }
-          }
-        }
-      ],
-    });
-
-    var firstLevel = query.aggs["2"];
-    var secondLevel = firstLevel.aggs["3"];
-    var thirdLevel = secondLevel.aggs["nested_aggs"];
-    var fourthLevel = thirdLevel.aggs["1"];
-
-    expect(firstLevel.date_histogram.field).to.be("@timestamp");
-    expect(secondLevel.nested.path).to.be("disk");
-    expect(Object.keys(thirdLevel.filter.term)[0]).to.be("disk.disk-device");
-    expect(thirdLevel.filter.term["disk.disk-device"]).to.be("dev8-0");
-    expect(fourthLevel.avg.field).to.be("disk.wr_sec");
-  });
-
   it('with filters aggs', function() {
     var query = builder.build({
       metrics: [{type: 'count', id: '1'}],

From a763285daac6927ee58537a58fb621a503504058 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 27 Feb 2017 11:05:05 +0100
Subject: [PATCH 171/301] updates script for packagecloud

---
 packaging/publish/publish_testing.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packaging/publish/publish_testing.sh b/packaging/publish/publish_testing.sh
index 1e39d65b7e5..76419eb7a7e 100755
--- a/packaging/publish/publish_testing.sh
+++ b/packaging/publish/publish_testing.sh
@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
-deb_ver=4.1.0-1482230757beta1
-rpm_ver=4.1.0-1482230757beta1
+deb_ver=4.2.0-beta1
+rpm_ver=4.2.0-beta1
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${deb_ver}_amd64.deb
 
 package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
 package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${rpm_ver}.x86_64.rpm
 
 package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
 package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm

From 86789c0b69a815087f7ca0016cd4b48d783d941c Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 27 Feb 2017 10:31:51 +0100
Subject: [PATCH 172/301] docs: update docs for 4.2.0 beta release

---
 CHANGELOG.md                             |  2 +-
 docs/sources/guides/whats-new-in-v4-1.md |  2 +-
 docs/sources/guides/whats-new-in-v4-2.md | 88 ++++++++++++++++++++++++
 docs/sources/installation/debian.md      |  9 +++
 docs/sources/installation/rpm.md         |  1 +
 docs/sources/installation/windows.md     |  1 +
 6 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 docs/sources/guides/whats-new-in-v4-2.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c540f02035..d45e8ac2852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 * **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
 * **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
-* **Orgs**: Sharing dashboards using Grafana share feature will not redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
+* **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
 * **Pushover**: Add Pushover alert notifications [#7526](https://github.com/grafana/grafana/pull/7526) thx [@devkid](https://github.com/devkid)
 * **Threema**: Add Threema Gateway alert notification integration [#7482](https://github.com/grafana/grafana/pull/7482) thx [@dbrgn](https://github.com/dbrgn)
 
diff --git a/docs/sources/guides/whats-new-in-v4-1.md b/docs/sources/guides/whats-new-in-v4-1.md
index 59e6236af40..bd2b0f1b75f 100644
--- a/docs/sources/guides/whats-new-in-v4-1.md
+++ b/docs/sources/guides/whats-new-in-v4-1.md
@@ -7,7 +7,7 @@ type = "docs"
 name = "Version 4.1"
 identifier = "v4.1"
 parent = "whatsnew"
-weight = -1
+weight = 3
 +++
 
 
diff --git a/docs/sources/guides/whats-new-in-v4-2.md b/docs/sources/guides/whats-new-in-v4-2.md
new file mode 100644
index 00000000000..44aa3a45dc0
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v4-2.md
@@ -0,0 +1,88 @@
++++
+title = "What's New in Grafana v4.2"
+description = "Feature & improvement highlights for Grafana v4.2"
+keywords = ["grafana", "new", "documentation", "4.2.0"]
+type = "docs"
+[menu.docs]
+name = "Version 4.2"
+identifier = "v4.2"
+parent = "whatsnew"
+weight = -1
++++
+
+## Whats new in Grafana v4.2
+
+Grafana v4.2 Beta is now [available for download](/download/4_2_0/).
+Just like the last release this one contains lots bug fixes and minor improvements.
+We are very happy to say that 27 of 40 issues was closed by pull requests from the community.
+Big thumbs up!
+
+## Release Highlights
+
+- **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+- **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
+- **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
+- **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any datasource (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
+- **Alerting**: Adds deduping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
+- **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
+- **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#6948](https://github.com/grafana/grafana/issues/6948)
+- [Full changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+
+### New alert notification channels
+
+This release adds **five** new alert notifications channels, all of them contributed by the community.
+
+* Hipchat
+* Telegram
+* LINE
+* Pushover
+* Threema
+
+### Templating
+
+We added two new global built in variables in grafana. `$__interval` and `$__interval_ms` are now reserved template names in grafana and can be used by any datasource.
+We might add more global built in variables in the future and if we do we will prefix them with `$__`. So please avoid using that in your template variables.
+
+### Dedupe alert notifications when running multiple servers
+
+In this release we will dedupe alert notificiations when you are running multiple servers.
+This makes it possible to run alerting on multiple servers and only get one notification.
+
+We currently solve this with sql transactions which puts some limitations for how many servers you can use to execute the same rules.
+3-5 servers should not be a problem but as always, it depends on how many alerts you have and how frequently they execute.
+
+Next up for a better HA situation is to add support for workload balancing between Grafana servers.
+
+### Alerting more info
+
+You can now see the reason why an alert triggered in the alert history. Its also easier to detect when an alert is set to `alerting` due to the `no_data` option.
+
+### Improved support for multi-org setup
+
+When loading dashboards we now set an query parameter called orgId. So we can detect from which org an user shared a dashboard.
+This makes it possible for users to share dashboards between orgs without changing org first.
+
+We aim to introduce [dashboard groups](https://github.com/grafana/grafana/issues/1611) sometime in the future which will introduce access control and user groups within one org.
+Making it possible to have users in multiple groups and have detailed access control.
+
+## Upgrade & Breaking changes
+
+If your using https in grafana we now force you to use tls 1.2 and the most secure ciphers.
+We think its better to be secure by default rather then making it configurable.
+If you want to run https with lower versions of tls we suggest you put a reserve proxy in front of grafana.
+
+If you have template variables name `$__interval` or `$__interval_ms` they will no longer work since these keywords
+are reserved as global built in variables. We might add more global built in variables in the future and if we do, we will prefix them with `$__`. So please avoid using that in your template variables.
+
+## Changelog
+
+Checkout the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list
+of new features, changes, and bug fixes.
+
+## Download
+
+Head to [v4.2-beta download page](/download/4_2_0/) for download links & instructions.
+
+## Thanks
+
+A big thanks to all the Grafana users who contribute by submitting PRs, bug reports & feedback!
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index fb5c649ad1d..607d683bbb2 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -16,6 +16,7 @@ weight = 1
 Description | Download
 ------------ | -------------
 Stable for Debian-based Linux | [4.1.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb)
+Beta for Debian-based Linux | [4.2.0-beta1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.2.0-beta1_amd64.deb)
 
 ## Install Stable
 
@@ -25,6 +26,14 @@ $ sudo apt-get install -y adduser libfontconfig
 $ sudo dpkg -i grafana_4.1.2-1486989747_amd64.deb
 ```
 
+## Install Beta
+
+```
+$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.2.0-beta1_amd64.deb
+$ sudo apt-get install -y adduser libfontconfig
+$ sudo dpkg -i grafana_4.2.0-beta1_amd64.deb
+```
+
 ## APT Repository
 
 Add the following line to your `/etc/apt/sources.list` file.
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 56125a4951a..d329b7032c4 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -16,6 +16,7 @@ weight = 2
 Description | Download
 ------------ | -------------
 Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2-1486989747.x86_64.rpm)
+Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.2.0-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.2.0-beta1.x86_64.rpm)
 
 ## Install Stable
 
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index 73816d98a40..b495ad81e98 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -14,6 +14,7 @@ weight = 3
 Description | Download
 ------------ | -------------
 Latest stable package for Windows | [grafana.4.1.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2.windows-x64.zip)
+Latest beta package for Windows | [grafana-4.2.0-beta1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.2.0-beta1.windows-x64.zip)
 
 ## Configure
 

From 7d897c0980ba4e46570ed49a9794d35865dfd7da Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 27 Feb 2017 13:26:53 +0100
Subject: [PATCH 173/301] build: add docker trigger for release builds

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index faa50cb5c81..6db2b3e99f7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -53,4 +53,5 @@ deployment:
       - go run build.go sha1-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/release
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release
+      - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}
 

From 1422655e9791230a38bf388d082b1a27b563fa7b Mon Sep 17 00:00:00 2001
From: Danilo Bargen <mail@dbrgn.ch>
Date: Mon, 27 Feb 2017 17:10:52 +0100
Subject: [PATCH 174/301] feat(alerting): Add emoji to Threema alert
 notifications

This commit prepends emoji to Threema alert notifications to make it
easier to discern various notification types (e.g. alert, no data, ok).
---
 pkg/services/alerting/notifiers/threema.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkg/services/alerting/notifiers/threema.go b/pkg/services/alerting/notifiers/threema.go
index a710d686d28..80c84c26a24 100644
--- a/pkg/services/alerting/notifiers/threema.go
+++ b/pkg/services/alerting/notifiers/threema.go
@@ -126,9 +126,21 @@ func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error
 	data.Set("to", notifier.RecipientID)
 	data.Set("secret", notifier.APISecret)
 
+	// Determine emoji
+	stateEmoji := ""
+	switch evalContext.Rule.State {
+	case m.AlertStateOK:
+		stateEmoji = "\u2705 " // White Heavy Check Mark
+	case m.AlertStateNoData:
+		stateEmoji = "\u2753 " // Black Question Mark Ornament
+	case m.AlertStateAlerting:
+		stateEmoji = "\u26A0 " // Warning sign
+	}
+
 	// Build message
-	message := fmt.Sprintf("%s\n\n*State:* %s\n*Message:* %s\n",
-		evalContext.GetNotificationTitle(), evalContext.Rule.Name, evalContext.Rule.Message)
+	message := fmt.Sprintf("%s%s\n\n*State:* %s\n*Message:* %s\n",
+		stateEmoji, evalContext.GetNotificationTitle(),
+		evalContext.Rule.Name, evalContext.Rule.Message)
 	ruleURL, err := evalContext.GetRuleUrl()
 	if err == nil {
 		message = message + fmt.Sprintf("*URL:* %s\n", ruleURL)

From 3ef077c18026d78b1243e38c54282dd39a897ff9 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 28 Feb 2017 09:09:49 +0100
Subject: [PATCH 175/301] build: use correct version for tar.gz files

---
 build.go | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/build.go b/build.go
index 73f641bfec3..5c04b78cecf 100644
--- a/build.go
+++ b/build.go
@@ -20,6 +20,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"path"
 )
 
 var (
@@ -120,14 +121,24 @@ func main() {
 }
 
 func makeLatestDistCopies() {
-	rpmIteration := "-1"
-	if linuxPackageIteration != "" {
-		rpmIteration = linuxPackageIteration
+	files, err := ioutil.ReadDir("dist")
+	if err != nil {
+		log.Fatalf("failed to create latest copies. Cannot read from /dist")
 	}
 
-	runError("cp", fmt.Sprintf("dist/grafana_%v-%v_amd64.deb", linuxPackageVersion, linuxPackageIteration), "dist/grafana_latest_amd64.deb")
-	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.x86_64.rpm", linuxPackageVersion, rpmIteration), "dist/grafana-latest-1.x86_64.rpm")
-	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.linux-x64.tar.gz", linuxPackageVersion, linuxPackageIteration), "dist/grafana-latest.linux-x64.tar.gz")
+	latestMapping := map[string]string {
+		".deb": "dist/grafana_latest_amd64.deb",
+		".rpm": "dist/grafana-latest-1.x86_64.rpm",
+		".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
+	}
+
+	for _, file := range files {
+		for extension, fullName := range latestMapping {
+			if strings.HasSuffix(file.Name(), extension) {
+				runError("cp", path.Join("dist", file.Name()), fullName)
+			}
+		}
+	}
 }
 
 func readVersionFromPackageJson() {
@@ -332,9 +343,9 @@ func grunt(params ...string) {
 func gruntBuildArg(task string) []string {
 	args := []string{task}
 	if includeBuildNumber {
-		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
+		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", version, linuxPackageIteration))
 	} else {
-		args = append(args, fmt.Sprintf("--pkgVer=%v", linuxPackageVersion))
+		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
 	}
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))

From 1631c8de9558e791e878a501a2e556d14748273b Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 28 Feb 2017 09:09:49 +0100
Subject: [PATCH 176/301] build: use correct version for tar.gz files

---
 build.go | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/build.go b/build.go
index 73f641bfec3..5c04b78cecf 100644
--- a/build.go
+++ b/build.go
@@ -20,6 +20,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"path"
 )
 
 var (
@@ -120,14 +121,24 @@ func main() {
 }
 
 func makeLatestDistCopies() {
-	rpmIteration := "-1"
-	if linuxPackageIteration != "" {
-		rpmIteration = linuxPackageIteration
+	files, err := ioutil.ReadDir("dist")
+	if err != nil {
+		log.Fatalf("failed to create latest copies. Cannot read from /dist")
 	}
 
-	runError("cp", fmt.Sprintf("dist/grafana_%v-%v_amd64.deb", linuxPackageVersion, linuxPackageIteration), "dist/grafana_latest_amd64.deb")
-	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.x86_64.rpm", linuxPackageVersion, rpmIteration), "dist/grafana-latest-1.x86_64.rpm")
-	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.linux-x64.tar.gz", linuxPackageVersion, linuxPackageIteration), "dist/grafana-latest.linux-x64.tar.gz")
+	latestMapping := map[string]string {
+		".deb": "dist/grafana_latest_amd64.deb",
+		".rpm": "dist/grafana-latest-1.x86_64.rpm",
+		".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
+	}
+
+	for _, file := range files {
+		for extension, fullName := range latestMapping {
+			if strings.HasSuffix(file.Name(), extension) {
+				runError("cp", path.Join("dist", file.Name()), fullName)
+			}
+		}
+	}
 }
 
 func readVersionFromPackageJson() {
@@ -332,9 +343,9 @@ func grunt(params ...string) {
 func gruntBuildArg(task string) []string {
 	args := []string{task}
 	if includeBuildNumber {
-		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
+		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", version, linuxPackageIteration))
 	} else {
-		args = append(args, fmt.Sprintf("--pkgVer=%v", linuxPackageVersion))
+		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
 	}
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))

From 9b6571fab16781fe6f86a17677c973cfb8c8d5a6 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 28 Feb 2017 17:04:47 +0100
Subject: [PATCH 177/301] template: dont allow template variables to begin with
 '__'

closes #7678
---
 public/app/features/templating/editor_ctrl.ts |   1 +
 .../features/templating/partials/editor.html  | 367 +++++++++---------
 public/sass/components/_gf-form.scss          |  19 +
 3 files changed, 205 insertions(+), 182 deletions(-)

diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index c5e24741a96..7bd745bed53 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -10,6 +10,7 @@ export class VariableEditorCtrl {
   constructor(private $scope, private datasourceSrv, private variableSrv, templateSrv) {
     $scope.variableTypes = variableTypes;
     $scope.ctrl = {};
+    $scope.namePattern = /^((?!__).)*$/;
 
     $scope.refreshOptions = [
       {value: 0, text: "Never"},
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 4fc2553244c..5f844931b4c 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -1,155 +1,158 @@
 <div ng-controller="VariableEditorCtrl" ng-init="init()">
-	<div class="tabbed-view-header">
-		<h2 class="tabbed-view-title">
-			Templating
-		</h2>
+  <div class="tabbed-view-header">
+    <h2 class="tabbed-view-title">
+      Templating
+    </h2>
 
-		<ul class="gf-tabs">
-			<li class="gf-tabs-item" >
-				<a class="gf-tabs-link" ng-click="mode = 'list';" ng-class="{active: mode === 'list'}">
-					Variables
-				</a>
-			</li>
-			<li class="gf-tabs-item" ng-show="mode === 'edit'">
-				<a class="gf-tabs-link" ng-class="{active: mode === 'edit'}">
-					Edit
-				</a>
-			</li>
-			<li class="gf-tabs-item" ng-show="mode === 'new'">
-				<span class="active gf-tabs-link">New</span>
-			</li>
-		</ul>
+    <ul class="gf-tabs">
+      <li class="gf-tabs-item" >
+        <a class="gf-tabs-link" ng-click="mode = 'list';" ng-class="{active: mode === 'list'}">
+          Variables
+        </a>
+      </li>
+      <li class="gf-tabs-item" ng-show="mode === 'edit'">
+        <a class="gf-tabs-link" ng-class="{active: mode === 'edit'}">
+          Edit
+        </a>
+      </li>
+      <li class="gf-tabs-item" ng-show="mode === 'new'">
+        <span class="active gf-tabs-link">New</span>
+      </li>
+    </ul>
 
-		<button class="tabbed-view-close-btn" ng-click="dismiss();">
-			<i class="fa fa-remove"></i>
-		</button>
-	</div>
+    <button class="tabbed-view-close-btn" ng-click="dismiss();">
+      <i class="fa fa-remove"></i>
+    </button>
+  </div>
 
-	<div class="tabbed-view-body">
+  <div class="tabbed-view-body">
 
-		<div ng-if="mode === 'list'">
-			<div ng-if="variables.length === 0">
-				<em>No template variables defined</em>
-			</div>
-			<table class="grafana-options-table">
-				<tr ng-repeat="variable in variables">
-					<td style="width: 1%">
-						<span class="template-variable">
-							${{variable.name}}
-						</span>
-					</td>
-					<td class="max-width" style="max-width: 200px;">
-						{{variable.query}}
-					</td>
+    <div ng-if="mode === 'list'">
+      <div ng-if="variables.length === 0">
+        <em>No template variables defined</em>
+      </div>
+      <table class="grafana-options-table">
+        <tr ng-repeat="variable in variables">
+          <td style="width: 1%">
+            <span class="template-variable">
+              ${{variable.name}}
+            </span>
+          </td>
+          <td class="max-width" style="max-width: 200px;">
+            {{variable.query}}
+          </td>
 
-					<td style="width: 1%"><i ng-click="_.move(variables,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
-					<td style="width: 1%"><i ng-click="_.move(variables,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
-					<td style="width: 1%">
+          <td style="width: 1%"><i ng-click="_.move(variables,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
+          <td style="width: 1%"><i ng-click="_.move(variables,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
+          <td style="width: 1%">
             <a ng-click="duplicate(variable)" class="btn btn-inverse btn-mini">
               Duplicate
             </a>
           </td>
-					<td style="width: 1%">
-						<a ng-click="edit(variable)" class="btn btn-inverse btn-mini">
-							<i class="fa fa-edit"></i>
-							Edit
-						</a>
-					</td>
-					<td style="width: 1%">
-						<a ng-click="removeVariable(variable)" class="btn btn-danger btn-mini">
-							<i class="fa fa-remove"></i>
-						</a>
-					</td>
-				</tr>
-			</table>
-		</div>
+          <td style="width: 1%">
+            <a ng-click="edit(variable)" class="btn btn-inverse btn-mini">
+              <i class="fa fa-edit"></i>
+              Edit
+            </a>
+          </td>
+          <td style="width: 1%">
+            <a ng-click="removeVariable(variable)" class="btn btn-danger btn-mini">
+              <i class="fa fa-remove"></i>
+            </a>
+          </td>
+        </tr>
+      </table>
+    </div>
 
-		<div class="gf-form" ng-show="mode === 'list'">
-			<div class="gf-form-button-row">
-				<a type="button" class="btn gf-form-button btn-success" ng-click="mode = 'new';"><i class="fa fa-plus" ></i>&nbsp;&nbsp;New</a>
-			</div>
-		</div>
+    <div class="gf-form" ng-show="mode === 'list'">
+      <div class="gf-form-button-row">
+        <a type="button" class="btn gf-form-button btn-success" ng-click="mode = 'new';"><i class="fa fa-plus" ></i>&nbsp;&nbsp;New</a>
+      </div>
+    </div>
 
-		<form ng-if="mode === 'edit' || mode === 'new'" name="ctrl.form">
-			<h5 class="section-heading">Variable</h5>
-			<div class="gf-form-group">
-				<div class="gf-form-inline">
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">Name</span>
-						<input type="text" class="gf-form-input" placeholder="name" ng-model='current.name' required></input>
-					</div>
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">
+    <form ng-if="mode === 'edit' || mode === 'new'" name="ctrl.form">
+      <h5 class="section-heading">Variable</h5>
+      <div class="gf-form-group">
+        <div class="gf-form" ng-show="ctrl.form.name.$error.pattern">
+          <span class="gf-form-error">Template names cannot begin with '__' that's reserved for Grafanas global variables</span>
+        </div>
+        <div class="gf-form-inline">
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">Name</span>
+            <input type="text" class="gf-form-input" name="name" placeholder="name" ng-model='current.name' required ng-pattern="namePattern"></input>
+          </div>
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">
               Type
               <info-popover mode="right-normal">
-								{{variableTypes[current.type].description}}
+                {{variableTypes[current.type].description}}
               </info-popover>
             </span>
-						<div class="gf-form-select-wrapper max-width-17">
-							<select class="gf-form-input" ng-model="current.type" ng-options="k as v.name for (k, v) in variableTypes" ng-change="typeChanged()"></select>
-						</div>
-					</div>
+            <div class="gf-form-select-wrapper max-width-17">
+              <select class="gf-form-input" ng-model="current.type" ng-options="k as v.name for (k, v) in variableTypes" ng-change="typeChanged()"></select>
+            </div>
+          </div>
         </div>
-				<div class="gf-form-inline">
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">Label</span>
-						<input type="text" class="gf-form-input" ng-model='current.label' placeholder="optional display name"></input>
-					</div>
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">Hide</span>
+        <div class="gf-form-inline">
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">Label</span>
+            <input type="text" class="gf-form-input" ng-model='current.label' placeholder="optional display name"></input>
+          </div>
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">Hide</span>
             <div class="gf-form-select-wrapper max-width-15">
-							<select class="gf-form-input" ng-model="current.hide" ng-options="f.value as f.text for f in hideOptions"></select>
-						</div>
-					</div>
-				</div>
-			</div>
+              <select class="gf-form-input" ng-model="current.hide" ng-options="f.value as f.text for f in hideOptions"></select>
+            </div>
+          </div>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'interval'" class="gf-form-group">
+      <div ng-if="current.type === 'interval'" class="gf-form-group">
         <h5 class="section-heading">Interval Options</h5>
 
-				<div class="gf-form">
-					<span class="gf-form-label width-9">Values</span>
-					<input type="text" class="gf-form-input" placeholder="name" ng-model='current.query' placeholder="1m,10m,1h,6h,1d,7d" ng-model-onblur ng-change="runQuery()" required></input>
-				</div>
+        <div class="gf-form">
+          <span class="gf-form-label width-9">Values</span>
+          <input type="text" class="gf-form-input" placeholder="name" ng-model='current.query' placeholder="1m,10m,1h,6h,1d,7d" ng-model-onblur ng-change="runQuery()" required></input>
+        </div>
 
-				<div class="gf-form-inline">
-					<gf-form-switch class="gf-form" label="Auto Option" label-class="width-9" checked="current.auto" on-change="runQuery()">
-					</gf-form-switch>
+        <div class="gf-form-inline">
+          <gf-form-switch class="gf-form" label="Auto Option" label-class="width-9" checked="current.auto" on-change="runQuery()">
+          </gf-form-switch>
 
-					<div class="gf-form">
-						<span class="gf-form-label width-9" ng-show="current.auto">
-							Step count <tip>How many times should the current time range be divided to calculate the value</tip>
-						</span>
-						<div class="gf-form-select-wrapper max-width-10" ng-show="current.auto">
-							<select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
-						</div>
-					</div>
-					<div class="gf-form">
-						<span class="gf-form-label" ng-show="current.auto">
-							Min interval <tip>The calculated value will not go below this threshold</tip>
-						</span>
-						<input type="text" class="gf-form-input max-width-10" ng-show="current.auto" ng-model="current.auto_min" ng-change="runQuery()" placeholder="10s"></input>
-					</div>
-				</div>
-			</div>
+          <div class="gf-form">
+            <span class="gf-form-label width-9" ng-show="current.auto">
+              Step count <tip>How many times should the current time range be divided to calculate the value</tip>
+            </span>
+            <div class="gf-form-select-wrapper max-width-10" ng-show="current.auto">
+              <select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
+            </div>
+          </div>
+          <div class="gf-form">
+            <span class="gf-form-label" ng-show="current.auto">
+              Min interval <tip>The calculated value will not go below this threshold</tip>
+            </span>
+            <input type="text" class="gf-form-input max-width-10" ng-show="current.auto" ng-model="current.auto_min" ng-change="runQuery()" placeholder="10s"></input>
+          </div>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'custom'" class="gf-form-group">
+      <div ng-if="current.type === 'custom'" class="gf-form-group">
         <h5 class="section-heading">Custom Options</h5>
-				<div class="gf-form">
-					<span class="gf-form-label width-14">Values separated by comma</span>
-					<input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="1, 10, 20, myvalue" required></input>
-				</div>
-			</div>
+        <div class="gf-form">
+          <span class="gf-form-label width-14">Values separated by comma</span>
+          <input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="1, 10, 20, myvalue" required></input>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'constant'" class="gf-form-group">
+      <div ng-if="current.type === 'constant'" class="gf-form-group">
         <h5 class="section-heading">Constant options</h5>
-				<div class="gf-form">
-					<span class="gf-form-label">Value</span>
-					<input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="your metric prefix"></input>
-				</div>
-			</div>
+        <div class="gf-form">
+          <span class="gf-form-label">Value</span>
+          <input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="your metric prefix"></input>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'query'" class="gf-form-group">
+      <div ng-if="current.type === 'query'" class="gf-form-group">
         <h5 class="section-heading">Query Options</h5>
 
         <div class="gf-form-inline">
@@ -170,8 +173,8 @@
               <select class="gf-form-input" ng-model="current.refresh" ng-options="f.value as f.text for f in refreshOptions"></select>
             </div>
           </div>
-				</div>
-				<div class="gf-form">
+        </div>
+        <div class="gf-form">
           <span class="gf-form-label width-7">Query</span>
           <input type="text" class="gf-form-input" ng-model='current.query' placeholder="metric name or tags query" ng-model-onblur ng-change="runQuery()" required></input>
         </div>
@@ -184,26 +187,26 @@
           </span>
           <input type="text" class="gf-form-input" ng-model='current.regex' placeholder="/.*-(.*)-.*/" ng-model-onblur ng-change="runQuery()"></input>
         </div>
-				<div class="gf-form max-width-21">
-					<span class="gf-form-label width-7">
-						Sort
-						<info-popover mode="right-normal">
-							How to sort the values of this variable.
-						</info-popover>
-					</span>
-					<div class="gf-form-select-wrapper max-width-14">
-						<select class="gf-form-input" ng-model="current.sort" ng-options="f.value as f.text for f in sortOptions" ng-change="runQuery()"></select>
-					</div>
-				</div>
-			</div>
+        <div class="gf-form max-width-21">
+          <span class="gf-form-label width-7">
+            Sort
+            <info-popover mode="right-normal">
+              How to sort the values of this variable.
+            </info-popover>
+          </span>
+          <div class="gf-form-select-wrapper max-width-14">
+            <select class="gf-form-input" ng-model="current.sort" ng-options="f.value as f.text for f in sortOptions" ng-change="runQuery()"></select>
+          </div>
+        </div>
+      </div>
 
-			<div ng-show="current.type === 'datasource'" class="gf-form-group">
-				<h5 class="section-heading">Data source options</h5>
+      <div ng-show="current.type === 'datasource'" class="gf-form-group">
+        <h5 class="section-heading">Data source options</h5>
 
-				<div class="gf-form">
-					<label class="gf-form-label width-12">Type</label>
-					<div class="gf-form-select-wrapper max-width-18">
-						<select class="gf-form-input" ng-model="current.query" ng-options="f.value as f.text for f in datasourceTypes" ng-change="runQuery()"></select>
+        <div class="gf-form">
+          <label class="gf-form-label width-12">Type</label>
+          <div class="gf-form-select-wrapper max-width-18">
+            <select class="gf-form-input" ng-model="current.query" ng-options="f.value as f.text for f in datasourceTypes" ng-change="runQuery()"></select>
           </div>
         </div>
 
@@ -222,18 +225,18 @@
         </div>
       </div>
 
-			<div ng-if="current.type === 'adhoc'" class="gf-form-group">
+      <div ng-if="current.type === 'adhoc'" class="gf-form-group">
         <h5 class="section-heading">Options</h5>
-				<div class="gf-form max-width-21">
-					<span class="gf-form-label width-8">Data source</span>
-					<div class="gf-form-select-wrapper max-width-14">
-						<select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()"></select>
-					</div>
-				</div>
-			</div>
+        <div class="gf-form max-width-21">
+          <span class="gf-form-label width-8">Data source</span>
+          <div class="gf-form-select-wrapper max-width-14">
+            <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()"></select>
+          </div>
+        </div>
+      </div>
 
-			<div class="section gf-form-group" ng-show="variableTypes[current.type].supportsMulti">
-				<h5 class="section-heading">Selection Options</h5>
+      <div class="section gf-form-group" ng-show="variableTypes[current.type].supportsMulti">
+        <h5 class="section-heading">Selection Options</h5>
         <div class="section">
           <gf-form-switch class="gf-form"
                           label="Multi-value"
@@ -257,37 +260,37 @@
 
       <div class="gf-form-group" ng-if="current.type === 'query'">
         <h5>Value groups/tags (Experimental feature)</h5>
-				<gf-form-switch class="gf-form" label="Enabled" label-class="width-10" checked="current.useTags" on-change="runQuery()">
-				</gf-form-switch>
-				<div class="gf-form last" ng-if="current.useTags">
-					<span class="gf-form-label width-10">Tags query</span>
-					<input type="text" class="gf-form-input" ng-model='current.tagsQuery' placeholder="metric name or tags query" ng-model-onblur></input>
-				</div>
-				<div class="gf-form" ng-if="current.useTags">
-					<li class="gf-form-label width-10">Tag values query</li>
-					<input type="text" class="gf-form-input" ng-model='current.tagValuesQuery' placeholder="apps.$tag.*" ng-model-onblur></input>
-				</div>
-			</div>
+        <gf-form-switch class="gf-form" label="Enabled" label-class="width-10" checked="current.useTags" on-change="runQuery()">
+        </gf-form-switch>
+        <div class="gf-form last" ng-if="current.useTags">
+          <span class="gf-form-label width-10">Tags query</span>
+          <input type="text" class="gf-form-input" ng-model='current.tagsQuery' placeholder="metric name or tags query" ng-model-onblur></input>
+        </div>
+        <div class="gf-form" ng-if="current.useTags">
+          <li class="gf-form-label width-10">Tag values query</li>
+          <input type="text" class="gf-form-input" ng-model='current.tagValuesQuery' placeholder="apps.$tag.*" ng-model-onblur></input>
+        </div>
+      </div>
 
-			<div class="gf-form-group" ng-show="current.options.length">
-				<h5>Preview of values (shows max 20)</h5>
-				<div class="gf-form-inline">
-					<div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
-						<span class="gf-form-label">{{option.text}}</span>
-					</div>
-				</div>
-			</div>
+      <div class="gf-form-group" ng-show="current.options.length">
+        <h5>Preview of values (shows max 20)</h5>
+        <div class="gf-form-inline">
+          <div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
+            <span class="gf-form-label">{{option.text}}</span>
+          </div>
+        </div>
+      </div>
 
-			<div class="alert alert-info gf-form-group" ng-if="infoText">
-				{{infoText}}
-			</div>
+      <div class="alert alert-info gf-form-group" ng-if="infoText">
+        {{infoText}}
+      </div>
 
-			<div class="gf-form-button-row p-y-0">
-				<button type="submit" class="btn btn-success" ng-show="mode === 'edit'" ng-click="update();">Update</button>
-				<button type="submit" class="btn btn-success" ng-show="mode === 'new'" ng-click="add();">Add</button>
-			</div>
+      <div class="gf-form-button-row p-y-0">
+        <button type="submit" class="btn btn-success" ng-show="mode === 'edit'" ng-click="update();">Update</button>
+        <button type="submit" class="btn btn-success" ng-show="mode === 'new'" ng-click="add();">Add</button>
+      </div>
 
-		</form>
-	</div>
+    </form>
+  </div>
 </div>
 
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 004ab86fb76..19588634dd3 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -66,6 +66,25 @@ $gf-form-margin: 0.25rem;
   }
 }
 
+.gf-form-error {
+  padding: $input-padding-y $input-padding-x;
+  margin-right: $gf-form-margin;
+  flex-shrink: 0;
+
+  background-color: $input-label-bg;
+  display: block;
+  font-size: $font-size-sm;
+  margin-right: $gf-form-margin;
+
+  border: $input-btn-border-width solid $red;
+  @include border-radius($label-border-radius-sm);
+
+  &--grow {
+    flex-grow: 1;
+    min-height: 2.60rem;
+  }
+}
+
 .gf-form-checkbox {
   flex-shrink: 0;
   padding: $input-padding-y $input-padding-x;

From 6b1dd1c7fc53d87fadf6eae735bda6451afabdf1 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 28 Feb 2017 17:08:17 +0100
Subject: [PATCH 178/301] changelog: adds note about closing #7678

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d45e8ac2852..fc247b9d29b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
-# 4.2.0 (unreleased)
+# 4.3.0 (unreleased)
+
+
+# 4.2.0-beta2 (unreleased)
+## Minor Enhancements
+* **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)
+
+# 4.2.0-beta1 (2017-02-27)
 
 ## Enhancements
 * **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)

From 62eb19a186ee723e6be4b594584bf8ed21bc16d2 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 28 Feb 2017 17:04:47 +0100
Subject: [PATCH 179/301] template: dont allow template variables to begin with
 '__'

closes #7678
---
 public/app/features/templating/editor_ctrl.ts |   1 +
 .../features/templating/partials/editor.html  | 367 +++++++++---------
 public/sass/components/_gf-form.scss          |  19 +
 3 files changed, 205 insertions(+), 182 deletions(-)

diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index c5e24741a96..7bd745bed53 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -10,6 +10,7 @@ export class VariableEditorCtrl {
   constructor(private $scope, private datasourceSrv, private variableSrv, templateSrv) {
     $scope.variableTypes = variableTypes;
     $scope.ctrl = {};
+    $scope.namePattern = /^((?!__).)*$/;
 
     $scope.refreshOptions = [
       {value: 0, text: "Never"},
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 4fc2553244c..5f844931b4c 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -1,155 +1,158 @@
 <div ng-controller="VariableEditorCtrl" ng-init="init()">
-	<div class="tabbed-view-header">
-		<h2 class="tabbed-view-title">
-			Templating
-		</h2>
+  <div class="tabbed-view-header">
+    <h2 class="tabbed-view-title">
+      Templating
+    </h2>
 
-		<ul class="gf-tabs">
-			<li class="gf-tabs-item" >
-				<a class="gf-tabs-link" ng-click="mode = 'list';" ng-class="{active: mode === 'list'}">
-					Variables
-				</a>
-			</li>
-			<li class="gf-tabs-item" ng-show="mode === 'edit'">
-				<a class="gf-tabs-link" ng-class="{active: mode === 'edit'}">
-					Edit
-				</a>
-			</li>
-			<li class="gf-tabs-item" ng-show="mode === 'new'">
-				<span class="active gf-tabs-link">New</span>
-			</li>
-		</ul>
+    <ul class="gf-tabs">
+      <li class="gf-tabs-item" >
+        <a class="gf-tabs-link" ng-click="mode = 'list';" ng-class="{active: mode === 'list'}">
+          Variables
+        </a>
+      </li>
+      <li class="gf-tabs-item" ng-show="mode === 'edit'">
+        <a class="gf-tabs-link" ng-class="{active: mode === 'edit'}">
+          Edit
+        </a>
+      </li>
+      <li class="gf-tabs-item" ng-show="mode === 'new'">
+        <span class="active gf-tabs-link">New</span>
+      </li>
+    </ul>
 
-		<button class="tabbed-view-close-btn" ng-click="dismiss();">
-			<i class="fa fa-remove"></i>
-		</button>
-	</div>
+    <button class="tabbed-view-close-btn" ng-click="dismiss();">
+      <i class="fa fa-remove"></i>
+    </button>
+  </div>
 
-	<div class="tabbed-view-body">
+  <div class="tabbed-view-body">
 
-		<div ng-if="mode === 'list'">
-			<div ng-if="variables.length === 0">
-				<em>No template variables defined</em>
-			</div>
-			<table class="grafana-options-table">
-				<tr ng-repeat="variable in variables">
-					<td style="width: 1%">
-						<span class="template-variable">
-							${{variable.name}}
-						</span>
-					</td>
-					<td class="max-width" style="max-width: 200px;">
-						{{variable.query}}
-					</td>
+    <div ng-if="mode === 'list'">
+      <div ng-if="variables.length === 0">
+        <em>No template variables defined</em>
+      </div>
+      <table class="grafana-options-table">
+        <tr ng-repeat="variable in variables">
+          <td style="width: 1%">
+            <span class="template-variable">
+              ${{variable.name}}
+            </span>
+          </td>
+          <td class="max-width" style="max-width: 200px;">
+            {{variable.query}}
+          </td>
 
-					<td style="width: 1%"><i ng-click="_.move(variables,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
-					<td style="width: 1%"><i ng-click="_.move(variables,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
-					<td style="width: 1%">
+          <td style="width: 1%"><i ng-click="_.move(variables,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
+          <td style="width: 1%"><i ng-click="_.move(variables,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
+          <td style="width: 1%">
             <a ng-click="duplicate(variable)" class="btn btn-inverse btn-mini">
               Duplicate
             </a>
           </td>
-					<td style="width: 1%">
-						<a ng-click="edit(variable)" class="btn btn-inverse btn-mini">
-							<i class="fa fa-edit"></i>
-							Edit
-						</a>
-					</td>
-					<td style="width: 1%">
-						<a ng-click="removeVariable(variable)" class="btn btn-danger btn-mini">
-							<i class="fa fa-remove"></i>
-						</a>
-					</td>
-				</tr>
-			</table>
-		</div>
+          <td style="width: 1%">
+            <a ng-click="edit(variable)" class="btn btn-inverse btn-mini">
+              <i class="fa fa-edit"></i>
+              Edit
+            </a>
+          </td>
+          <td style="width: 1%">
+            <a ng-click="removeVariable(variable)" class="btn btn-danger btn-mini">
+              <i class="fa fa-remove"></i>
+            </a>
+          </td>
+        </tr>
+      </table>
+    </div>
 
-		<div class="gf-form" ng-show="mode === 'list'">
-			<div class="gf-form-button-row">
-				<a type="button" class="btn gf-form-button btn-success" ng-click="mode = 'new';"><i class="fa fa-plus" ></i>&nbsp;&nbsp;New</a>
-			</div>
-		</div>
+    <div class="gf-form" ng-show="mode === 'list'">
+      <div class="gf-form-button-row">
+        <a type="button" class="btn gf-form-button btn-success" ng-click="mode = 'new';"><i class="fa fa-plus" ></i>&nbsp;&nbsp;New</a>
+      </div>
+    </div>
 
-		<form ng-if="mode === 'edit' || mode === 'new'" name="ctrl.form">
-			<h5 class="section-heading">Variable</h5>
-			<div class="gf-form-group">
-				<div class="gf-form-inline">
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">Name</span>
-						<input type="text" class="gf-form-input" placeholder="name" ng-model='current.name' required></input>
-					</div>
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">
+    <form ng-if="mode === 'edit' || mode === 'new'" name="ctrl.form">
+      <h5 class="section-heading">Variable</h5>
+      <div class="gf-form-group">
+        <div class="gf-form" ng-show="ctrl.form.name.$error.pattern">
+          <span class="gf-form-error">Template names cannot begin with '__' that's reserved for Grafanas global variables</span>
+        </div>
+        <div class="gf-form-inline">
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">Name</span>
+            <input type="text" class="gf-form-input" name="name" placeholder="name" ng-model='current.name' required ng-pattern="namePattern"></input>
+          </div>
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">
               Type
               <info-popover mode="right-normal">
-								{{variableTypes[current.type].description}}
+                {{variableTypes[current.type].description}}
               </info-popover>
             </span>
-						<div class="gf-form-select-wrapper max-width-17">
-							<select class="gf-form-input" ng-model="current.type" ng-options="k as v.name for (k, v) in variableTypes" ng-change="typeChanged()"></select>
-						</div>
-					</div>
+            <div class="gf-form-select-wrapper max-width-17">
+              <select class="gf-form-input" ng-model="current.type" ng-options="k as v.name for (k, v) in variableTypes" ng-change="typeChanged()"></select>
+            </div>
+          </div>
         </div>
-				<div class="gf-form-inline">
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">Label</span>
-						<input type="text" class="gf-form-input" ng-model='current.label' placeholder="optional display name"></input>
-					</div>
-					<div class="gf-form max-width-19">
-						<span class="gf-form-label width-6">Hide</span>
+        <div class="gf-form-inline">
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">Label</span>
+            <input type="text" class="gf-form-input" ng-model='current.label' placeholder="optional display name"></input>
+          </div>
+          <div class="gf-form max-width-19">
+            <span class="gf-form-label width-6">Hide</span>
             <div class="gf-form-select-wrapper max-width-15">
-							<select class="gf-form-input" ng-model="current.hide" ng-options="f.value as f.text for f in hideOptions"></select>
-						</div>
-					</div>
-				</div>
-			</div>
+              <select class="gf-form-input" ng-model="current.hide" ng-options="f.value as f.text for f in hideOptions"></select>
+            </div>
+          </div>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'interval'" class="gf-form-group">
+      <div ng-if="current.type === 'interval'" class="gf-form-group">
         <h5 class="section-heading">Interval Options</h5>
 
-				<div class="gf-form">
-					<span class="gf-form-label width-9">Values</span>
-					<input type="text" class="gf-form-input" placeholder="name" ng-model='current.query' placeholder="1m,10m,1h,6h,1d,7d" ng-model-onblur ng-change="runQuery()" required></input>
-				</div>
+        <div class="gf-form">
+          <span class="gf-form-label width-9">Values</span>
+          <input type="text" class="gf-form-input" placeholder="name" ng-model='current.query' placeholder="1m,10m,1h,6h,1d,7d" ng-model-onblur ng-change="runQuery()" required></input>
+        </div>
 
-				<div class="gf-form-inline">
-					<gf-form-switch class="gf-form" label="Auto Option" label-class="width-9" checked="current.auto" on-change="runQuery()">
-					</gf-form-switch>
+        <div class="gf-form-inline">
+          <gf-form-switch class="gf-form" label="Auto Option" label-class="width-9" checked="current.auto" on-change="runQuery()">
+          </gf-form-switch>
 
-					<div class="gf-form">
-						<span class="gf-form-label width-9" ng-show="current.auto">
-							Step count <tip>How many times should the current time range be divided to calculate the value</tip>
-						</span>
-						<div class="gf-form-select-wrapper max-width-10" ng-show="current.auto">
-							<select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
-						</div>
-					</div>
-					<div class="gf-form">
-						<span class="gf-form-label" ng-show="current.auto">
-							Min interval <tip>The calculated value will not go below this threshold</tip>
-						</span>
-						<input type="text" class="gf-form-input max-width-10" ng-show="current.auto" ng-model="current.auto_min" ng-change="runQuery()" placeholder="10s"></input>
-					</div>
-				</div>
-			</div>
+          <div class="gf-form">
+            <span class="gf-form-label width-9" ng-show="current.auto">
+              Step count <tip>How many times should the current time range be divided to calculate the value</tip>
+            </span>
+            <div class="gf-form-select-wrapper max-width-10" ng-show="current.auto">
+              <select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
+            </div>
+          </div>
+          <div class="gf-form">
+            <span class="gf-form-label" ng-show="current.auto">
+              Min interval <tip>The calculated value will not go below this threshold</tip>
+            </span>
+            <input type="text" class="gf-form-input max-width-10" ng-show="current.auto" ng-model="current.auto_min" ng-change="runQuery()" placeholder="10s"></input>
+          </div>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'custom'" class="gf-form-group">
+      <div ng-if="current.type === 'custom'" class="gf-form-group">
         <h5 class="section-heading">Custom Options</h5>
-				<div class="gf-form">
-					<span class="gf-form-label width-14">Values separated by comma</span>
-					<input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="1, 10, 20, myvalue" required></input>
-				</div>
-			</div>
+        <div class="gf-form">
+          <span class="gf-form-label width-14">Values separated by comma</span>
+          <input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="1, 10, 20, myvalue" required></input>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'constant'" class="gf-form-group">
+      <div ng-if="current.type === 'constant'" class="gf-form-group">
         <h5 class="section-heading">Constant options</h5>
-				<div class="gf-form">
-					<span class="gf-form-label">Value</span>
-					<input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="your metric prefix"></input>
-				</div>
-			</div>
+        <div class="gf-form">
+          <span class="gf-form-label">Value</span>
+          <input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="your metric prefix"></input>
+        </div>
+      </div>
 
-			<div ng-if="current.type === 'query'" class="gf-form-group">
+      <div ng-if="current.type === 'query'" class="gf-form-group">
         <h5 class="section-heading">Query Options</h5>
 
         <div class="gf-form-inline">
@@ -170,8 +173,8 @@
               <select class="gf-form-input" ng-model="current.refresh" ng-options="f.value as f.text for f in refreshOptions"></select>
             </div>
           </div>
-				</div>
-				<div class="gf-form">
+        </div>
+        <div class="gf-form">
           <span class="gf-form-label width-7">Query</span>
           <input type="text" class="gf-form-input" ng-model='current.query' placeholder="metric name or tags query" ng-model-onblur ng-change="runQuery()" required></input>
         </div>
@@ -184,26 +187,26 @@
           </span>
           <input type="text" class="gf-form-input" ng-model='current.regex' placeholder="/.*-(.*)-.*/" ng-model-onblur ng-change="runQuery()"></input>
         </div>
-				<div class="gf-form max-width-21">
-					<span class="gf-form-label width-7">
-						Sort
-						<info-popover mode="right-normal">
-							How to sort the values of this variable.
-						</info-popover>
-					</span>
-					<div class="gf-form-select-wrapper max-width-14">
-						<select class="gf-form-input" ng-model="current.sort" ng-options="f.value as f.text for f in sortOptions" ng-change="runQuery()"></select>
-					</div>
-				</div>
-			</div>
+        <div class="gf-form max-width-21">
+          <span class="gf-form-label width-7">
+            Sort
+            <info-popover mode="right-normal">
+              How to sort the values of this variable.
+            </info-popover>
+          </span>
+          <div class="gf-form-select-wrapper max-width-14">
+            <select class="gf-form-input" ng-model="current.sort" ng-options="f.value as f.text for f in sortOptions" ng-change="runQuery()"></select>
+          </div>
+        </div>
+      </div>
 
-			<div ng-show="current.type === 'datasource'" class="gf-form-group">
-				<h5 class="section-heading">Data source options</h5>
+      <div ng-show="current.type === 'datasource'" class="gf-form-group">
+        <h5 class="section-heading">Data source options</h5>
 
-				<div class="gf-form">
-					<label class="gf-form-label width-12">Type</label>
-					<div class="gf-form-select-wrapper max-width-18">
-						<select class="gf-form-input" ng-model="current.query" ng-options="f.value as f.text for f in datasourceTypes" ng-change="runQuery()"></select>
+        <div class="gf-form">
+          <label class="gf-form-label width-12">Type</label>
+          <div class="gf-form-select-wrapper max-width-18">
+            <select class="gf-form-input" ng-model="current.query" ng-options="f.value as f.text for f in datasourceTypes" ng-change="runQuery()"></select>
           </div>
         </div>
 
@@ -222,18 +225,18 @@
         </div>
       </div>
 
-			<div ng-if="current.type === 'adhoc'" class="gf-form-group">
+      <div ng-if="current.type === 'adhoc'" class="gf-form-group">
         <h5 class="section-heading">Options</h5>
-				<div class="gf-form max-width-21">
-					<span class="gf-form-label width-8">Data source</span>
-					<div class="gf-form-select-wrapper max-width-14">
-						<select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()"></select>
-					</div>
-				</div>
-			</div>
+        <div class="gf-form max-width-21">
+          <span class="gf-form-label width-8">Data source</span>
+          <div class="gf-form-select-wrapper max-width-14">
+            <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()"></select>
+          </div>
+        </div>
+      </div>
 
-			<div class="section gf-form-group" ng-show="variableTypes[current.type].supportsMulti">
-				<h5 class="section-heading">Selection Options</h5>
+      <div class="section gf-form-group" ng-show="variableTypes[current.type].supportsMulti">
+        <h5 class="section-heading">Selection Options</h5>
         <div class="section">
           <gf-form-switch class="gf-form"
                           label="Multi-value"
@@ -257,37 +260,37 @@
 
       <div class="gf-form-group" ng-if="current.type === 'query'">
         <h5>Value groups/tags (Experimental feature)</h5>
-				<gf-form-switch class="gf-form" label="Enabled" label-class="width-10" checked="current.useTags" on-change="runQuery()">
-				</gf-form-switch>
-				<div class="gf-form last" ng-if="current.useTags">
-					<span class="gf-form-label width-10">Tags query</span>
-					<input type="text" class="gf-form-input" ng-model='current.tagsQuery' placeholder="metric name or tags query" ng-model-onblur></input>
-				</div>
-				<div class="gf-form" ng-if="current.useTags">
-					<li class="gf-form-label width-10">Tag values query</li>
-					<input type="text" class="gf-form-input" ng-model='current.tagValuesQuery' placeholder="apps.$tag.*" ng-model-onblur></input>
-				</div>
-			</div>
+        <gf-form-switch class="gf-form" label="Enabled" label-class="width-10" checked="current.useTags" on-change="runQuery()">
+        </gf-form-switch>
+        <div class="gf-form last" ng-if="current.useTags">
+          <span class="gf-form-label width-10">Tags query</span>
+          <input type="text" class="gf-form-input" ng-model='current.tagsQuery' placeholder="metric name or tags query" ng-model-onblur></input>
+        </div>
+        <div class="gf-form" ng-if="current.useTags">
+          <li class="gf-form-label width-10">Tag values query</li>
+          <input type="text" class="gf-form-input" ng-model='current.tagValuesQuery' placeholder="apps.$tag.*" ng-model-onblur></input>
+        </div>
+      </div>
 
-			<div class="gf-form-group" ng-show="current.options.length">
-				<h5>Preview of values (shows max 20)</h5>
-				<div class="gf-form-inline">
-					<div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
-						<span class="gf-form-label">{{option.text}}</span>
-					</div>
-				</div>
-			</div>
+      <div class="gf-form-group" ng-show="current.options.length">
+        <h5>Preview of values (shows max 20)</h5>
+        <div class="gf-form-inline">
+          <div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
+            <span class="gf-form-label">{{option.text}}</span>
+          </div>
+        </div>
+      </div>
 
-			<div class="alert alert-info gf-form-group" ng-if="infoText">
-				{{infoText}}
-			</div>
+      <div class="alert alert-info gf-form-group" ng-if="infoText">
+        {{infoText}}
+      </div>
 
-			<div class="gf-form-button-row p-y-0">
-				<button type="submit" class="btn btn-success" ng-show="mode === 'edit'" ng-click="update();">Update</button>
-				<button type="submit" class="btn btn-success" ng-show="mode === 'new'" ng-click="add();">Add</button>
-			</div>
+      <div class="gf-form-button-row p-y-0">
+        <button type="submit" class="btn btn-success" ng-show="mode === 'edit'" ng-click="update();">Update</button>
+        <button type="submit" class="btn btn-success" ng-show="mode === 'new'" ng-click="add();">Add</button>
+      </div>
 
-		</form>
-	</div>
+    </form>
+  </div>
 </div>
 
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 004ab86fb76..19588634dd3 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -66,6 +66,25 @@ $gf-form-margin: 0.25rem;
   }
 }
 
+.gf-form-error {
+  padding: $input-padding-y $input-padding-x;
+  margin-right: $gf-form-margin;
+  flex-shrink: 0;
+
+  background-color: $input-label-bg;
+  display: block;
+  font-size: $font-size-sm;
+  margin-right: $gf-form-margin;
+
+  border: $input-btn-border-width solid $red;
+  @include border-radius($label-border-radius-sm);
+
+  &--grow {
+    flex-grow: 1;
+    min-height: 2.60rem;
+  }
+}
+
 .gf-form-checkbox {
   flex-shrink: 0;
   padding: $input-padding-y $input-padding-x;

From 573bcdde12a6b77a8fc608950c9c14f7ca73d9f7 Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Wed, 1 Mar 2017 11:35:12 +0100
Subject: [PATCH 180/301] Added some details about Sessions in Postgres

---
 docs/sources/installation/configuration.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 4a2b60cb48d..4020aa9b900 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -457,7 +457,7 @@ session provider you have configured.
 
 - **file:** session file path, e.g. `data/sessions`
 - **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
-- **postgres:** ex:  user=a password=b host=localhost port=5432 dbname=c sslmode=disable
+- **postgres:** ex:  user=a password=b host=localhost port=5432 dbname=c sslmode=require
 - **memcache:** ex:  127.0.0.1:11211
 - **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
 
@@ -472,6 +472,17 @@ Mysql Example:
         `expiry`    INT(11) UNSIGNED NOT NULL,
         PRIMARY KEY (`key`)
     ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+    
+Postgres Example:
+
+    CREATE TABLE session (
+        key       CHAR(16) NOT NULL,
+        data      BYTEA,
+        expiry    INTEGER NOT NULL,
+        PRIMARY KEY (key)
+    );
+    
+Postgres valid `sslmode` are `disable`, `require` (default), `verify-ca`, and `verify-full`.
 
 ### cookie_name
 

From 06146b801c2b3e3055f535c612ee7f0ef63bd4f8 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 23 Feb 2017 20:48:31 +0100
Subject: [PATCH 181/301] build: replace sha1 files with sha256

due to security reasons.
https://security.googleblog.com/2017/02/announcing-first-sha1-collision.html
---
 appveyor.yml |  2 +-
 build.go     | 18 +++++++++---------
 circle.yml   |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 25e4181ed80..303c3abca9e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ install:
 build_script:
   - go run build.go build
   - grunt release
-  - go run build.go sha1-dist
+  - go run build.go sha-dist
   - cp dist/* .
 
 artifacts:
diff --git a/build.go b/build.go
index 5c04b78cecf..7943bd8716c 100644
--- a/build.go
+++ b/build.go
@@ -5,7 +5,7 @@ package main
 import (
 	"bytes"
 	"crypto/md5"
-	"crypto/sha1"
+	"crypto/sha256"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -105,8 +105,8 @@ func main() {
 			grunt(gruntBuildArg("release")...)
 			createDebPackages()
 
-		case "sha1-dist":
-			sha1FilesInDist()
+		case "sha-dist":
+			shaFilesInDist()
 
 		case "latest":
 			makeLatestDistCopies()
@@ -522,14 +522,14 @@ func md5File(file string) error {
 	return out.Close()
 }
 
-func sha1FilesInDist() {
+func shaFilesInDist() {
 	filepath.Walk("./dist", func(path string, f os.FileInfo, err error) error {
 		if path == "./dist" {
 			return nil
 		}
 
-		if strings.Contains(path, ".sha1") == false {
-			err := sha1File(path)
+		if strings.Contains(path, ".sha256") == false {
+			err := shaFile(path)
 			if err != nil {
 				log.Printf("Failed to create sha file. error: %v\n", err)
 			}
@@ -538,20 +538,20 @@ func sha1FilesInDist() {
 	})
 }
 
-func sha1File(file string) error {
+func shaFile(file string) error {
 	fd, err := os.Open(file)
 	if err != nil {
 		return err
 	}
 	defer fd.Close()
 
-	h := sha1.New()
+	h := sha256.New()
 	_, err = io.Copy(h, fd)
 	if err != nil {
 		return err
 	}
 
-	out, err := os.Create(file + ".sha1")
+	out, err := os.Create(file + ".sha256")
 	if err != nil {
 		return err
 	}
diff --git a/circle.yml b/circle.yml
index 6db2b3e99f7..75dae71d0ab 100644
--- a/circle.yml
+++ b/circle.yml
@@ -41,7 +41,7 @@ deployment:
     commands:
       - ./scripts/build/deploy.sh
       - ./scripts/build/sign_packages.sh
-      - go run build.go sha1-dist
+      - go run build.go sha-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master
       - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
@@ -50,7 +50,7 @@ deployment:
     commands:
       - ./scripts/build/deploy.sh
       - ./scripts/build/sign_packages.sh
-      - go run build.go sha1-dist
+      - go run build.go sha-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/release
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release
       - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}

From c09cd4ba296fa899dbed18229d53155d3c002707 Mon Sep 17 00:00:00 2001
From: jifwin <gpietrusza@gmail.com>
Date: Wed, 1 Mar 2017 15:02:59 +0000
Subject: [PATCH 182/301] make load on scroll configurable and use debouce

---
 public/app/features/dashboard/model.ts             |  2 ++
 .../app/features/dashboard/partials/settings.html  |  6 ++++++
 public/app/features/panel/metrics_panel_ctrl.ts    | 11 ++++++-----
 public/app/features/panel/panel_directive.ts       | 14 ++++----------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/public/app/features/dashboard/model.ts b/public/app/features/dashboard/model.ts
index e31a6c1afd0..959b5ff2116 100644
--- a/public/app/features/dashboard/model.ts
+++ b/public/app/features/dashboard/model.ts
@@ -36,6 +36,7 @@ export class DashboardModel {
   meta: any;
   events: any;
   editMode: boolean;
+  loadOnScroll: boolean;
 
   constructor(data, meta?) {
     if (!data) {
@@ -64,6 +65,7 @@ export class DashboardModel {
     this.version = data.version || 0;
     this.links = data.links || [];
     this.gnetId = data.gnetId || null;
+    this.loadOnScroll = data.loadOnScroll || false;
 
     this.rows = [];
     if (data.rows) {
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index b8d8303a51b..7475fceb2d8 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -61,6 +61,12 @@
                         checked="dashboard.hideControls"
                         label-class="width-11">
         </gf-form-switch>
+        <gf-form-switch class="gf-form"
+                        label="Load on scroll"
+                        tooltip="Load panels as they become visible"
+                        checked="dashboard.loadOnScroll"
+                        label-class="width-11">
+        </gf-form-switch>
       </div>
     </div>
 
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index de6e331e8a1..d9670291481 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -74,13 +74,14 @@ class MetricsPanelCtrl extends PanelCtrl {
     // ignore fetching data if another panel is in fullscreen
     if (this.otherPanelInFullscreenMode()) { return; }
 
-    if (!this.scope.$$childHead || (!this.scope.$$childHead.isVisible() && !this.isRenderGraph())) {
-      this.scope.$$childHead.needsRefresh = true;
-      return;
+    if (this.scope.ctrl.dashboard.loadOnScroll) {
+      if (!this.scope.$$childHead || (!this.scope.$$childHead.isVisible() && !this.isRenderGraph())) {
+        this.scope.$$childHead.needsRefresh = true;
+        return;
+      }
+      this.scope.$$childHead.needsRefresh = false;
     }
 
-    this.scope.$$childHead.needsRefresh = false;
-
     // if we have snapshot data use that
     if (this.panel.snapshotData) {
       this.updateTimeRange();
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 637facb50c1..3aa195e706c 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -184,7 +184,6 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
         }
       });
 
-      var getDataPromise = null;
       scope.needsRefresh = false;
 
       scope.isVisible = function () {
@@ -192,16 +191,11 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
         return (0 < position.top) && (position.top < window.innerHeight);
       };
 
-      $document.bind('scroll', function () {
-        if (getDataPromise) {
-          $timeout.cancel(getDataPromise);
+      $document.bind('scroll', _.debounce(function () {
+        if (scope.ctrl.dashboard.loadOnScroll && scope.needsRefresh) {
+          scope.ctrl.refresh();
         }
-        if (scope.needsRefresh) {
-          getDataPromise = $timeout(function () {
-            scope.ctrl.refresh();
-          }, 250);
-        }
-      });
+      }, 250));
     }
   };
 });

From 473513aa2f3d1445318cba9c46e35d4e8848d4e5 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 1 Mar 2017 17:19:25 +0100
Subject: [PATCH 183/301] docs: how to configure alert notification links

---
 docs/sources/alerting/notifications.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/sources/alerting/notifications.md b/docs/sources/alerting/notifications.md
index 9f8d3c36120..d0dd19cbcdc 100644
--- a/docs/sources/alerting/notifications.md
+++ b/docs/sources/alerting/notifications.md
@@ -101,4 +101,9 @@ config file.
 
 This is an optional requirement, you can get slack and email notifications without setting this up.
 
+# Configure the link back to Grafana from alert notifications
+
+All alert notifications contains a link back to the triggered alert in the Grafana instance. 
+This url is based on the [domain](/installation/configuration/#domain) setting in Grafana. 
+
 

From 412b8998a8e5e6812e0a3814398628dd8d445095 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Mar 2017 13:57:28 +0100
Subject: [PATCH 184/301] webhooks: get proxy settings from ini file

closes #7710
---
 pkg/services/notifications/webhook.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
index 25d015e2db4..c74804ab828 100644
--- a/pkg/services/notifications/webhook.go
+++ b/pkg/services/notifications/webhook.go
@@ -25,6 +25,7 @@ type Webhook struct {
 }
 
 var netTransport = &http.Transport{
+	Proxy: http.ProxyFromEnvironment,
 	Dial: (&net.Dialer{
 		Timeout: 30 * time.Second,
 	}).Dial,

From ee190d57ebaf804484606291d9242e19f5131d79 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Mar 2017 13:57:28 +0100
Subject: [PATCH 185/301] webhooks: get proxy settings from ini file

closes #7710
---
 pkg/services/notifications/webhook.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go
index 25d015e2db4..c74804ab828 100644
--- a/pkg/services/notifications/webhook.go
+++ b/pkg/services/notifications/webhook.go
@@ -25,6 +25,7 @@ type Webhook struct {
 }
 
 var netTransport = &http.Transport{
+	Proxy: http.ProxyFromEnvironment,
 	Dial: (&net.Dialer{
 		Timeout: 30 * time.Second,
 	}).Dial,

From 55e0df7896d947685b34bf3ecc322674989cc9a1 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 2 Mar 2017 14:01:06 +0100
Subject: [PATCH 186/301] docs: adds note about closing #7710

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc247b9d29b..c10b63cb485 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ## Minor Enhancements
 * **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)
 
+## Bugfixes
+* **Webhook**: Use proxy settings from environment variables [#7710](https://github.com/grafana/grafana/issues/7710)
+
 # 4.2.0-beta1 (2017-02-27)
 
 ## Enhancements

From 26bb9ad399627ea5fc6fd6f116559a2860e711df Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 24 Feb 2017 09:22:57 +0100
Subject: [PATCH 187/301] build: use initial checkout within container

speedup and simplify the build within the container
---
 circle.yml              |  3 +--
 scripts/build/build.sh  | 19 +------------------
 scripts/build/deploy.sh |  4 +++-
 scripts/circle-test.sh  |  5 +++--
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/circle.yml b/circle.yml
index 75dae71d0ab..9c5f0f1ccbd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,7 @@ dependencies:
 
 test:
   override:
-     - bash scripts/circle-test.sh
+    - bash scripts/circle-test.sh
 
 deployment:
   gh_branch:
@@ -54,4 +54,3 @@ deployment:
       - aws s3 sync ./dist s3://$BUCKET_NAME/release
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release
       - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}
-
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index 6e1b2cbe5b9..4f16ee240c4 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -7,20 +7,7 @@
 GOPATH=/go
 REPO_PATH=$GOPATH/src/github.com/grafana/grafana
 
-mkdir -p /go/src/github.com/grafana
-cd /go/src/github.com/grafana
-
-if [ "$CIRCLE_TAG" != "" ]; then
-  echo "Builing from tag $CIRCLE_TAG"
-  git clone https://github.com/grafana/grafana.git
-  cd $REPO_PATH
-  git checkout $CIRCLE_TAG
-else
-  echo "Building from branch $CIRCLE_BRANCH"
-  git clone --depth 1 https://github.com/grafana/grafana.git -b $CIRCLE_BRANCH
-  cd $REPO_PATH
-fi
-
+cd /go/src/github.com/grafana/grafana
 echo "current dir: $(pwd)"
 
 if [ "$CIRCLE_TAG" != "" ]; then
@@ -47,7 +34,3 @@ else
   echo "Packaging incremental build for $CIRCLE_BRANCH"
   go run build.go -buildNumber=${CIRCLE_BUILD_NUM} package latest
 fi
-
-cp dist/* /tmp/dist/
-
-
diff --git a/scripts/build/deploy.sh b/scripts/build/deploy.sh
index bfc735e4c79..49b2a9e3a7c 100755
--- a/scripts/build/deploy.sh
+++ b/scripts/build/deploy.sh
@@ -5,8 +5,10 @@ mkdir -p dist
 echo "Circle branch: ${CIRCLE_BRANCH}"
 echo "Circle tag: ${CIRCLE_TAG}"
 docker run -i -t --name gfbuild \
-  -v $(pwd)/dist:/tmp/dist \
+  -v $(pwd):/go/src/github.com/grafana/grafana \
   -e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \
   -e "CIRCLE_TAG=${CIRCLE_TAG}" \
   -e "CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM}" \
   grafana/buildcontainer
+
+sudo chown -R ${USER:=$(/usr/bin/id -run)}:$USER dist
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index e11007d8e76..a3a2790bcdc 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -24,7 +24,8 @@ exit_if_fail test -z "$(gofmt -s -l ./pkg | tee /dev/stderr)"
 echo "running go vet"
 exit_if_fail test -z "$(go vet ./pkg/... | tee /dev/stderr)"
 
+echo "building binaries"
 exit_if_fail go run build.go build
+
+echo "running go test"
 exit_if_fail go test -v ./pkg/...
-
-

From fe970f66298f9135ae119dd0c603dcd66d633028 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 3 Mar 2017 11:09:05 +0100
Subject: [PATCH 188/301] docs: adds note about closing #7676

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c10b63cb485..46973702d6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # 4.3.0 (unreleased)
 
+## Minor Enchancements
+* **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements

From 7ace2463a471ac09884a4597ea883f31c034d113 Mon Sep 17 00:00:00 2001
From: Mitja Zivkovic <mitjaz@gmail.com>
Date: Fri, 3 Mar 2017 14:07:30 +0100
Subject: [PATCH 189/301] added cubic decimetre - dm3 #7695

---
 public/app/core/utils/kbn.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js
index 819206bf94a..f5255b52697 100644
--- a/public/app/core/utils/kbn.js
+++ b/public/app/core/utils/kbn.js
@@ -488,6 +488,7 @@ function($, _) {
   kbn.valueFormats.litre  = kbn.formatBuilders.decimalSIPrefix('L');
   kbn.valueFormats.mlitre = kbn.formatBuilders.decimalSIPrefix('L', -1);
   kbn.valueFormats.m3     = kbn.formatBuilders.decimalSIPrefix('m3');
+  kbn.valueFormats.dm3    = kbn.formatBuilders.decimalSIPrefix('dm3');
   kbn.valueFormats.gallons  = kbn.formatBuilders.fixedUnit('gal');
 
   // Flow
@@ -805,10 +806,11 @@ function($, _) {
       {
         text: 'volume',
         submenu: [
-          {text: 'millilitre',  value: 'mlitre' },
-          {text: 'litre',       value: 'litre'  },
-          {text: 'cubic metre', value: 'm3'     },
-          {text: 'gallons',     value: 'gallons'},
+          {text: 'millilitre',      value: 'mlitre' },
+          {text: 'litre',           value: 'litre'  },
+          {text: 'cubic metre',     value: 'm3'     },
+          {text: 'cubic decimetre', value: 'dm3'    },
+          {text: 'gallons',         value: 'gallons'},
         ]
       },
       {

From f577dd0f389b69006005c7548cf679652e877c74 Mon Sep 17 00:00:00 2001
From: thuck <denisdoria@gmail.com>
Date: Sun, 5 Mar 2017 23:13:46 +0100
Subject: [PATCH 190/301] Including LIMIT, SLIMIT and ORDER BY time on influxdb
 #6065

Initial work for the query builder interface
---
 .../datasource/influxdb/influx_query.ts       |  1 +
 .../influxdb/partials/query.editor.html       | 24 ++++++++++++++++++-
 .../plugins/datasource/influxdb/query_ctrl.ts |  5 ++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts
index 065b85cf175..89cba55773f 100644
--- a/public/app/plugins/datasource/influxdb/influx_query.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query.ts
@@ -21,6 +21,7 @@ export default class InfluxQuery {
     target.policy = target.policy || 'default';
     target.dsType = 'influxdb';
     target.resultFormat = target.resultFormat || 'time_series';
+    target.orderByTime = target.orderByTime || 'ASC';
     target.tags = target.tags || [];
     target.groupBy = target.groupBy || [
       {type: 'time', params: ['$__interval']},
diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index f718fbc5d29..509a0d473eb 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -72,11 +72,33 @@
 			</div>
 		</div>
 
+        <div class="gf-form-inline">
+            <div class="gf-form">
+                <label class="gf-form-label query-keyword width-9">ORDER BY time</label>
+                <div class="gf-form-select-wrapper">
+                    <select class="gf-form-input gf-size-auto" ng-model="ctrl.target.orderByTime" ng-options="f.value as f.text for f in ctrl.orderByTime" ng-change="ctrl.refresh()"></select>
+                </div>
+            </div>
+
+            <div class="gf-form max-width-30">
+                <label class="gf-form-label query-keyword width-7">LIMIT</label>
+                <input type="text" class="gf-form-input" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
+            </div>
+
+            <div class="gf-form max-width-30">
+                <label class="gf-form-label query-keyword width-7">SLIMIT</label>
+                <input type="text" class="gf-form-input" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
+            </div>
+            <div class="gf-form gf-form--grow">
+                <div class="gf-form-label gf-form-label--grow"></div>
+            </div>
+        </div>
+
 	</div>
 
 	<div class="gf-form-inline">
 		<div class="gf-form max-width-30">
-			<label class="gf-form-label query-keyword width-7">ALIAS BY</label>
+			<label class="gf-form-label query-keyword width-9">ALIAS BY</label>
 			<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.refresh()">
 		</div>
 		<div class="gf-form">
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index 26f09d26d29..f78ed0727db 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -14,6 +14,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
   queryBuilder: any;
   groupBySegment: any;
   resultFormats: any[];
+  orderByTime: any[];
   policySegment: any;
   tagSegments: any[];
   selectMenu: any;
@@ -32,6 +33,10 @@ export class InfluxQueryCtrl extends QueryCtrl {
       {text: 'Time series', value: 'time_series'},
       {text: 'Table', value: 'table'},
     ];
+    this.orderByTime = [
+      {text: 'Ascending', value: 'ASC'},
+      {text: 'Descending', value: 'DESC'},
+    ];
 
     this.policySegment = uiSegmentSrv.newSegment(this.target.policy);
 

From c3eb9da160dba67ec2f10a8850463c6a2338b297 Mon Sep 17 00:00:00 2001
From: thuck <denisdoria@gmail.com>
Date: Sun, 5 Mar 2017 23:41:16 +0100
Subject: [PATCH 191/301] Finish query builder for LIMIT, SLIMIT and ORDER BY
 time #6065

---
 .../app/plugins/datasource/influxdb/influx_query.ts  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts
index 89cba55773f..a5e9e2ffd6a 100644
--- a/public/app/plugins/datasource/influxdb/influx_query.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query.ts
@@ -250,6 +250,18 @@ export default class InfluxQuery {
       query += ' fill(' + target.fill + ')';
     }
 
+    if (target.orderByTime === 'DESC') {
+      query += ' ORDER BY time DESC';
+    }
+
+    if (target.limit) {
+      query += ' LIMIT ' + target.limit;
+    }
+
+    if (target.slimit) {
+      query += ' SLIMIT ' + target.slimit;
+    }
+
     return query;
   }
 

From e71b13d9fa183f856cf2c0e26d9acb5329d08ca3 Mon Sep 17 00:00:00 2001
From: Denis Doria <denisdoria@gmail.com>
Date: Mon, 6 Mar 2017 07:47:50 +0100
Subject: [PATCH 192/301] Improve regex detection for influxdb measurement
 #7276 (#7734)

---
 public/app/plugins/datasource/influxdb/influx_query.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts
index 065b85cf175..074931b5d23 100644
--- a/public/app/plugins/datasource/influxdb/influx_query.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query.ts
@@ -167,7 +167,7 @@ export default class InfluxQuery {
     var policy = this.target.policy;
     var measurement = this.target.measurement || 'measurement';
 
-    if (!measurement.match('^/.*/')) {
+    if (!measurement.match('^/.*/$')) {
       measurement = '"' + measurement+ '"';
     } else if (interpolate) {
       measurement = this.templateSrv.replace(measurement, this.scopedVars, 'regex');

From 0264fcc66ca3e650ec64de4d86398f322eae5351 Mon Sep 17 00:00:00 2001
From: Denis Doria <denisdoria@gmail.com>
Date: Mon, 6 Mar 2017 07:49:28 +0100
Subject: [PATCH 193/301] Remove unsaved dialog when removing a dashboard #7591
 (#7733)

---
 public/app/features/dashboard/dashnav/dashnav.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index 33bb4411640..faaac986ee7 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -106,6 +106,7 @@ export class DashNavCtrl {
         confirmText: confirmText,
         yesText: 'Delete',
         onConfirm: function() {
+          $scope.dashboardMeta.canSave = false;
           $scope.deleteDashboardConfirmed();
         }
       });

From 6af62abd41c4f2b752772a9b816d4c68b734ef28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 6 Mar 2017 08:26:36 +0100
Subject: [PATCH 194/301] docs(): added router_logging to configuration
 options, closes #7723

---
 docs/sources/installation/configuration.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 4020aa9b900..ba44dd30658 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -135,6 +135,10 @@ Path to the certificate file (if `protocol` is set to `https`).
 
 Path to the certificate key file (if `protocol` is set to `https`).
 
+### router_logging
+
+Set to true for Grafana to log all HTTP requests (not just errors). These are logged as Info level events
+to grafana log.
 <hr />
 
 <hr />
@@ -472,7 +476,7 @@ Mysql Example:
         `expiry`    INT(11) UNSIGNED NOT NULL,
         PRIMARY KEY (`key`)
     ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-    
+
 Postgres Example:
 
     CREATE TABLE session (
@@ -481,7 +485,7 @@ Postgres Example:
         expiry    INTEGER NOT NULL,
         PRIMARY KEY (key)
     );
-    
+
 Postgres valid `sslmode` are `disable`, `require` (default), `verify-ca`, and `verify-full`.
 
 ### cookie_name
@@ -613,7 +617,7 @@ You can choose between (s3, webdav). If left empty Grafana will ignore the uploa
 ## [external_image_storage.s3]
 
 ### bucket_url
-Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g. 
+Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g.
 - http://grafana.s3.amazonaws.com/
 - https://grafana.s3-ap-southeast-2.amazonaws.com/
 - https://grafana.s3-cn-north-1.amazonaws.com.cn

From 31866b5e57cfe39a79a044e6ab1350b6e31cc1bb Mon Sep 17 00:00:00 2001
From: Denis Doria <denisdoria@gmail.com>
Date: Mon, 6 Mar 2017 08:37:49 +0100
Subject: [PATCH 195/301] Allow commas on template variable #7681 (#7732)

This improvement allows to wrap an "expression" when using single or
double quotes. So now you can have time interval with offset for
influxdb.
---
 public/app/features/templating/interval_variable.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/app/features/templating/interval_variable.ts b/public/app/features/templating/interval_variable.ts
index ab1b0e59442..10977596057 100644
--- a/public/app/features/templating/interval_variable.ts
+++ b/public/app/features/templating/interval_variable.ts
@@ -59,8 +59,9 @@ export class IntervalVariable implements Variable {
   }
 
   updateOptions() {
-   // extract options in comma separated string
-    this.options = _.map(this.query.split(/[,]+/), function(text) {
+    // extract options between quotes and/or comma
+    this.options = _.map(this.query.match(/(["'])(.*?)\1|\w+/g), function(text) {
+      text = text.replace(/["']+/g, '');
       return {text: text.trim(), value: text.trim()};
     });
 

From 9f1c6a73f0bb0f88be6c4aa9db7b4120114d30d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 6 Mar 2017 11:51:35 +0100
Subject: [PATCH 196/301] tech: added sql logger to log all sql statements sent
 to sql server

---
 pkg/services/sqlstore/logger.go   | 123 ++++++++++++++++++++++++++++++
 pkg/services/sqlstore/sqlstore.go |   3 +
 2 files changed, 126 insertions(+)
 create mode 100644 pkg/services/sqlstore/logger.go

diff --git a/pkg/services/sqlstore/logger.go b/pkg/services/sqlstore/logger.go
new file mode 100644
index 00000000000..ae1145c21b0
--- /dev/null
+++ b/pkg/services/sqlstore/logger.go
@@ -0,0 +1,123 @@
+package sqlstore
+
+import (
+	"fmt"
+
+	glog "github.com/grafana/grafana/pkg/log"
+
+	"github.com/go-xorm/core"
+)
+
+type XormLogger struct {
+	grafanaLog glog.Logger
+	level      glog.Lvl
+	showSQL    bool
+}
+
+func NewXormLogger(level glog.Lvl, grafanaLog glog.Logger) *XormLogger {
+	return &XormLogger{
+		grafanaLog: grafanaLog,
+		level:      level,
+		showSQL:    true,
+	}
+}
+
+// Error implement core.ILogger
+func (s *XormLogger) Err(v ...interface{}) error {
+	if s.level <= glog.LvlError {
+		s.grafanaLog.Error(fmt.Sprint(v...))
+	}
+	return nil
+}
+
+// Errorf implement core.ILogger
+func (s *XormLogger) Errf(format string, v ...interface{}) error {
+	if s.level <= glog.LvlError {
+		s.grafanaLog.Error(fmt.Sprintf(format, v...))
+	}
+	return nil
+}
+
+// Debug implement core.ILogger
+func (s *XormLogger) Debug(v ...interface{}) error {
+	if s.level <= glog.LvlDebug {
+		s.grafanaLog.Debug(fmt.Sprint(v...))
+	}
+	return nil
+}
+
+// Debugf implement core.ILogger
+func (s *XormLogger) Debugf(format string, v ...interface{}) error {
+	if s.level <= glog.LvlDebug {
+		s.grafanaLog.Debug(fmt.Sprintf(format, v...))
+	}
+	return nil
+}
+
+// Info implement core.ILogger
+func (s *XormLogger) Info(v ...interface{}) error {
+	if s.level <= glog.LvlInfo {
+		s.grafanaLog.Info(fmt.Sprint(v...))
+	}
+	return nil
+}
+
+// Infof implement core.ILogger
+func (s *XormLogger) Infof(format string, v ...interface{}) error {
+	if s.level <= glog.LvlInfo {
+		s.grafanaLog.Info(fmt.Sprintf(format, v...))
+	}
+	return nil
+}
+
+// Warn implement core.ILogger
+func (s *XormLogger) Warning(v ...interface{}) error {
+	if s.level <= glog.LvlWarn {
+		s.grafanaLog.Warn(fmt.Sprint(v...))
+	}
+	return nil
+}
+
+// Warnf implement core.ILogger
+func (s *XormLogger) Warningf(format string, v ...interface{}) error {
+	if s.level <= glog.LvlWarn {
+		s.grafanaLog.Warn(fmt.Sprintf(format, v...))
+	}
+	return nil
+}
+
+// Level implement core.ILogger
+func (s *XormLogger) Level() core.LogLevel {
+	switch s.level {
+	case glog.LvlError:
+		return core.LOG_ERR
+	case glog.LvlWarn:
+		return core.LOG_WARNING
+	case glog.LvlInfo:
+		return core.LOG_INFO
+	case glog.LvlDebug:
+		return core.LOG_DEBUG
+	default:
+		return core.LOG_ERR
+	}
+}
+
+// SetLevel implement core.ILogger
+func (s *XormLogger) SetLevel(l core.LogLevel) error {
+	return nil
+}
+
+// ShowSQL implement core.ILogger
+func (s *XormLogger) ShowSQL(show ...bool) {
+	s.grafanaLog.Error("ShowSQL", "show", "show")
+	if len(show) == 0 {
+		s.showSQL = true
+		return
+	}
+	s.showSQL = show[0]
+}
+
+// IsShowSQL implement core.ILogger
+func (s *XormLogger) IsShowSQL() bool {
+	return s.showSQL
+}
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 0d16d57bcde..ef22dd9b6c6 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -160,6 +160,9 @@ func getEngine() (*xorm.Engine, error) {
 		engine.SetMaxConns(DbCfg.MaxConn)
 		engine.SetMaxOpenConns(DbCfg.MaxOpenConn)
 		engine.SetMaxIdleConns(DbCfg.MaxIdleConn)
+		// engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm")))
+		// engine.ShowSQL = true
+		// engine.ShowInfo = true
 	}
 	return engine, nil
 }

From c3202d3f99a264e9a7f74a060104b62c866f481d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 6 Mar 2017 12:23:28 +0100
Subject: [PATCH 197/301] sessions: start session gc at startup but only after
 between 10 - 180 seconds

---
 pkg/middleware/session.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go
index 0700612ecc2..dad2ad20efc 100644
--- a/pkg/middleware/session.go
+++ b/pkg/middleware/session.go
@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"math/rand"
 	"time"
 
 	"github.com/go-macaron/session"
@@ -8,6 +9,7 @@ import (
 	_ "github.com/go-macaron/session/mysql"
 	_ "github.com/go-macaron/session/postgres"
 	_ "github.com/go-macaron/session/redis"
+	"github.com/grafana/grafana/pkg/log"
 	"gopkg.in/macaron.v1"
 )
 
@@ -22,10 +24,12 @@ var sessionManager *session.Manager
 var sessionOptions *session.Options
 var startSessionGC func()
 var getSessionCount func() int
+var sessionLogger = log.New("session")
 
 func init() {
 	startSessionGC = func() {
 		sessionManager.GC()
+		sessionLogger.Debug("Session GC")
 		time.AfterFunc(time.Duration(sessionOptions.Gclifetime)*time.Second, startSessionGC)
 	}
 	getSessionCount = func() int {
@@ -67,7 +71,9 @@ func Sessioner(options *session.Options) macaron.Handler {
 		panic(err)
 	}
 
-	go startSessionGC()
+	// start GC threads after some random seconds
+	rndSeconds := 10 + rand.Int63n(180)
+	time.AfterFunc(time.Duration(rndSeconds)*time.Second, startSessionGC)
 
 	return func(ctx *Context) {
 		ctx.Next()

From 6ab90425c4bfd1f9041fa28541835e9af72f92fe Mon Sep 17 00:00:00 2001
From: Pranay Kanwar <pranay.kanwar@gmail.com>
Date: Mon, 6 Mar 2017 20:49:37 +0530
Subject: [PATCH 198/301] Pass dropcounter rate option if no max counter and no
 reset value or reset value as 0 is specified (#7743)

---
 pkg/tsdb/opentsdb/opentsdb.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/tsdb/opentsdb/opentsdb.go b/pkg/tsdb/opentsdb/opentsdb.go
index 684f48bfc59..c0ba6603b20 100644
--- a/pkg/tsdb/opentsdb/opentsdb.go
+++ b/pkg/tsdb/opentsdb/opentsdb.go
@@ -190,6 +190,10 @@ func (e *OpenTsdbExecutor) buildMetric(query *tsdb.Query) map[string]interface{}
 			rateOptions["resetValue"] = resetValue.MustFloat64()
 		}
 
+		if !counterMaxCheck && (!resetValueCheck || resetValue.MustFloat64() == 0) {
+			rateOptions["dropcounter"] = true
+		}
+
 		metric["rateOptions"] = rateOptions
 	}
 

From b387a8759e0c88367b8c7a75115f26b6267ffbc3 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Tue, 7 Mar 2017 05:08:16 +0900
Subject: [PATCH 199/301] use session.NewSession() (#7745)

---
 pkg/api/cloudwatch/cloudwatch.go         | 58 ++++++++++++++++++++----
 pkg/api/cloudwatch/metrics.go            |  7 ++-
 pkg/components/imguploader/s3uploader.go | 11 ++++-
 3 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/pkg/api/cloudwatch/cloudwatch.go b/pkg/api/cloudwatch/cloudwatch.go
index 1b796be874e..1cf4b671e2d 100644
--- a/pkg/api/cloudwatch/cloudwatch.go
+++ b/pkg/api/cloudwatch/cloudwatch.go
@@ -114,7 +114,10 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 			DurationSeconds: aws.Int64(900),
 		}
 
-		stsSess := session.New()
+		stsSess, err := session.NewSession()
+		if err != nil {
+			return nil, err
+		}
 		stsCreds := credentials.NewChainCredentials(
 			[]credentials.Provider{
 				&credentials.EnvProvider{},
@@ -126,7 +129,11 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 			Credentials: stsCreds,
 		}
 
-		svc := sts.New(session.New(stsConfig), stsConfig)
+		sess, err := session.NewSession(stsConfig)
+		if err != nil {
+			return nil, err
+		}
+		svc := sts.New(sess, stsConfig)
 		resp, err := svc.AssumeRole(params)
 		if err != nil {
 			return nil, err
@@ -139,7 +146,10 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 		}
 	}
 
-	sess := session.New()
+	sess, err := session.NewSession()
+	if err != nil {
+		return nil, err
+	}
 	creds := credentials.NewChainCredentials(
 		[]credentials.Provider{
 			&credentials.StaticProvider{Value: credentials.Value{
@@ -185,7 +195,12 @@ func handleGetMetricStatistics(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -232,7 +247,12 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -273,7 +293,12 @@ func handleDescribeAlarms(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -316,7 +341,12 @@ func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -360,7 +390,12 @@ func handleDescribeAlarmHistory(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -396,7 +431,12 @@ func handleDescribeInstances(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := ec2.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := ec2.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
index 6b953bdf0fc..b41bb20d6c8 100644
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -258,8 +258,11 @@ func getAllMetrics(cwData *datasourceInfo) (cloudwatch.ListMetricsOutput, error)
 		Region:      aws.String(cwData.Region),
 		Credentials: creds,
 	}
-
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		return cloudwatch.ListMetricsOutput{}, err
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	params := &cloudwatch.ListMetricsInput{
 		Namespace: aws.String(cwData.Namespace),
diff --git a/pkg/components/imguploader/s3uploader.go b/pkg/components/imguploader/s3uploader.go
index 5f476b9e366..4f8632f965c 100644
--- a/pkg/components/imguploader/s3uploader.go
+++ b/pkg/components/imguploader/s3uploader.go
@@ -35,7 +35,10 @@ func NewS3Uploader(region, bucket, acl, accessKey, secretKey string) *S3Uploader
 }
 
 func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
-	sess := session.New()
+	sess, err := session.NewSession()
+	if err != nil {
+		return "", err
+	}
 	creds := credentials.NewChainCredentials(
 		[]credentials.Provider{
 			&credentials.StaticProvider{Value: credentials.Value{
@@ -58,7 +61,11 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
 		return "", err
 	}
 
-	svc := s3.New(session.New(cfg), cfg)
+	sess, err = session.NewSession(cfg)
+	if err != nil {
+		return "", err
+	}
+	svc := s3.New(sess, cfg)
 	params := &s3.PutObjectInput{
 		Bucket:      aws.String(u.bucket),
 		Key:         aws.String(key),

From 125ee865b6df6558b2419681b1fbdde21c5abf9c Mon Sep 17 00:00:00 2001
From: Wouter Smit <wouter.smit@gmail.com>
Date: Mon, 6 Mar 2017 21:08:45 +0100
Subject: [PATCH 200/301] Spelling mistake (#7739)

---
 pkg/services/alerting/notifiers/email.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go
index 4058d3860b5..dcf71f0f99e 100644
--- a/pkg/services/alerting/notifiers/email.go
+++ b/pkg/services/alerting/notifiers/email.go
@@ -16,7 +16,7 @@ func init() {
 	alerting.RegisterNotifier(&alerting.NotifierPlugin{
 		Type:        "email",
 		Name:        "Email",
-		Description: "Sends notifications using Grafana server configured STMP settings",
+		Description: "Sends notifications using Grafana server configured SMTP settings",
 		Factory:     NewEmailNotifier,
 		OptionsTemplate: `
       <h3 class="page-heading">Email addresses</h3>

From 3735a1ace7bd24b527571d927c889567bfce0649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patric=20Kanngie=C3=9Fer?= <mail@patric-ka.de>
Date: Tue, 7 Mar 2017 08:19:34 +0100
Subject: [PATCH 201/301] remember scroll position
 (https://github.com/grafana/grafana/issues/7680) (#7728)

---
 public/app/plugins/panel/graph/legend.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js
index fd5abfb2db2..2cdb1821793 100644
--- a/public/app/plugins/panel/graph/legend.js
+++ b/public/app/plugins/panel/graph/legend.js
@@ -65,7 +65,9 @@ function (angular, _, $) {
           var el = $(e.currentTarget);
           var index = getSeriesIndexForElement(el);
           var seriesInfo = seriesList[index];
+          var scrollPosition = $($container.children('tbody')).scrollTop();
           ctrl.toggleSeries(seriesInfo, e);
+          $($container.children('tbody')).scrollTop(scrollPosition);
         }
 
         function sortLegend(e) {

From a24ac012c4acc942a65baa8fb700753893b62f29 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Tue, 7 Mar 2017 16:35:29 +0900
Subject: [PATCH 202/301] support full resolution for $interval variable
 (#7696)

---
 public/app/features/templating/partials/editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 5f844931b4c..2d514060cb7 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -124,7 +124,7 @@
               Step count <tip>How many times should the current time range be divided to calculate the value</tip>
             </span>
             <div class="gf-form-select-wrapper max-width-10" ng-show="current.auto">
-              <select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
+              <select class="gf-form-input" ng-model="current.auto_count" ng-options="f for f in [1,2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
             </div>
           </div>
           <div class="gf-form">

From a37a2259b3a0442fcc7250eb0cdca28a61c41920 Mon Sep 17 00:00:00 2001
From: Joseph Pintozzi <joseph@pintozzi.com>
Date: Tue, 7 Mar 2017 00:36:33 -0700
Subject: [PATCH 203/301] Allowing "Unique Count"s of any data type (#7704)

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

diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js
index 9971c084882..c0c4ffc08d4 100644
--- a/public/app/plugins/datasource/elasticsearch/metric_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js
@@ -162,6 +162,9 @@ function (angular, _, queryDef) {
     };
 
     $scope.getFieldsInternal = function() {
+      if ($scope.agg.type === 'cardinality') {
+        return $scope.getFields();
+      }
       return $scope.getFields({$fieldType: 'number'});
     };
 

From 70c2586c805dd073f355fd0e58b276db6d17643a Mon Sep 17 00:00:00 2001
From: Ross Lodge <rlodge@concentricsky.com>
Date: Mon, 6 Mar 2017 23:39:19 -0800
Subject: [PATCH 204/301] Use other variable dependencies in regex filter for
 datasource variable (#7547)

---
 public/app/features/templating/datasource_variable.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/app/features/templating/datasource_variable.ts b/public/app/features/templating/datasource_variable.ts
index bfd4d965029..41f2262ab4a 100644
--- a/public/app/features/templating/datasource_variable.ts
+++ b/public/app/features/templating/datasource_variable.ts
@@ -2,7 +2,7 @@
 
 import _ from 'lodash';
 import kbn from 'app/core/utils/kbn';
-import {Variable, assignModelProperties, variableTypes} from './variable';
+import {Variable, containsVariable, assignModelProperties, variableTypes} from './variable';
 import {VariableSrv} from './variable_srv';
 
 export class DatasourceVariable implements Variable {
@@ -25,7 +25,7 @@ export class DatasourceVariable implements Variable {
   };
 
   /** @ngInject **/
-  constructor(private model, private datasourceSrv, private variableSrv) {
+  constructor(private model, private datasourceSrv, private variableSrv, private templateSrv) {
     assignModelProperties(this, model, this.defaults);
     this.refresh = 1;
   }
@@ -48,7 +48,8 @@ export class DatasourceVariable implements Variable {
     var regex;
 
     if (this.regex) {
-      regex = kbn.stringToJsRegex(this.regex);
+      regex = this.templateSrv.replace(this.regex, null, 'regex');
+      regex = kbn.stringToJsRegex(regex);
     }
 
     for (var i = 0; i < sources.length; i++) {
@@ -74,6 +75,9 @@ export class DatasourceVariable implements Variable {
   }
 
   dependsOn(variable) {
+    if (this.regex) {
+      return containsVariable(this.regex, variable.name);
+    }
     return false;
   }
 

From 8e3f22d307cdfcf721bb2b249a76bcf1b854fc2f Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 7 Mar 2017 11:23:57 +0100
Subject: [PATCH 205/301] docs: adds note about closing #7695

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46973702d6e..b078bb892ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Minor Enchancements
 * **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)
+* **Panels**: Support dm3 unit [#7695](https://github.com/grafana/grafana/issues/7695) thx [@mitjaziv](https://github.com/mitjaziv)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements

From 9efb6e76e9f12dee278578cd12e349490373decc Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 7 Mar 2017 16:03:54 +0100
Subject: [PATCH 206/301] users: adds search and pagination (#7753)

ref #7469. Follow up change that adds proper paging with 50 results
per page as well as a search box to search by name, login or email.
---
 pkg/api/user.go                               |  4 +-
 pkg/services/sqlstore/user.go                 | 13 ++++-
 pkg/services/sqlstore/user_test.go            | 50 ++++++++++++++++++-
 .../features/admin/admin_list_users_ctrl.ts   |  6 ++-
 public/app/features/admin/partials/users.html |  6 +++
 5 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/pkg/api/user.go b/pkg/api/user.go
index 8dd6daab4bc..39e7fce1462 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -239,7 +239,9 @@ func searchUser(c *middleware.Context) (*m.SearchUsersQuery, error) {
 		page = 1
 	}
 
-	query := &m.SearchUsersQuery{Query: "", Page: page, Limit: perPage}
+	searchQuery := c.Query("query")
+
+	query := &m.SearchUsersQuery{Query: searchQuery, Page: page, Limit: perPage}
 	if err := bus.Dispatch(query); err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 2e3c5c673d6..9a44d6f194e 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -363,8 +363,12 @@ func SearchUsers(query *m.SearchUsersQuery) error {
 	query.Result = m.SearchUserQueryResult{
 		Users: make([]*m.UserSearchHitDTO, 0),
 	}
+	queryWithWildcards := "%" + query.Query + "%"
+
 	sess := x.Table("user")
-	sess.Where("email LIKE ?", query.Query+"%")
+	if query.Query != "" {
+		sess.Where("email LIKE ? OR name LIKE ? OR login like ?", queryWithWildcards, queryWithWildcards, queryWithWildcards)
+	}
 	offset := query.Limit * (query.Page - 1)
 	sess.Limit(query.Limit, offset)
 	sess.Cols("id", "email", "name", "login", "is_admin")
@@ -373,7 +377,12 @@ func SearchUsers(query *m.SearchUsersQuery) error {
 	}
 
 	user := m.User{}
-	count, err := x.Count(&user)
+
+	countSess := x.Table("user")
+	if query.Query != "" {
+		countSess.Where("email LIKE ? OR name LIKE ? OR login like ?", queryWithWildcards, queryWithWildcards, queryWithWildcards)
+	}
+	count, err := countSess.Count(&user)
 	query.Result.TotalCount = count
 	return err
 }
diff --git a/pkg/services/sqlstore/user_test.go b/pkg/services/sqlstore/user_test.go
index 53a50f9631c..decb4682552 100644
--- a/pkg/services/sqlstore/user_test.go
+++ b/pkg/services/sqlstore/user_test.go
@@ -19,7 +19,7 @@ func TestUserDataAccess(t *testing.T) {
 			err = CreateUser(&models.CreateUserCommand{
 				Email: fmt.Sprint("user", i, "@test.com"),
 				Name:  fmt.Sprint("user", i),
-				Login: fmt.Sprint("user", i),
+				Login: fmt.Sprint("loginuser", i),
 			})
 			So(err, ShouldBeNil)
 		}
@@ -41,5 +41,53 @@ func TestUserDataAccess(t *testing.T) {
 			So(len(query.Result.Users), ShouldEqual, 2)
 			So(query.Result.TotalCount, ShouldEqual, 5)
 		})
+
+		Convey("Can return list of users matching query on user name", func() {
+			query := models.SearchUsersQuery{Query: "use", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 3)
+			So(query.Result.TotalCount, ShouldEqual, 5)
+
+			query = models.SearchUsersQuery{Query: "ser1", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 1)
+			So(query.Result.TotalCount, ShouldEqual, 1)
+
+			query = models.SearchUsersQuery{Query: "USER1", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 1)
+			So(query.Result.TotalCount, ShouldEqual, 1)
+
+			query = models.SearchUsersQuery{Query: "idontexist", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 0)
+			So(query.Result.TotalCount, ShouldEqual, 0)
+		})
+
+		Convey("Can return list of users matching query on email", func() {
+			query := models.SearchUsersQuery{Query: "ser1@test.com", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 1)
+			So(query.Result.TotalCount, ShouldEqual, 1)
+		})
+
+		Convey("Can return list of users matching query on login name", func() {
+			query := models.SearchUsersQuery{Query: "loginuser1", Page: 1, Limit: 3}
+			err = SearchUsers(&query)
+
+			So(err, ShouldBeNil)
+			So(len(query.Result.Users), ShouldEqual, 1)
+			So(query.Result.TotalCount, ShouldEqual, 1)
+		})
 	})
 }
diff --git a/public/app/features/admin/admin_list_users_ctrl.ts b/public/app/features/admin/admin_list_users_ctrl.ts
index 1347457bc06..e2ed12cba60 100644
--- a/public/app/features/admin/admin_list_users_ctrl.ts
+++ b/public/app/features/admin/admin_list_users_ctrl.ts
@@ -3,18 +3,20 @@
 export default class AdminListUsersCtrl {
   users: any;
   pages = [];
-  perPage = 1000;
+  perPage = 50;
   page = 1;
   totalPages: number;
   showPaging = false;
+  query: any;
 
   /** @ngInject */
   constructor(private $scope, private backendSrv) {
+    this.query = '';
     this.getUsers();
   }
 
   getUsers() {
-    this.backendSrv.get(`/api/users/search?perpage=${this.perPage}&page=${this.page}`).then((result) => {
+    this.backendSrv.get(`/api/users/search?perpage=${this.perPage}&page=${this.page}&query=${this.query}`).then((result) => {
       this.users = result.users;
       this.page = result.page;
       this.perPage = result.perPage;
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 57714380c67..18ffdb4eaeb 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -14,6 +14,12 @@
       Add new user
     </a>
   </div>
+  <div class="search-field-wrapper pull-right width-18">
+    <span style="position: relative;">
+      <input  type="text" placeholder="Find user by name/login/email" tabindex="1" give-focus="true"
+      ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.getUsers()" />
+    </span>
+  </div>
   <div class="admin-list-table">
     <table class="filter-table form-inline">
       <thead>

From 555acacd6d7b44093b4d756df9a50d129a33b690 Mon Sep 17 00:00:00 2001
From: thuck <denisdoria@gmail.com>
Date: Tue, 7 Mar 2017 23:29:16 +0100
Subject: [PATCH 207/301] Validate query to avoid self-reference of variable
 #7614

---
 public/app/features/templating/editor_ctrl.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index 7bd745bed53..002afa4264b 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -77,6 +77,11 @@ export class VariableEditorCtrl {
         return false;
       }
 
+      if ($scope.current.type === 'query' && $scope.current.query.match(new RegExp('\\$' + $scope.current.name))) {
+        $scope.appEvent('alert-warning', ['Validation', 'Query contains variable self-reference']);
+        return false;
+      }
+
       return true;
     };
 

From 1cf569ac8e2589fed2c5d504c46c5c740da62cff Mon Sep 17 00:00:00 2001
From: thuck <denisdoria@gmail.com>
Date: Wed, 8 Mar 2017 08:25:32 +0100
Subject: [PATCH 208/301] Fix tabs vs space

---
 .../influxdb/partials/query.editor.html       | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 509a0d473eb..69c1c7867f6 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -72,28 +72,27 @@
 			</div>
 		</div>
 
-        <div class="gf-form-inline">
-            <div class="gf-form">
-                <label class="gf-form-label query-keyword width-9">ORDER BY time</label>
-                <div class="gf-form-select-wrapper">
-                    <select class="gf-form-input gf-size-auto" ng-model="ctrl.target.orderByTime" ng-options="f.value as f.text for f in ctrl.orderByTime" ng-change="ctrl.refresh()"></select>
-                </div>
-            </div>
-
-            <div class="gf-form max-width-30">
-                <label class="gf-form-label query-keyword width-7">LIMIT</label>
-                <input type="text" class="gf-form-input" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
-            </div>
-
-            <div class="gf-form max-width-30">
-                <label class="gf-form-label query-keyword width-7">SLIMIT</label>
-                <input type="text" class="gf-form-input" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
-            </div>
-            <div class="gf-form gf-form--grow">
-                <div class="gf-form-label gf-form-label--grow"></div>
-            </div>
-        </div>
-
+		<div class="gf-form-inline">
+			<div class="gf-form">
+				<label class="gf-form-label query-keyword width-9">ORDER BY time</label>
+				<div class="gf-form-select-wrapper">
+					<select class="gf-form-input gf-size-auto" ng-model="ctrl.target.orderByTime" ng-options="f.value as f.text for f in ctrl.orderByTime" ng-change="ctrl.refresh()"></select>
+				</div>
+			</div>
+		
+			<div class="gf-form max-width-30">
+				<label class="gf-form-label query-keyword width-7">LIMIT</label>
+				<input type="text" class="gf-form-input" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
+			</div>
+		
+			<div class="gf-form max-width-30">
+				<label class="gf-form-label query-keyword width-7">SLIMIT</label>
+				<input type="text" class="gf-form-input" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
+			</div>
+			<div class="gf-form gf-form--grow">
+				<div class="gf-form-label gf-form-label--grow"></div>
+			</div>
+		</div>
 	</div>
 
 	<div class="gf-form-inline">

From dc6d55a59f3383735a59d23414601bf7d10e7851 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Mar 2017 11:16:14 +0100
Subject: [PATCH 209/301] docs: changelog for 4.2.0

Adds notes for:
- ref #7694
- ref  #7681
- ref #7736
- ref #7743
- ref #7696
- ref #3536
- ref #6365
- ref #7591
- ref #7276
- ref #7723
- ref #7739
- ref #7680
---
 CHANGELOG.md | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b078bb892ce..f3a7af35573 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,28 @@
 # 4.3.0 (unreleased)
 
 ## Minor Enchancements
-* **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)
-* **Panels**: Support dm3 unit [#7695](https://github.com/grafana/grafana/issues/7695) thx [@mitjaziv](https://github.com/mitjaziv)
+* **Admin**: Global User List: add search and pagination [#7469](https://github.com/grafana/grafana/issues/7469)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements
 * **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)
+* **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)
+* **Panels**: Support dm3 unit [#7695](https://github.com/grafana/grafana/issues/7695) thx [@mitjaziv](https://github.com/mitjaziv)
+* **Docs**: Added some details about Sessions in Postgres [#7694](https://github.com/grafana/grafana/pull/7694) thx [@rickard-von-essen](https://github.com/rickard-von-essen)
+* **Influxdb**: Allow commas in template variables [#7681](https://github.com/grafana/grafana/issues/7681) thx [@thuck](https://github.com/thuck)
+* **Cloudwatch**: stop using deprecated session.New() [#7736](https://github.com/grafana/grafana/issues/7736) thx [@mtanda](https://github.com/mtanda)
+* **OpenTSDB**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
+* **Templating**: support full resolution for $interval variable [#7696](https://github.com/grafana/grafana/pull/7696) thx [@mtanda](https://github.com/mtanda)
+* **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
+* **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge) 
 
 ## Bugfixes
 * **Webhook**: Use proxy settings from environment variables [#7710](https://github.com/grafana/grafana/issues/7710)
+* **Panels**: Deleting a dashboard with unsaved changes raises an error message [#7591](https://github.com/grafana/grafana/issues/7591) thx [@thuck](https://github.com/thuck)
+* **Influxdb**: Query builder detects regex to easily for measurement [#7276](https://github.com/grafana/grafana/issues/7276) thx [@thuck](https://github.com/thuck)
+* **Docs**: router_logging not documented [#7723](https://github.com/grafana/grafana/issues/7723)
+* **Alerting**: Spelling mistake [#7739](https://github.com/grafana/grafana/pull/7739) thx [@woutersmit](https://github.com/woutersmit)
+* **Alerting**: Graph legend scrolls to top when an alias is toggled/clicked [#7680](https://github.com/grafana/grafana/issues/7680) thx [@p4ddy1](https://github.com/p4ddy1)
 
 # 4.2.0-beta1 (2017-02-27)
 

From 5037dae9597ad65a20d0689564464e115f5b3e29 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Mar 2017 17:09:08 +0100
Subject: [PATCH 210/301] docs: move #7469 to v4.2.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3a7af35573..ec6f6390cc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 # 4.3.0 (unreleased)
 
 ## Minor Enchancements
-* **Admin**: Global User List: add search and pagination [#7469](https://github.com/grafana/grafana/issues/7469)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements
@@ -14,7 +13,8 @@
 * **OpenTSDB**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
 * **Templating**: support full resolution for $interval variable [#7696](https://github.com/grafana/grafana/pull/7696) thx [@mtanda](https://github.com/mtanda)
 * **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
-* **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge) 
+* **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge)
+* **Admin**: Global User List: add search and pagination [#7469](https://github.com/grafana/grafana/issues/7469)
 
 ## Bugfixes
 * **Webhook**: Use proxy settings from environment variables [#7710](https://github.com/grafana/grafana/issues/7710)

From 4f06202e9a15a66eda9721c929f23d8f799eabb2 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Mar 2017 17:10:51 +0100
Subject: [PATCH 211/301] build: bumped version to 4.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc3970bfe69..d38de899bf5 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "4.2.0-pre1",
+  "version": "4.3.0-pre1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

From bd348a47c74a190b1873228e386e4ed251c8f720 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 8 Mar 2017 17:52:33 +0100
Subject: [PATCH 212/301] panel: update to #7452 panel loading on scroll

Moves the logic up a level to the panel_ctrl. This cleans up the code
and makes the lazy loading available for all panels.

Removes the config option and making this default behavior. We can
add back the config option if we get feedback that it is needed during
the beta phase of the v4.3.0 release.

Unbind the scroll handler on panel destroy to avoid memory leaks.

Fix for png rendering, it did not match all forms of dashboard-solo.
e.g. /render/dashboard-solo/db...

Fix for when taking a snapshot. All the panels get refreshed then
even the panels that are not visible.

Closes #5216.
---
 public/app/features/dashboard/model.ts        |  2 --
 .../features/dashboard/partials/settings.html |  6 ----
 .../app/features/panel/metrics_panel_ctrl.ts  | 14 ---------
 public/app/features/panel/panel_ctrl.ts       | 13 +++++++++
 public/app/features/panel/panel_directive.ts  | 29 ++++++++++---------
 5 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/public/app/features/dashboard/model.ts b/public/app/features/dashboard/model.ts
index 959b5ff2116..e31a6c1afd0 100644
--- a/public/app/features/dashboard/model.ts
+++ b/public/app/features/dashboard/model.ts
@@ -36,7 +36,6 @@ export class DashboardModel {
   meta: any;
   events: any;
   editMode: boolean;
-  loadOnScroll: boolean;
 
   constructor(data, meta?) {
     if (!data) {
@@ -65,7 +64,6 @@ export class DashboardModel {
     this.version = data.version || 0;
     this.links = data.links || [];
     this.gnetId = data.gnetId || null;
-    this.loadOnScroll = data.loadOnScroll || false;
 
     this.rows = [];
     if (data.rows) {
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 7475fceb2d8..b8d8303a51b 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -61,12 +61,6 @@
                         checked="dashboard.hideControls"
                         label-class="width-11">
         </gf-form-switch>
-        <gf-form-switch class="gf-form"
-                        label="Load on scroll"
-                        tooltip="Load panels as they become visible"
-                        checked="dashboard.loadOnScroll"
-                        label-class="width-11">
-        </gf-form-switch>
       </div>
     </div>
 
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index d9670291481..7ed360aab1a 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -13,7 +13,6 @@ import {Subject} from 'vendor/npm/rxjs/Subject';
 
 class MetricsPanelCtrl extends PanelCtrl {
   scope: any;
-  needsRefresh: boolean;
   loading: boolean;
   datasource: any;
   datasourceName: any;
@@ -43,7 +42,6 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.timeSrv = $injector.get('timeSrv');
     this.templateSrv = $injector.get('templateSrv');
     this.scope = $scope;
-    this.needsRefresh = false;
 
     if (!this.panel.targets) {
       this.panel.targets = [{}];
@@ -54,10 +52,6 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.events.on('panel-teardown', this.onPanelTearDown.bind(this));
   }
 
-  private isRenderGraph () {
-    return window.location.href.indexOf("/dashboard-solo/") === 0;
-  }
-
   private onPanelTearDown() {
     if (this.dataSubscription) {
       this.dataSubscription.unsubscribe();
@@ -74,14 +68,6 @@ class MetricsPanelCtrl extends PanelCtrl {
     // ignore fetching data if another panel is in fullscreen
     if (this.otherPanelInFullscreenMode()) { return; }
 
-    if (this.scope.ctrl.dashboard.loadOnScroll) {
-      if (!this.scope.$$childHead || (!this.scope.$$childHead.isVisible() && !this.isRenderGraph())) {
-        this.scope.$$childHead.needsRefresh = true;
-        return;
-      }
-      this.scope.$$childHead.needsRefresh = false;
-    }
-
     // if we have snapshot data use that
     if (this.panel.snapshotData) {
       this.updateTimeRange();
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 83c79f4123b..0c80d7a88e3 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -35,6 +35,8 @@ export class PanelCtrl {
   containerHeight: any;
   events: Emitter;
   timing: any;
+  skippedLastRefresh: boolean;
+  isPanelVisible: any;
 
   constructor($scope, $injector) {
     this.$injector = $injector;
@@ -74,7 +76,18 @@ export class PanelCtrl {
     profiler.renderingCompleted(this.panel.id, this.timing);
   }
 
+  private isRenderingPng () {
+    return window.location.href.indexOf("/dashboard-solo/db") >= 0;
+  }
+
   refresh() {
+    if (!this.isPanelVisible() && !this.isRenderingPng() && !this.dashboard.snapshot) {
+      this.skippedLastRefresh = true;
+      return;
+    }
+
+    this.skippedLastRefresh = false;
+
     this.events.emit('refresh', null);
   }
 
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 3aa195e706c..6f3987d872f 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -57,7 +57,7 @@ var panelTemplate = `
   </div>
 `;
 
-module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
+module.directive('grafanaPanel', function($rootScope, $document) {
   return {
     restrict: 'E',
     template: panelTemplate,
@@ -175,27 +175,28 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
       elem.on('mouseenter', mouseEnter);
       elem.on('mouseleave', mouseLeave);
 
+      ctrl.isPanelVisible = function () {
+        var position = panelContainer[0].getBoundingClientRect();
+        return (0 < position.top) && (position.top < window.innerHeight);
+      };
+
+      const refreshOnScroll = _.debounce(function () {
+        if (ctrl.skippedLastRefresh) {
+          ctrl.refresh();
+        }
+      }, 250);
+
+      $document.on('scroll', refreshOnScroll);
+
       scope.$on('$destroy', function() {
         elem.off();
         cornerInfoElem.off();
+        $document.off('scroll', refreshOnScroll);
 
         if (infoDrop) {
           infoDrop.destroy();
         }
       });
-
-      scope.needsRefresh = false;
-
-      scope.isVisible = function () {
-        var position = panelContainer[0].getBoundingClientRect();
-        return (0 < position.top) && (position.top < window.innerHeight);
-      };
-
-      $document.bind('scroll', _.debounce(function () {
-        if (scope.ctrl.dashboard.loadOnScroll && scope.needsRefresh) {
-          scope.ctrl.refresh();
-        }
-      }, 250));
     }
   };
 });

From b8a82827b999d220f80b0060fc43302c54a81f98 Mon Sep 17 00:00:00 2001
From: thuck <denisdoria@gmail.com>
Date: Wed, 8 Mar 2017 20:22:01 +0100
Subject: [PATCH 213/301] Fix ORDER BY to look like GROUP BY

---
 .../plugins/datasource/influxdb/partials/query.editor.html   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 69c1c7867f6..c8848d6f43b 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -74,7 +74,8 @@
 
 		<div class="gf-form-inline">
 			<div class="gf-form">
-				<label class="gf-form-label query-keyword width-9">ORDER BY time</label>
+				<label class="gf-form-label query-keyword width-7">ORDER BY</label>
+				<label class="gf-form-label query-part">time</label>
 				<div class="gf-form-select-wrapper">
 					<select class="gf-form-input gf-size-auto" ng-model="ctrl.target.orderByTime" ng-options="f.value as f.text for f in ctrl.orderByTime" ng-change="ctrl.refresh()"></select>
 				</div>
@@ -97,7 +98,7 @@
 
 	<div class="gf-form-inline">
 		<div class="gf-form max-width-30">
-			<label class="gf-form-label query-keyword width-9">ALIAS BY</label>
+			<label class="gf-form-label query-keyword width-7">ALIAS BY</label>
 			<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.refresh()">
 		</div>
 		<div class="gf-form">

From 04d90d7139c5f46c10238227c3e9aae8055f3d8d Mon Sep 17 00:00:00 2001
From: hagen1778 <hagen1778@gmail.com>
Date: Wed, 8 Mar 2017 21:30:20 +0200
Subject: [PATCH 214/301] Make Prometheus query field a textarea #7663

---
 .../prometheus/partials/query.editor.html       | 17 ++++++++++-------
 .../plugins/datasource/prometheus/query_ctrl.ts |  4 ++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/partials/query.editor.html b/public/app/plugins/datasource/prometheus/partials/query.editor.html
index 37c27ace58a..1840f74bd74 100644
--- a/public/app/plugins/datasource/prometheus/partials/query.editor.html
+++ b/public/app/plugins/datasource/prometheus/partials/query.editor.html
@@ -1,12 +1,7 @@
-<query-editor-row query-ctrl="ctrl" can-collapse="false">
+<query-editor-row query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="true">
 	<div class="gf-form-inline">
 		<div class="gf-form gf-form--grow">
-			<label class="gf-form-label width-8">Query</label>
-			<input type="text" class="gf-form-input" ng-model="ctrl.target.expr" spellcheck='false' placeholder="query expression" data-min-length=0 data-items=100 ng-model-onblur ng-change="ctrl.refreshMetricData()">
-		</div>
-		<div class="gf-form max-width-22">
-			<label class="gf-form-label">Metric lookup</label>
-			<input type="text" class="gf-form-input" ng-model="ctrl.target.metric" spellcheck='false' bs-typeahead="ctrl.suggestMetrics" placeholder="metric name" data-min-length=0 data-items=100>
+			<textarea rows="3" class="gf-form-input" ng-model="ctrl.target.expr" spellcheck="false" placeholder="query expression" data-min-length=0 data-items=100 ng-model-onblur ng-change="ctrl.refreshMetricData()"></textarea>
 		</div>
 	</div>
 
@@ -39,6 +34,14 @@
 					ng-change="ctrl.refreshMetricData()">
 				</select>
 			</div>
+		</div>
+
+		<div class="gf-form max-width-22">
+			<label class="gf-form-label">Metric lookup</label>
+			<input type="text" class="gf-form-input" ng-model="ctrl.target.metric" spellcheck='false' bs-typeahead="ctrl.suggestMetrics" placeholder="metric name" data-min-length=0 data-items=100>
+		</div>
+
+		<div class="gf-form">
 			<label class="gf-form-label">
 				<a href="{{ctrl.linkToPrometheus}}" target="_blank" bs-tooltip="'Link to Graph in Prometheus'">
 					<i class="fa fa-share-square-o"></i>
diff --git a/public/app/plugins/datasource/prometheus/query_ctrl.ts b/public/app/plugins/datasource/prometheus/query_ctrl.ts
index c6bbe03a8d7..66ea92a917f 100644
--- a/public/app/plugins/datasource/prometheus/query_ctrl.ts
+++ b/public/app/plugins/datasource/prometheus/query_ctrl.ts
@@ -75,6 +75,10 @@ class PrometheusQueryCtrl extends QueryCtrl {
     var hash = encodeURIComponent(JSON.stringify([expr]));
     this.linkToPrometheus = this.datasource.directUrl + '/graph#' + hash;
   }
+
+  getCollapsedText() {
+    return this.target.expr;
+  }
 }
 
 export {PrometheusQueryCtrl};

From be123a07c5758abb92cc4f4bd274fe0b97c178bc Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Thu, 9 Mar 2017 14:53:50 +0900
Subject: [PATCH 215/301] (prometheus) adjust annotation step (#7768)

* (prometheus) adjust annotation step

* (prometheus) add step option
---
 .../datasource/prometheus/datasource.ts       | 31 ++++++++++++-------
 .../partials/annotations.editor.html          |  7 +++--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 972fa2c7c55..f883b40e5ee 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -4,6 +4,7 @@ import angular from 'angular';
 import _ from 'lodash';
 import moment from 'moment';
 
+import kbn from 'app/core/utils/kbn';
 import * as dateMath from 'app/core/utils/datemath';
 import PrometheusMetricFindQuery from './metric_find_query';
 
@@ -88,12 +89,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
       var intervalFactor = target.intervalFactor || 1;
       target.step = query.step = this.calculateInterval(interval, intervalFactor);
       var range = Math.ceil(end - start);
-      // Prometheus drop query if range/step > 11000
-      // calibrate step if it is too big
-      if (query.step !== 0 && range / query.step > 11000) {
-        target.step = query.step = Math.ceil(range / 11000);
-      }
-
+      target.step = query.step = this.adjustStep(query.step, range);
       queries.push(query);
     });
 
@@ -126,6 +122,15 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
     });
   };
 
+  this.adjustStep = function(step, range) {
+    // Prometheus drop query if range/step > 11000
+    // calibrate step if it is too big
+    if (step !== 0 && range / step > 11000) {
+      return Math.ceil(range / 11000);
+    }
+    return step;
+  };
+
   this.performTimeSeriesQuery = function(query, start, end) {
     if (start > end) {
       throw { message: 'Invalid time range' };
@@ -175,15 +180,19 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
       return $q.reject(err);
     }
 
-    var query = {
-      expr: interpolated,
-      step: '60s'
-    };
+    var step = '60s';
+    if (annotation.step) {
+      step = templateSrv.replace(annotation.step);
+    }
 
     var start = this.getPrometheusTime(options.range.from, false);
     var end = this.getPrometheusTime(options.range.to, true);
-    var self = this;
+    var query = {
+      expr: interpolated,
+      step: this.adjustStep(kbn.interval_to_seconds(step), Math.ceil(end - start)) + 's'
+    };
 
+    var self = this;
     return this.performTimeSeriesQuery(query, start, end).then(function(results) {
       var eventList = [];
       tagKeys = tagKeys.split(',');
diff --git a/public/app/plugins/datasource/prometheus/partials/annotations.editor.html b/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
index 818aa42e886..09ee52bda45 100644
--- a/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
@@ -1,9 +1,12 @@
-
-<h5 class="section-heading">Search expression</h6>
 <div class="gf-form-group">
 	<div class="gf-form">
+		<span class="gf-form-label width-10">Search expression</span>
 		<input type="text" class="gf-form-input" ng-model='ctrl.annotation.expr' placeholder="ALERTS"></input>
 	</div>
+	<div class="gf-form">
+		<span class="gf-form-label width-10">step</span>
+		<input type="text" class="gf-form-input max-width-6" ng-model='ctrl.annotation.step' placeholder="60s"></input>
+	</div>
 </div>
 
 <div class="gf-form-group">

From bb2eb00b0eb9c77e7c2928865d637c9d35c6fb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 9 Mar 2017 07:05:49 +0100
Subject: [PATCH 216/301] minor data source edit form improvement

---
 docker/blocks/prometheus/fig                      | 2 --
 public/app/features/plugins/partials/ds_edit.html | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/blocks/prometheus/fig b/docker/blocks/prometheus/fig
index ec4dd8e4b16..1c70c14fc37 100644
--- a/docker/blocks/prometheus/fig
+++ b/docker/blocks/prometheus/fig
@@ -3,8 +3,6 @@ prometheus:
   net: host
   ports:
     - "9090:9090"
-  volumes:
-    - /var/docker/prometheus:/prometheus-data
 
 node_exporter:
   image: prom/node-exporter
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 4756428bead..e94a5300e3d 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -28,9 +28,9 @@
     <form name="ctrl.editForm" ng-if="ctrl.current">
       <div class="gf-form-group">
         <div class="gf-form-inline">
-					<div class="gf-form">
+					<div class="gf-form max-width-30">
 						<span class="gf-form-label width-7">Name</span>
-						<input class="gf-form-input max-width-21" type="text" ng-model="ctrl.current.name" placeholder="My data source name" required>
+						<input class="gf-form-input max-width-23" type="text" ng-model="ctrl.current.name" placeholder="name" required>
 						<info-popover offset="0px -135px" mode="right-absolute">
 							The name is used when you select the data source in panels.
 							The <em>Default</em> data source is preselected in new

From b272f5144a53e5b3c9f72dc8c32fe186400a1b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 9 Mar 2017 07:31:00 +0100
Subject: [PATCH 217/301] fix: graphite query ctrl, removed unnesserary check
 for empty paths, fixes #7740

---
 public/app/plugins/datasource/graphite/query_ctrl.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts
index 724a8247f91..f9f34284971 100644
--- a/public/app/plugins/datasource/graphite/query_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/query_ctrl.ts
@@ -128,6 +128,10 @@ export class GraphiteQueryCtrl extends QueryCtrl {
     }
 
     var path = this.getSegmentPathUpTo(fromIndex + 1);
+    if (path === "") {
+      return Promise.resolve();
+    }
+
     return this.datasource.metricFindQuery(path).then(segments => {
       if (segments.length === 0) {
         if (path !== '') {

From aee8f0b75e5703f7ca6ef037802fbd3c24b3870c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 9 Mar 2017 08:28:31 +0100
Subject: [PATCH 218/301] opentsdb: fix for OpenTSDB and multi value template
 variable in metric field, fixes #7754

---
 public/app/plugins/datasource/opentsdb/datasource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index 76ee763cafc..d3ab1cb403f 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -372,7 +372,7 @@ function (angular, _, dateMath) {
       }
 
       var query = {
-        metric: templateSrv.replace(target.metric, options.scopedVars),
+        metric: templateSrv.replace(target.metric, options.scopedVars, 'pipe'),
         aggregator: "avg"
       };
 

From 7f8a3a0a2db142b7b6a89e56af7e9600dd9d0537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 9 Mar 2017 09:08:34 +0100
Subject: [PATCH 219/301] dashboard: lazy loading panels as they become
 visible,fix, removed debunce #5216

---
 public/app/features/panel/panel_directive.ts         | 4 ++--
 public/app/plugins/datasource/opentsdb/datasource.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 6f3987d872f..d2708ff73bb 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -180,11 +180,11 @@ module.directive('grafanaPanel', function($rootScope, $document) {
         return (0 < position.top) && (position.top < window.innerHeight);
       };
 
-      const refreshOnScroll = _.debounce(function () {
+      const refreshOnScroll = function () {
         if (ctrl.skippedLastRefresh) {
           ctrl.refresh();
         }
-      }, 250);
+      };
 
       $document.on('scroll', refreshOnScroll);
 
diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index d3ab1cb403f..ecd939d8f74 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -411,15 +411,15 @@ function (angular, _, dateMath) {
 
       if (target.filters && target.filters.length > 0) {
         query.filters = angular.copy(target.filters);
-        if(query.filters){
-          for(var filter_key in query.filters){
+        if (query.filters){
+          for (var filter_key in query.filters) {
             query.filters[filter_key].filter = templateSrv.replace(query.filters[filter_key].filter, options.scopedVars, 'pipe');
           }
         }
       } else {
         query.tags = angular.copy(target.tags);
-        if(query.tags){
-          for(var tag_key in query.tags){
+        if (query.tags){
+          for (var tag_key in query.tags) {
             query.tags[tag_key] = templateSrv.replace(query.tags[tag_key], options.scopedVars, 'pipe');
           }
         }

From 952cc1d8832b6c81b1fdc58ff39cac43de35dfb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 9 Mar 2017 12:56:49 +0100
Subject: [PATCH 220/301] alerting: fixed width of query component in alert tab

---
 public/app/features/alerting/partials/alert_tab.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html
index 8b11ec4ebc1..76841db75ba 100644
--- a/public/app/features/alerting/partials/alert_tab.html
+++ b/public/app/features/alerting/partials/alert_tab.html
@@ -47,7 +47,7 @@
             <span class="gf-form-label query-keyword">OF</span>
 					</div>
 					<div class="gf-form">
-						<query-part-editor class="gf-form-label query-part width-10" part="conditionModel.queryPart" handle-event="ctrl.handleQueryPartEvent(conditionModel, $event)">
+						<query-part-editor class="gf-form-label query-part" part="conditionModel.queryPart" handle-event="ctrl.handleQueryPartEvent(conditionModel, $event)">
 						</query-part-editor>
 					</div>
 					<div class="gf-form">

From 835d420294342cafdf307814ef7e42b74e1e2575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 9 Mar 2017 12:56:49 +0100
Subject: [PATCH 221/301] alerting: fixed width of query component in alert tab

---
 public/app/features/alerting/partials/alert_tab.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html
index 8b11ec4ebc1..76841db75ba 100644
--- a/public/app/features/alerting/partials/alert_tab.html
+++ b/public/app/features/alerting/partials/alert_tab.html
@@ -47,7 +47,7 @@
             <span class="gf-form-label query-keyword">OF</span>
 					</div>
 					<div class="gf-form">
-						<query-part-editor class="gf-form-label query-part width-10" part="conditionModel.queryPart" handle-event="ctrl.handleQueryPartEvent(conditionModel, $event)">
+						<query-part-editor class="gf-form-label query-part" part="conditionModel.queryPart" handle-event="ctrl.handleQueryPartEvent(conditionModel, $event)">
 						</query-part-editor>
 					</div>
 					<div class="gf-form">

From a30cf204d715b6d517a97657d40358ad8ecb34e9 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 9 Mar 2017 14:18:12 +0100
Subject: [PATCH 222/301] influx: small ux changes to query editor

---
 .../datasource/influxdb/partials/query.editor.html | 14 +++++++-------
 .../app/plugins/datasource/influxdb/query_ctrl.ts  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index c8848d6f43b..3d14b18c81d 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -75,19 +75,19 @@
 		<div class="gf-form-inline">
 			<div class="gf-form">
 				<label class="gf-form-label query-keyword width-7">ORDER BY</label>
-				<label class="gf-form-label query-part">time</label>
+				<label class="gf-form-label query-part width-4">time</label>
 				<div class="gf-form-select-wrapper">
 					<select class="gf-form-input gf-size-auto" ng-model="ctrl.target.orderByTime" ng-options="f.value as f.text for f in ctrl.orderByTime" ng-change="ctrl.refresh()"></select>
 				</div>
 			</div>
-		
-			<div class="gf-form max-width-30">
-				<label class="gf-form-label query-keyword width-7">LIMIT</label>
+
+			<div class="gf-form max-width-14">
+				<label class="gf-form-label query-keyword width-5">LIMIT</label>
 				<input type="text" class="gf-form-input" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
 			</div>
-		
-			<div class="gf-form max-width-30">
-				<label class="gf-form-label query-keyword width-7">SLIMIT</label>
+
+			<div class="gf-form max-width-14">
+				<label class="gf-form-label query-keyword width-5">SLIMIT</label>
 				<input type="text" class="gf-form-input" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
 			</div>
 			<div class="gf-form gf-form--grow">
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index f78ed0727db..c676c222d94 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -34,8 +34,8 @@ export class InfluxQueryCtrl extends QueryCtrl {
       {text: 'Table', value: 'table'},
     ];
     this.orderByTime = [
-      {text: 'Ascending', value: 'ASC'},
-      {text: 'Descending', value: 'DESC'},
+      {text: 'ASC', value: 'ASC'},
+      {text: 'DESC', value: 'DESC'},
     ];
 
     this.policySegment = uiSegmentSrv.newSegment(this.target.policy);

From c176de89c976a2c4592e82afeff68983f5bd572d Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 9 Mar 2017 14:31:27 +0100
Subject: [PATCH 223/301] docs: add notes for #6065 #7232 and #5216

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec6f6390cc4..518f613f616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,13 @@
 # 4.3.0 (unreleased)
 
+## Enhancements
+
+* **InfluxDB**: influxdb query builder support for ORDER BY and LIMIT (allows TOPN queries) [#6065](https://github.com/grafana/grafana/issues/6065) Support influxdb's SLIMIT Feature [#7232](https://github.com/grafana/grafana/issues/7232) thx [@thuck](https://github.com/thuck)
+* **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin)
+
 ## Minor Enchancements
 
+
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements
 * **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)

From 74c795b294b3ae1e49317b3b9bd8a56e6c242e2e Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 9 Mar 2017 16:55:16 +0100
Subject: [PATCH 224/301] panel: use meta.soloMode instead of url check

when checking if rendering a png for lazy loading of panels.
---
 public/app/features/panel/panel_ctrl.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 0c80d7a88e3..8de78291baa 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -76,12 +76,8 @@ export class PanelCtrl {
     profiler.renderingCompleted(this.panel.id, this.timing);
   }
 
-  private isRenderingPng () {
-    return window.location.href.indexOf("/dashboard-solo/db") >= 0;
-  }
-
   refresh() {
-    if (!this.isPanelVisible() && !this.isRenderingPng() && !this.dashboard.snapshot) {
+    if (!this.isPanelVisible() && !this.dashboard.meta.soloMode && !this.dashboard.snapshot) {
       this.skippedLastRefresh = true;
       return;
     }

From 58afb1c7d615671862b2c217e77101840a8611ae Mon Sep 17 00:00:00 2001
From: thuck <denisdoria@gmail.com>
Date: Thu, 9 Mar 2017 21:22:40 +0100
Subject: [PATCH 225/301] Small fix for the "glow" when focus the field for
 LIMIT and SLIMIT

---
 .../plugins/datasource/influxdb/partials/query.editor.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 3d14b18c81d..bff03fbb7d5 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -83,12 +83,12 @@
 
 			<div class="gf-form max-width-14">
 				<label class="gf-form-label query-keyword width-5">LIMIT</label>
-				<input type="text" class="gf-form-input" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
+				<input type="text" class="gf-form-input width-9" ng-model="ctrl.target.limit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
 			</div>
 
 			<div class="gf-form max-width-14">
 				<label class="gf-form-label query-keyword width-5">SLIMIT</label>
-				<input type="text" class="gf-form-input" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
+				<input type="text" class="gf-form-input width-9" ng-model="ctrl.target.slimit" spellcheck='false' placeholder="No Limit" ng-blur="ctrl.refresh()">
 			</div>
 			<div class="gf-form gf-form--grow">
 				<div class="gf-form-label gf-form-label--grow"></div>

From 22553b154a6a5c64611de0224f4ba7282efbee70 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Fri, 10 Mar 2017 10:41:30 +0100
Subject: [PATCH 226/301] docs: add note for #7799

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 518f613f616..893edcce109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Enhancements
 
 * **InfluxDB**: influxdb query builder support for ORDER BY and LIMIT (allows TOPN queries) [#6065](https://github.com/grafana/grafana/issues/6065) Support influxdb's SLIMIT Feature [#7232](https://github.com/grafana/grafana/issues/7232) thx [@thuck](https://github.com/thuck)
+* **InfluxDB**: Small fix for the "glow" when focus the field for LIMIT and SLIMIT [#7799](https://github.com/grafana/grafana/pull/7799) thx [@thuck](https://github.com/thuck)
 * **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin)
 
 ## Minor Enchancements

From e19b48840f61073ce3729676b0a1bdd1976c6ca2 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Fri, 10 Mar 2017 18:46:36 +0100
Subject: [PATCH 227/301] graph: merge fixes for #5278

This is an old PR so had some problems after merging in master.

- Fix for min and max that were not getting passed into the
applyLogScale function
- Fix for when min/max were undefined rather than null
- Fix for decimal ticks, as this PR populates the ticks itself then
it also needs to calculate the number of decimal places too. Flot
was showing the wrong number of decimal places sometimes otherwise
on the y-axis.
---
 public/app/plugins/panel/graph/graph.ts       | 29 ++++++++++++-------
 .../plugins/panel/graph/specs/graph_specs.ts  |  9 ++++--
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 69028a9e407..06af66ddbe7 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -460,7 +460,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
           show: panel.yaxes[0].show,
           index: 1,
           logBase: panel.yaxes[0].logBase || 1,
-          max: null
+          min: panel.yaxes[0].min ? _.toNumber(panel.yaxes[0].min) : null,
+          max: panel.yaxes[0].max ? _.toNumber(panel.yaxes[0].max) : null,
         };
 
         options.yaxes.push(defaults);
@@ -471,12 +472,13 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
           secondY.show = panel.yaxes[1].show;
           secondY.logBase = panel.yaxes[1].logBase || 1;
           secondY.position = 'right';
+          secondY.min = panel.yaxes[1].min ? _.toNumber(panel.yaxes[1].min) : null;
+          secondY.max = panel.yaxes[1].max ? _.toNumber(panel.yaxes[1].max) : null;
           options.yaxes.push(secondY);
 
           applyLogScale(options.yaxes[1], data);
           configureAxisMode(options.yaxes[1], panel.percentage && panel.stack ? "percent" : panel.yaxes[1].format);
         }
-
         applyLogScale(options.yaxes[0], data);
         configureAxisMode(options.yaxes[0], panel.percentage && panel.stack ? "percent" : panel.yaxes[0].format);
       }
@@ -498,10 +500,10 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
         for (i = 0; i < data.length; i++) {
           series = data[i];
           if (series.yaxis === axis.index) {
-            if (max === null || max < series.stats.max) {
+            if (!max || max < series.stats.max) {
               max = series.stats.max;
             }
-            if (min === null || min > series.stats.logmin) {
+            if (!min || min > series.stats.logmin) {
               min = series.stats.logmin;
             }
           }
@@ -510,27 +512,27 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
         axis.transform = function(v) { return (v < Number.MIN_VALUE) ? null : Math.log(v) / Math.log(axis.logBase); };
         axis.inverseTransform  = function (v) { return Math.pow(axis.logBase,v); };
 
-        if (max === null && min === null) {
+        if (!max && !min) {
           max = axis.inverseTransform(+2);
           min = axis.inverseTransform(-2);
-        } else if (max === null) {
+        } else if (!max) {
           max = min*axis.inverseTransform(+4);
-        } else if (min === null) {
+        } else if (!min) {
           min = max*axis.inverseTransform(-4);
         }
 
-        if (axis.min !== null) {
+        if (axis.min) {
           min = axis.inverseTransform(Math.ceil(axis.transform(axis.min)));
         } else {
           min = axis.min = axis.inverseTransform(Math.floor(axis.transform(min)));
         }
-        if (axis.max !== null) {
+        if (axis.max) {
           max = axis.inverseTransform(Math.floor(axis.transform(axis.max)));
         } else {
           max = axis.max = axis.inverseTransform(Math.ceil(axis.transform(max)));
         }
 
-        if (min < Number.MIN_VALUE || max < Number.MIN_VALUE) {
+        if (!min || min < Number.MIN_VALUE || !max || max < Number.MIN_VALUE) {
           return;
         }
 
@@ -539,6 +541,13 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
         for (nextTick = min; nextTick <= max; nextTick *= axis.logBase) {
           axis.ticks.push(nextTick);
         }
+        axis.tickDecimals = decimalPlaces(min);
+      }
+
+      function decimalPlaces(num) {
+        if (!num) { return 0; }
+
+        return (num.toString().split('.')[1] || []).length;
       }
 
       function configureAxisMode(axis, format) {
diff --git a/public/app/plugins/panel/graph/specs/graph_specs.ts b/public/app/plugins/panel/graph/specs/graph_specs.ts
index fd958a7fe23..0d8c088f704 100644
--- a/public/app/plugins/panel/graph/specs/graph_specs.ts
+++ b/public/app/plugins/panel/graph/specs/graph_specs.ts
@@ -121,8 +121,8 @@ describe('grafanaGraph', function() {
       });
       data[0].yaxis = 1;
       ctrl.panel.yaxes[1].logBase = 10;
-      ctrl.panel.yaxes[1].min = 0.05;
-      ctrl.panel.yaxes[1].max = 1500;
+      ctrl.panel.yaxes[1].min = '0.05';
+      ctrl.panel.yaxes[1].max = '1500';
       data[1] = new TimeSeries({
         datapoints: [[2000,1],[0.002,2],[0,3],[-1,4]],
         alias: 'seriesFixedscale',
@@ -139,12 +139,17 @@ describe('grafanaGraph', function() {
       expect(axisAutoscale.ticks.length).to.be(8);
       expect(axisAutoscale.ticks[0]).to.be(0.001);
       expect(axisAutoscale.ticks[7]).to.be(10000);
+      expect(axisAutoscale.tickDecimals).to.be(3);
+
+
       var axisFixedscale = ctx.plotOptions.yaxes[1];
       expect(axisFixedscale.min).to.be(0.05);
       expect(axisFixedscale.max).to.be(1500);
       expect(axisFixedscale.ticks.length).to.be(5);
       expect(axisFixedscale.ticks[0]).to.be(0.1);
       expect(axisFixedscale.ticks[4]).to.be(1000);
+      expect(axisFixedscale.tickDecimals).to.be(1);
+
     });
   });
 

From 2580b61088900830abad71c9b44db5710b791a6f Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Sat, 11 Mar 2017 14:05:25 +0100
Subject: [PATCH 228/301] docs: adds note for #7663

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 893edcce109..767a0b6d58b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ## Minor Enchancements
 
+* **Prometheus**: Make Prometheus query field a textarea [#7663](https://github.com/grafana/grafana/issues/7663), thx [@hagen1778](https://github.com/hagen1778)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements

From 8637207b55c58791630fb179d94df67fb012f5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20R=C3=BCckert?= <janrueckert@users.noreply.github.com>
Date: Sat, 11 Mar 2017 16:17:35 +0100
Subject: [PATCH 229/301] Change 60-day date range back to 90 days (#7803)

---
 public/app/core/utils/rangeutil.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/app/core/utils/rangeutil.ts b/public/app/core/utils/rangeutil.ts
index ea9ad111e8d..81fcbeb913f 100644
--- a/public/app/core/utils/rangeutil.ts
+++ b/public/app/core/utils/rangeutil.ts
@@ -41,7 +41,7 @@ var rangeOptions = [
   { from: 'now-2d',   to: 'now',      display: 'Last 2 days',           section: 0 },
   { from: 'now-7d',   to: 'now',      display: 'Last 7 days',           section: 0 },
   { from: 'now-30d',  to: 'now',      display: 'Last 30 days',          section: 0 },
-  { from: 'now-60d',  to: 'now',      display: 'Last 60 days',          section: 0 },
+  { from: 'now-90d',  to: 'now',      display: 'Last 90 days',          section: 0 },
   { from: 'now-6M',   to: 'now',      display: 'Last 6 months',         section: 0 },
   { from: 'now-1y',   to: 'now',      display: 'Last 1 year',           section: 0 },
   { from: 'now-2y',   to: 'now',      display: 'Last 2 years',          section: 0 },
@@ -146,4 +146,3 @@ export function describeTimeRange(range) {
 
   return range.from.toString() + ' to ' + range.to.toString();
 }
-

From 77921c4dcd43f9b8b1a1a392e13cda998456a4d5 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 13 Mar 2017 09:31:59 +0100
Subject: [PATCH 230/301] renderpng: fixes invalid image link (#7797)

Closes #7770
---
 .../app/features/dashboard/shareModalCtrl.js  |  7 +++---
 public/test/specs/shareModalCtrl-specs.js     | 25 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js
index d4075c1e641..6f3cb320bef 100644
--- a/public/app/features/dashboard/shareModalCtrl.js
+++ b/public/app/features/dashboard/shareModalCtrl.js
@@ -76,9 +76,10 @@ function (angular, _, $, moment, require, config) {
 
       $scope.shareUrl = linkSrv.addParamsToUrl(baseUrl, params);
 
-      var soloUrl = $scope.shareUrl;
-      soloUrl = soloUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/');
-      soloUrl = soloUrl.replace("&fullscreen", "").replace("&edit", "");
+      var soloUrl = baseUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/');
+      delete params.fullscreen;
+      delete params.edit;
+      soloUrl = linkSrv.addParamsToUrl(soloUrl, params);
 
       $scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>';
 
diff --git a/public/test/specs/shareModalCtrl-specs.js b/public/test/specs/shareModalCtrl-specs.js
index f23dcb61f3a..9d3e7f941d0 100644
--- a/public/test/specs/shareModalCtrl-specs.js
+++ b/public/test/specs/shareModalCtrl-specs.js
@@ -71,6 +71,30 @@ define([
         expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&theme=light');
       });
 
+      it('should remove fullscreen from image url when is first param in querystring and modeSharePanel is true', function() {
+        ctx.$location.url('/test?fullscreen&edit');
+        ctx.scope.modeSharePanel = true;
+        ctx.scope.panel = { id: 1 };
+
+        ctx.scope.buildUrl();
+
+        expect(ctx.scope.shareUrl).to.contain('?fullscreen&edit&from=1000&to=2000&orgId=1&panelId=1');
+        expect(ctx.scope.imageUrl).to.contain('?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
+
+      });
+
+      it('should remove edit from image url when is first param in querystring and modeSharePanel is true', function() {
+        ctx.$location.url('/test?edit&fullscreen');
+        ctx.scope.modeSharePanel = true;
+        ctx.scope.panel = { id: 1 };
+
+        ctx.scope.buildUrl();
+
+        expect(ctx.scope.shareUrl).to.contain('?edit&fullscreen&from=1000&to=2000&orgId=1&panelId=1');
+        expect(ctx.scope.imageUrl).to.contain('?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
+
+      });
+
       it('should include template variables in url', function() {
         ctx.$location.path('/test');
         ctx.scope.options.includeTemplateVars = true;
@@ -83,7 +107,6 @@ define([
         ctx.scope.buildUrl();
         expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&var-app=mupp&var-server=srv-01');
       });
-
     });
 
   });

From 891df219691a3545a0e0c96a8efc65212758f34e Mon Sep 17 00:00:00 2001
From: Denis Doria <denisdoria@gmail.com>
Date: Mon, 13 Mar 2017 09:32:36 +0100
Subject: [PATCH 231/301] Small fix for the Y-Max/Y-Min inputs on Axes (#7811)

---
 public/app/plugins/panel/graph/axes_editor.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/panel/graph/axes_editor.html b/public/app/plugins/panel/graph/axes_editor.html
index 4c89b5b8b73..e446bb96490 100644
--- a/public/app/plugins/panel/graph/axes_editor.html
+++ b/public/app/plugins/panel/graph/axes_editor.html
@@ -20,13 +20,13 @@
 			</div>
 
 			<div class="gf-form-inline">
-				<div class="gf-form max-width-10">
+				<div class="gf-form">
 					<label class="gf-form-label width-5">Y-Min</label>
-					<input type="text" class="gf-form-input" placeholder="auto" empty-to-null ng-model="yaxis.min" ng-change="ctrl.render()" ng-model-onblur>
+					<input type="text" class="gf-form-input width-5" placeholder="auto" empty-to-null ng-model="yaxis.min" ng-change="ctrl.render()" ng-model-onblur>
 				</div>
-				<div class="gf-form max-width-10">
+				<div class="gf-form">
 					<label class="gf-form-label width-5">Y-Max</label>
-					<input type="text" class="gf-form-input" placeholder="auto" empty-to-null ng-model="yaxis.max" ng-change="ctrl.render()" ng-model-onblur>
+					<input type="text" class="gf-form-input width-5" placeholder="auto" empty-to-null ng-model="yaxis.max" ng-change="ctrl.render()" ng-model-onblur>
 				</div>
 			</div>
 

From b93a2887a83e1c41875102a058ff7e0b8474a97a Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 13 Mar 2017 11:44:02 +0100
Subject: [PATCH 232/301] docs: add note for #3090

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 767a0b6d58b..33507c30e34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * **InfluxDB**: influxdb query builder support for ORDER BY and LIMIT (allows TOPN queries) [#6065](https://github.com/grafana/grafana/issues/6065) Support influxdb's SLIMIT Feature [#7232](https://github.com/grafana/grafana/issues/7232) thx [@thuck](https://github.com/thuck)
 * **InfluxDB**: Small fix for the "glow" when focus the field for LIMIT and SLIMIT [#7799](https://github.com/grafana/grafana/pull/7799) thx [@thuck](https://github.com/thuck)
 * **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin)
+* **Graph**: Support auto grid min/max when using log scale [#3090](https://github.com/grafana/grafana/issues/3090), thx [@bigbenhur](https://github.com/bigbenhur)
 
 ## Minor Enchancements
 

From 0bb8a920ca676357b673e9d5df43ef3eb87938a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 13 Mar 2017 21:32:28 +0100
Subject: [PATCH 233/301] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 041a94c8432..80eee8f1348 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[Grafana](http://grafana.org) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) 
+[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) 
 ================
-[Website](http://grafana.org) |
+[Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
 [IRC](https://webchat.freenode.net/?channels=grafana) |
 [![Slack](https://brandfolder.com/api/favicon/icon?size=16&domain=www.slack.com)](http://slack.raintank.io)
@@ -10,7 +10,7 @@
 Grafana is an open source, feature rich metrics dashboard and graph editor for
 Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 
-![](http://grafana.org/assets/img/features/dashboard_ex1.png)
+![](http://docs.grafana.org/assets/img/features/dashboard_ex1.png)
 
 - [Install instructions](http://docs.grafana.org/installation/)
 - [What's New in Grafana 2.0](http://docs.grafana.org/guides/whats-new-in-v2/)
@@ -76,7 +76,7 @@ Be sure to read the [getting started guide](http://docs.grafana.org/guides/getti
 
 ## Run from master
 If you want to build a package yourself, or contribute. Here is a guide for how to do that. You can always find
-the latest master builds [here](http://grafana.org/builds)
+the latest master builds [here](https://grafana.com/grafana/download)
 
 ### Dependencies
 

From 98b65641c3b016a904d7b6dc7be6bf4fa1e139b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 13 Mar 2017 23:05:04 +0100
Subject: [PATCH 234/301] Update README.md

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 80eee8f1348..441d0ee36d9 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,7 @@
 ================
 [Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
-[IRC](https://webchat.freenode.net/?channels=grafana) |
-[![Slack](https://brandfolder.com/api/favicon/icon?size=16&domain=www.slack.com)](http://slack.raintank.io)
-[Slack](http://slack.raintank.io) |
-[Email](mailto:contact@grafana.org)
+[Community / Forum](https://community.grafana.com)
 
 Grafana is an open source, feature rich metrics dashboard and graph editor for
 Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.

From 9e27b8ee4767a8fe1fd3be40695563c2c241f460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 13 Mar 2017 23:05:47 +0100
Subject: [PATCH 235/301] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 441d0ee36d9..6e0289e2bd5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 ================
 [Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
-[Community / Forum](https://community.grafana.com)
+[Community & Forum](https://community.grafana.com)
 
 Grafana is an open source, feature rich metrics dashboard and graph editor for
 Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.

From 967cdd73e1a00c115dd2b63b2e8898d7d6387d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 14 Mar 2017 09:43:50 +0100
Subject: [PATCH 236/301] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 98f6b6fe928..3166e4cef26 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,7 @@
-Please prefix your title with [Bug] or [Feature request]
-For question please check [Support Options](http://grafana.org/support/). **Do not** open a github issue
+Read before posting: 
+> **Questions** should be posted to [Community Forum](https://community.grafana.com). Please search there and here on GitHub for similar issues before creating a new issue. Checkout [FAQ](https://community.grafana.com/c/howto/faq) and [How to troubleshoot metric query issues](https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50)
+
+Please prefix your title with [Bug] or [Feature request]. 
 
 Please include this information:
 - What Grafana version are you using?
@@ -8,11 +10,6 @@ Please include this information:
 - What did you do?
 - What was the expected result?
 - What happened instead?
-
-**IMPORTANT** 
-If it relates to *metric data viz*:
-- An image or text representation of your metric query
-- The raw query and response for the network request (check this in chrome dev tools network tab, here you can see metric requests and other request, please include the request body and request response)
-
-If it relates to *alerting*
-- An image of the test execution data fully expanded.
+- If related to metric query / data viz:
+  - Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab.
+ 

From 69ff97305f421b9a42b1d76497bbc41dfbfe3665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 14 Mar 2017 09:44:09 +0100
Subject: [PATCH 237/301] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3166e4cef26..69582bdc2af 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
 Read before posting: 
-> **Questions** should be posted to [Community Forum](https://community.grafana.com). Please search there and here on GitHub for similar issues before creating a new issue. Checkout [FAQ](https://community.grafana.com/c/howto/faq) and [How to troubleshoot metric query issues](https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50)
+**Questions** should be posted to [Community Forum](https://community.grafana.com). Please search there and here on GitHub for similar issues before creating a new issue. Checkout [FAQ](https://community.grafana.com/c/howto/faq) and [How to troubleshoot metric query issues](https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50)
 
 Please prefix your title with [Bug] or [Feature request]. 
 

From f42ef5fe17dc15d713d50a8d776ef71e4a1420cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 14 Mar 2017 09:44:19 +0100
Subject: [PATCH 238/301] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 69582bdc2af..3959c5f3a9a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,5 @@
 Read before posting: 
+
 **Questions** should be posted to [Community Forum](https://community.grafana.com). Please search there and here on GitHub for similar issues before creating a new issue. Checkout [FAQ](https://community.grafana.com/c/howto/faq) and [How to troubleshoot metric query issues](https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50)
 
 Please prefix your title with [Bug] or [Feature request]. 

From 23954f775beb8cb657b30044e24925e7ecf3bbd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 14 Mar 2017 09:46:32 +0100
Subject: [PATCH 239/301] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3959c5f3a9a..57fca7f44cb 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,8 @@
 Read before posting: 
 
-**Questions** should be posted to [Community Forum](https://community.grafana.com). Please search there and here on GitHub for similar issues before creating a new issue. Checkout [FAQ](https://community.grafana.com/c/howto/faq) and [How to troubleshoot metric query issues](https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50)
+- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue. 
+- Checkout FAQ: https://community.grafana.com/c/howto/faq
+- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
 
 Please prefix your title with [Bug] or [Feature request]. 
 

From 0b73369c4bf0b28c678cb6c0f9a7d1917649da8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 14 Mar 2017 12:21:22 +0100
Subject: [PATCH 240/301] docs: fixed docs title issue

---
 docs/Dockerfile  |  1 +
 docs/config.toml | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 docs/config.toml

diff --git a/docs/Dockerfile b/docs/Dockerfile
index 7aa9ff1ad6e..7679f2b7e4b 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -7,6 +7,7 @@ FROM grafana/docs-base:latest
 
 # COPY ./sources /site/content/docs/
 
+COPY config.toml /site
 COPY awsconfig /site
 
 VOLUME ["/site/content"]
diff --git a/docs/config.toml b/docs/config.toml
new file mode 100644
index 00000000000..76fd6c54a1b
--- /dev/null
+++ b/docs/config.toml
@@ -0,0 +1,20 @@
+
+baseurl = "http://localhost:3002/"
+languageCode = "en-us"
+title = "Grafana Docs"
+canonifyurls = true
+relativeURLs = false
+verbose = true
+enableRobotsTXT = true
+disableSitemap = false
+disableRSS = false
+preservetaxonomynames = true
+metaDataFormat = "yaml"
+
+[taxonomies]
+tag = "tags"
+category = "categories"
+
+[permalinks]
+  blog = ":year/:month/:day/:title/"
+

From e9ad71abedc4b13208d3c42ce36e2997a2b77cd9 Mon Sep 17 00:00:00 2001
From: Gregory Kman <gregorykman@gmail.com>
Date: Wed, 15 Mar 2017 12:00:03 -0500
Subject: [PATCH 241/301] Update alerting.md

Add missing `"`
---
 docs/sources/http_api/alerting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/http_api/alerting.md b/docs/sources/http_api/alerting.md
index b58a177fecd..cc7ce4c2650 100644
--- a/docs/sources/http_api/alerting.md
+++ b/docs/sources/http_api/alerting.md
@@ -87,7 +87,7 @@ This API can also be used to create, update and delete alert notifications.
 
     {
       "alertId": 1,
-      "paused: true
+      "paused": true
     }
 
 **Example Response**:

From 32f89f65da285e4008b00e1a02fa1f7afa93f023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 16 Mar 2017 09:54:33 +0100
Subject: [PATCH 242/301] fix: Data source group by time interval did not take
 effect on initial query after dashboard load, fixes #7839

---
 public/app/features/panel/metrics_panel_ctrl.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index 7ed360aab1a..ec4dae85a5a 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -90,8 +90,6 @@ class MetricsPanelCtrl extends PanelCtrl {
     delete this.error;
     this.loading = true;
 
-    this.updateTimeRange();
-
     // load datasource service
     this.setTimeQueryStart();
     this.datasourceSrv.get(this.panel.datasource)
@@ -196,6 +194,7 @@ class MetricsPanelCtrl extends PanelCtrl {
 
   issueQueries(datasource) {
     this.datasource = datasource;
+    this.updateTimeRange();
 
     if (!this.panel.targets || this.panel.targets.length === 0) {
       return this.$q.when([]);

From 7856e2f16bbb77b6dbb01a23387f4b0b344a70ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 16 Mar 2017 12:20:23 +0100
Subject: [PATCH 243/301] fix: metrics_panel and time range issue introduced
 earlier today, fixes #7849

---
 public/app/features/panel/metrics_panel_ctrl.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index ec4dae85a5a..b42d4a8b02a 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -93,6 +93,7 @@ class MetricsPanelCtrl extends PanelCtrl {
     // load datasource service
     this.setTimeQueryStart();
     this.datasourceSrv.get(this.panel.datasource)
+    .then(this.updateTimeRange.bind(this))
     .then(this.issueQueries.bind(this))
     .then(this.handleQueryResult.bind(this))
     .catch(err => {
@@ -119,7 +120,8 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.timing.queryEnd = new Date().getTime();
   }
 
-  updateTimeRange() {
+  updateTimeRange(datasource?) {
+    this.datasource = datasource || this.datasource;
     this.range = this.timeSrv.timeRange();
     this.rangeRaw = this.range.raw;
 
@@ -132,6 +134,8 @@ class MetricsPanelCtrl extends PanelCtrl {
     }
 
     this.calculateInterval();
+
+    return this.datasource;
   };
 
   calculateInterval() {
@@ -194,7 +198,6 @@ class MetricsPanelCtrl extends PanelCtrl {
 
   issueQueries(datasource) {
     this.datasource = datasource;
-    this.updateTimeRange();
 
     if (!this.panel.targets || this.panel.targets.length === 0) {
       return this.$q.when([]);

From f3cce7efc9c1eced48cc44a1a5a50b9726b6bf56 Mon Sep 17 00:00:00 2001
From: Pandurang Waghulde <pandurang.plw@gmail.com>
Date: Fri, 17 Mar 2017 12:57:52 +0530
Subject: [PATCH 244/301] typo fix for OpsGenie

---
 pkg/services/alerting/notifiers/opsgenie.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go
index 742aeb922b6..6792702b539 100644
--- a/pkg/services/alerting/notifiers/opsgenie.go
+++ b/pkg/services/alerting/notifiers/opsgenie.go
@@ -30,7 +30,7 @@ func init() {
            label="Auto close incidents"
            label-class="width-14"
            checked="ctrl.model.settings.autoClose"
-           tooltip="Automatically close alerts in OpseGenie once the alert goes back to ok.">
+           tooltip="Automatically close alerts in OpsGenie once the alert goes back to ok.">
         </gf-form-switch>
       </div>
     `,

From 5cb51631dbd977e122e221832a1876a60e3eb305 Mon Sep 17 00:00:00 2001
From: Andrii Skomorokhov <askomorokhov@users.noreply.github.com>
Date: Fri, 17 Mar 2017 12:48:28 +0200
Subject: [PATCH 245/301] Fixed position of tooltip with description at graph.
 (#7854)

---
 public/app/features/panel/panel_directive.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index d2708ff73bb..0482abc0437 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -160,6 +160,7 @@ module.directive('grafanaPanel', function($rootScope, $document) {
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             hoverOpenDelay: 100,
+            constrainToScrollParent: false,
           });
         }
       }

From 19516ebcce007d087e86a5247ddb32e8d539be53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 17 Mar 2017 19:33:31 +0100
Subject: [PATCH 246/301] docs: minor fix

---
 docs/config.toml      | 2 +-
 docs/sources/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/config.toml b/docs/config.toml
index 76fd6c54a1b..8ace86392ea 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -1,7 +1,7 @@
 
 baseurl = "http://localhost:3002/"
 languageCode = "en-us"
-title = "Grafana Docs"
+title = "Grafana Documentation"
 canonifyurls = true
 relativeURLs = false
 verbose = true
diff --git a/docs/sources/index.md b/docs/sources/index.md
index eb2c491d78e..d853d5dda9e 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -1,5 +1,5 @@
 +++
-title = "Grafana Documentation Site"
+title = "Docs Home"
 description = "Install guide for Grafana"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"

From 737c29ec8c650589be5bbebbf92fc3d6bf059e45 Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@raintank.io>
Date: Fri, 17 Mar 2017 16:35:05 -0400
Subject: [PATCH 247/301] disable inviting new users to orgs if login form is
 disabled

---
 pkg/api/frontendsettings.go                   |  1 +
 pkg/api/login.go                              |  4 ++
 pkg/api/org_invite.go                         |  4 ++
 public/app/features/org/org_users_ctrl.ts     | 15 +++--
 public/app/features/org/partials/addUser.html | 55 +++++++++++++++++++
 .../app/features/org/partials/orgUsers.html   | 10 +++-
 6 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 public/app/features/org/partials/addUser.html

diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index c0e27897ff4..328b8abbc5f 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -142,6 +142,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 		"ldapEnabled":       setting.LdapEnabled,
 		"alertingEnabled":   setting.AlertingEnabled,
 		"googleAnalyticsId": setting.GoogleAnalyticsId,
+		"disableLoginForm":  setting.DisableLoginForm,
 		"buildInfo": map[string]interface{}{
 			"version":       setting.BuildVersion,
 			"commit":        setting.BuildCommit,
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 8fbe414c08c..8ab76c7b48d 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -94,6 +94,10 @@ func LoginApiPing(c *middleware.Context) {
 }
 
 func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) Response {
+	if setting.DisableLoginForm {
+		return ApiError(401, "Login is disabled", nil)
+	}
+
 	authQuery := login.LoginUserQuery{
 		Username: cmd.User,
 		Password: cmd.Password,
diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go
index 8d916677ed2..9e85808950f 100644
--- a/pkg/api/org_invite.go
+++ b/pkg/api/org_invite.go
@@ -38,6 +38,10 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
 		if err != m.ErrUserNotFound {
 			return ApiError(500, "Failed to query db for existing user check", err)
 		}
+
+		if setting.DisableLoginForm {
+			return ApiError(401, "User could not be found", nil)
+		}
 	} else {
 		return inviteExistingUserToOrg(c, userQuery.Result, &inviteDto)
 	}
diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts
index 9e70328f345..d6b594037b6 100644
--- a/public/app/features/org/org_users_ctrl.ts
+++ b/public/app/features/org/org_users_ctrl.ts
@@ -1,8 +1,8 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import angular from 'angular';
+import config from 'app/core/config';
 import _ from 'lodash';
-import coreModule from '../../core/core_module';
+import coreModule from 'app/core/core_module';
 
 export class OrgUsersCtrl {
 
@@ -19,6 +19,8 @@ export class OrgUsersCtrl {
     };
     this.get();
     this.editor = { index: 0 };
+
+    $scope.disableInvites = config.disableLoginForm;
   }
 
   get() {
@@ -69,17 +71,20 @@ export class OrgUsersCtrl {
 
   openInviteModal() {
     var modalScope = this.$scope.$new();
-    modalScope.invitesSent = function() {
+    modalScope.invitesSent = () => {
       this.get();
     };
 
+    var src = !this.$scope.disableInvites
+      ? 'public/app/features/org/partials/invite.html'
+      : 'public/app/features/org/partials/addUser.html';
+
     this.$scope.appEvent('show-modal', {
-      src: 'public/app/features/org/partials/invite.html',
+      src: src,
       modalClass: 'invite-modal',
       scope: modalScope
     });
   }
-
 }
 
 coreModule.controller('OrgUsersCtrl', OrgUsersCtrl);
diff --git a/public/app/features/org/partials/addUser.html b/public/app/features/org/partials/addUser.html
new file mode 100644
index 00000000000..53fe7884df9
--- /dev/null
+++ b/public/app/features/org/partials/addUser.html
@@ -0,0 +1,55 @@
+<div class="modal-body" ng-controller="UserInviteCtrl" ng-init="init()">
+
+	<div class="modal-header">
+		<h2 class="modal-header-title">
+			Add Users
+		</h2>
+		<a class="modal-header-close" ng-click="dismiss();">
+			<i class="fa fa-remove"></i>
+		</a>
+	</div>
+
+	<div class="modal-content">
+
+		<div class="modal-tagline p-b-2">
+			Add existing Grafana users to the organization
+			<span class="highlight-word">{{contextSrv.user.orgName}}</span>
+		</div>
+
+		<form name="inviteForm">
+			<div class="gf-form-group">
+				<div class="gf-form-inline" ng-repeat="invite in invites">
+					<div class="gf-form max-width-21">
+						<span class="gf-form-label">Email or Username</span>
+						<input type="text" ng-model="invite.loginOrEmail" required class="gf-form-input" placeholder="email@test.com">
+					</div>
+					<div class="gf-form max-width-10">
+						<span class="gf-form-label">Role</span>
+						<select ng-model="invite.role" class="gf-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']">
+						</select>
+					</div>
+					<div class="gf-form gf-size-auto">
+						<a class="gf-form-label pointer" tabindex="1" ng-click="removeInvite(invite)">
+							<i class="fa fa-remove"></i>
+						</a>
+					</div>
+				</div>
+			</div>
+
+			<div class="gf-form-inline gf-form-group">
+				<div class="gf-form">
+					<a class="btn btn-inverse btn-small" ng-click="addInvite()">
+						<i class="fa fa-plus"></i>
+						Add another
+					</a>
+				</div>
+			</div>
+
+			<div class="gf-form-button-row">
+				<button type="submit" class="btn btn-success" ng-click="sendInvites();">Add Users</button>
+				<a class="btn-text" ng-click="dismiss()">Cancel</a>
+			</div>
+			<div class="clearfix"></div>
+		</form>
+	</div>
+</div>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 36b00b3bc03..f40a8484337 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -6,10 +6,14 @@
 		<h1>Organization users</h1>
 
 		<div class="page-header-tabs">
-			<button class="btn btn-success" ng-click="ctrl.openInviteModal()">
+			<button class="btn btn-success" ng-click="ctrl.openInviteModal()" ng-show="!disableInvites">
 				<i class="fa fa-plus"></i>
 				Add or Invite
 			</button>
+			<button class="btn btn-success" ng-click="ctrl.openInviteModal()" ng-show="!!disableInvites">
+				<i class="fa fa-plus"></i>
+				Add
+			</button>
 
 			<ul class="gf-tabs">
 				<li class="gf-tabs-item">
@@ -17,7 +21,7 @@
 						Users ({{ctrl.users.length}})
 					</a>
 				</li>
-				<li class="gf-tabs-item">
+				<li class="gf-tabs-item" ng-show="!disableInvites">
 					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
 						Pending Invitations ({{ctrl.pendingInvites.length}})
 					</a>
@@ -52,7 +56,7 @@
 		</table>
 	</div>
 
-	<div ng-if="ctrl.editor.index === 1" >
+	<div ng-if="ctrl.editor.index === 1 && !disableInvites">
 		<table class="filter-table form-inline">
 			<thead>
 				<tr>

From 51bdb602963b8d1cef634acc70b710a14c1d12cb Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@raintank.io>
Date: Fri, 17 Mar 2017 18:41:02 -0400
Subject: [PATCH 248/301] fix docs.grafana.org/plugins

---
 docs/sources/plugins/index.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/docs/sources/plugins/index.md b/docs/sources/plugins/index.md
index 217a01f9160..8108ce33805 100644
--- a/docs/sources/plugins/index.md
+++ b/docs/sources/plugins/index.md
@@ -1,5 +1,6 @@
 +++
 title = "Plugins"
+type = "docs"
 [menu.docs]
 name = "Plugins"
 identifier = "plugins"
@@ -9,16 +10,11 @@ weight = 8
 
 # Plugins
 
-From Grafana 3.0 not only datasource plugins are supported but also panel plugins and apps.
-Having panels as plugins make it easy to create and add any kind of panel, to show your data
-or improve your favorite dashboards. Apps is something new in Grafana that enables
-bundling of datasources, panels, dashboards and Grafana pages into a cohesive experience.
+Plugins make it easy to create and add any kind of panel, data source or complete
+application, to show your data or improve your favorite dashboards.
 
-Grafana already have a strong community of contributors and plugin developers.
+Grafana has a strong community of contributors and plugin developers.
 By making it easier to develop and install plugins we hope that the community
 can grow even stronger and develop new plugins that we would never think about.
 
-You can discover available plugins on [Grafana.net](https://grafana.net)
-
-
-
+You can discover available plugins on [Grafana.com](https://grafana.com/plugins)

From 50718b592c71625d779d0118f3eab16ce11c4f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Sat, 18 Mar 2017 08:25:26 +0100
Subject: [PATCH 249/301] docs: added aliases

---
 docs/sources/contribute/cla.md                | 2 +-
 docs/sources/features/datasources/opentsdb.md | 2 +-
 docs/sources/index.md                         | 1 +
 docs/sources/installation/index.md            | 2 +-
 docs/sources/installation/provisioning.md     | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/sources/contribute/cla.md b/docs/sources/contribute/cla.md
index 7059463b21b..b990187d809 100644
--- a/docs/sources/contribute/cla.md
+++ b/docs/sources/contribute/cla.md
@@ -2,7 +2,7 @@
 title = "Contributor Licence Agreement (CLA)"
 description = "Contributer Licence Agreement (CLA)"
 type = "docs"
-aliases = ["/project/cla"]
+aliases = ["/project/cla", "docs/contributing/cla.html"]
 [menu.docs]
 parent = "contribute"
 weight = 1
diff --git a/docs/sources/features/datasources/opentsdb.md b/docs/sources/features/datasources/opentsdb.md
index 435852137a5..2b1c7e5c3f5 100644
--- a/docs/sources/features/datasources/opentsdb.md
+++ b/docs/sources/features/datasources/opentsdb.md
@@ -3,7 +3,7 @@ title = "Using OpenTSDB in Grafana"
 description = "Guide for using OpenTSDB in Grafana"
 keywords = ["grafana", "opentsdb", "guide"]
 type = "docs"
-aliases = ["/datasources/opentsdb"]
+aliases = ["/datasources/opentsdb",	"docs/features/opentsdb"]
 [menu.docs]
 name = "OpenTSDB"
 parent = "datasources"
diff --git a/docs/sources/index.md b/docs/sources/index.md
index d853d5dda9e..62e5dac7fa5 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -3,6 +3,7 @@ title = "Docs Home"
 description = "Install guide for Grafana"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
+aliases = ["v1.1", "guides/reference/admin"]
 [menu.docs]
 name = "Welcome to the Docs"
 identifier = "root"
diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md
index dc7fd9597a2..837de3a2354 100644
--- a/docs/sources/installation/index.md
+++ b/docs/sources/installation/index.md
@@ -3,7 +3,7 @@ title = "Installation"
 description = "Install guide for Grafana"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
-aliases = ["installation/installation/"]
+aliases = ["installation/installation/", "v2.1/installation/install/"]
 [menu.docs]
 name = "Installation"
 identifier = "installation"
diff --git a/docs/sources/installation/provisioning.md b/docs/sources/installation/provisioning.md
index 513b469d4f9..c3969bcf32d 100644
--- a/docs/sources/installation/provisioning.md
+++ b/docs/sources/installation/provisioning.md
@@ -3,6 +3,7 @@ title = "Installing via provisioning tools"
 description = "Guide to install Grafana via provisioning tools like puppet & chef"
 keywords = ["grafana", "provisioning", "documentation", "puppet", "chef", "ansible"]
 type = "docs"
+aliases = ["docs/provisioning"]
 [menu.docs]
 parent = "installation"
 weight = 8

From 87027b0f775921aca0ee5b47f0f45c6564f47ac8 Mon Sep 17 00:00:00 2001
From: Denis Doria <denisdoria@gmail.com>
Date: Sat, 18 Mar 2017 15:23:40 +0100
Subject: [PATCH 250/301] Do not collapse if there is only 1-3 queries #7836
 (#7878)

Also has the side effect of new panels having not collapsed queries when
being created
---
 public/app/features/panel/query_editor_row.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/app/features/panel/query_editor_row.ts b/public/app/features/panel/query_editor_row.ts
index 76bdd6d8539..8249d84774f 100644
--- a/public/app/features/panel/query_editor_row.ts
+++ b/public/app/features/panel/query_editor_row.ts
@@ -29,6 +29,10 @@ export class QueryRowCtrl {
       delete this.target.isNew;
       this.toggleCollapse(false);
     }
+
+    if (this.panel.targets.length < 4) {
+      this.collapsed = false;
+    }
   }
 
   toggleHideQuery() {

From 5785bfe0cc02dc664e4773aa4b134286563a3f2b Mon Sep 17 00:00:00 2001
From: Jens L <jens@beryju.org>
Date: Mon, 20 Mar 2017 08:36:43 +0100
Subject: [PATCH 251/301] Add more information for generic oauth2 (#7880)

Add reference to OpenID's userinfo_endpoint (as in #6351)
---
 docs/sources/installation/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index ba44dd30658..50d28560672 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -410,7 +410,7 @@ browser to access Grafana, but with the prefix path of `/login/generic_oauth`.
     allowed_domains = mycompany.com mycompany.org
     allow_sign_up = true
 
-Set api_url to the resource that returns basic user info.
+Set api_url to the resource that returns [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo) compatible information.
 
 <hr>
 

From a67497e6798d4120a8a69e5d6924bf0157ced474 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Mon, 20 Mar 2017 17:09:08 +0900
Subject: [PATCH 252/301] add new s3 metrics (#7846)

---
 pkg/api/cloudwatch/metrics.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
index b41bb20d6c8..67f35a60aa7 100644
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -81,7 +81,7 @@ func init() {
 		"AWS/Redshift":         {"CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "ReadIOPS", "ReadLatency", "ReadThroughput", "WriteIOPS", "WriteLatency", "WriteThroughput"},
 		"AWS/RDS":              {"ActiveTransactions", "AuroraBinlogReplicaLag", "AuroraReplicaLag", "AuroraReplicaLagMaximum", "AuroraReplicaLagMinimum", "BinLogDiskUsage", "BlockedTransactions", "BufferCacheHitRatio", "CommitLatency", "CommitThroughput", "CPUCreditBalance", "CPUCreditUsage", "CPUUtilization", "DatabaseConnections", "DDLLatency", "DDLThroughput", "Deadlocks", "DiskQueueDepth", "DMLLatency", "DMLThroughput", "FailedSqlStatements", "FreeableMemory", "FreeStorageSpace", "LoginFailures", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "ReadIOPS", "ReadLatency", "ReadThroughput", "ReplicaLag", "ResultSetCacheHitRatio", "SelectLatency", "SelectThroughput", "SwapUsage", "TotalConnections", "VolumeReadIOPS", "VolumeWriteIOPS", "WriteIOPS", "WriteLatency", "WriteThroughput"},
 		"AWS/Route53":          {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"},
-		"AWS/S3":               {"BucketSizeBytes", "NumberOfObjects"},
+		"AWS/S3":               {"BucketSizeBytes", "NumberOfObjects", "AllRequests", "GetRequests", "PutRequests", "DeleteRequests", "HeadRequests", "PostRequests", "ListRequests", "BytesDownloaded", "BytesUploaded", "4xxErrors", "5xxErrors", "FirstByteLatency", "TotalRequestLatency"},
 		"AWS/SES":              {"Bounce", "Complaint", "Delivery", "Reject", "Send"},
 		"AWS/SNS":              {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"},
 		"AWS/SQS":              {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"},
@@ -123,7 +123,7 @@ func init() {
 		"AWS/Redshift":         {"NodeID", "ClusterIdentifier"},
 		"AWS/RDS":              {"DBInstanceIdentifier", "DBClusterIdentifier", "DatabaseClass", "EngineName"},
 		"AWS/Route53":          {"HealthCheckId"},
-		"AWS/S3":               {"BucketName", "StorageType"},
+		"AWS/S3":               {"BucketName", "StorageType", "FilterId"},
 		"AWS/SES":              {},
 		"AWS/SNS":              {"Application", "Platform", "TopicName"},
 		"AWS/SQS":              {"QueueName"},

From 4d4e165be77ac2824d12b7159cce10cddd543182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 10:20:32 +0100
Subject: [PATCH 253/301] links: updated links from grafana.net to grafana.com

---
 conf/defaults.ini                             |  8 +++---
 conf/sample.ini                               | 10 +++----
 docs/sources/features/datasources/index.md    |  2 +-
 docs/sources/guides/whats-new-in-v3-1.md      |  6 ++--
 docs/sources/guides/whats-new-in-v3.md        | 28 +++++++++----------
 .../plugins/developing/code-styleguide.md     |  2 +-
 .../sources/plugins/developing/plugin.json.md |  2 +-
 docs/sources/plugins/installation.md          |  2 +-
 docs/sources/reference/export_import.md       | 12 ++++----
 pkg/cmd/grafana-cli/main.go                   |  2 +-
 pkg/plugins/update_checker.go                 |  6 ++--
 pkg/setting/setting.go                        |  2 +-
 public/app/core/components/search/search.html |  2 +-
 .../features/dashboard/dashnav/dashnav.html   |  2 +-
 .../dashboard/export/export_modal.html        |  2 +-
 .../dashboard/import/dash_import.html         |  6 ++--
 .../features/dashboard/import/dash_import.ts  |  2 +-
 .../dashboard/specs/dash_import_ctrl_specs.ts |  4 +--
 .../plugins/partials/plugin_list.html         |  2 +-
 .../plugins/partials/update_instructions.html |  2 +-
 public/app/partials/login.html                |  2 +-
 .../app/plugins/datasource/influxdb/README.md |  6 ++--
 .../plugins/panel/gettingstarted/module.ts    |  2 +-
 .../app/plugins/panel/pluginlist/module.html  |  2 +-
 24 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index d8b53b167ca..9f2c9ed6de3 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -132,11 +132,11 @@ logging = false
 # Change this option to false to disable reporting.
 reporting_enabled = true
 
-# Set to false to disable all checks to https://grafana.net
+# Set to false to disable all checks to https://grafana.com
 # for new vesions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
 # This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.net to get latest versions
+# only a GET request to https://grafana.com to get latest versions
 check_for_updates = true
 
 # Google Analytics universal tracking code, only enabled if you specify an id here
@@ -243,7 +243,7 @@ api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
 hosted_domain =
 
-#################################### Grafana.net Auth ####################
+#################################### Grafana.com Auth ####################
 [auth.grafananet]
 enabled = false
 allow_sign_up = true
@@ -426,7 +426,7 @@ address =
 prefix = prod.grafana.%(instance_name)s.
 
 [grafana_net]
-url = https://grafana.net
+url = https://grafana.com
 
 #################################### External Image Storage ##############
 [external_image_storage]
diff --git a/conf/sample.ini b/conf/sample.ini
index 969c64cb036..3b7415e4217 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -129,7 +129,7 @@
 # for new vesions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
 # This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.net to get latest versions
+# only a GET request to http://grafana.com to get latest versions
 ;check_for_updates = true
 
 # Google Analytics universal tracking code, only enabled if you specify an id here
@@ -243,7 +243,7 @@
 ;team_ids =
 ;allowed_organizations =
 
-#################################### Grafana.net Auth ####################
+#################################### Grafana.com Auth ####################
 [auth.grafananet]
 ;enabled = false
 ;allow_sign_up = true
@@ -379,10 +379,10 @@
 ;address =
 ;prefix = prod.grafana.%(instance_name)s.
 
-#################################### Internal Grafana Metrics ##########################
-# Url used to to import dashboards directly from Grafana.net
+#################################### Grafana.com integration  ##########################
+# Url used to to import dashboards directly from Grafana.com
 [grafana_net]
-;url = https://grafana.net
+;url = https://grafana.com
 
 #################################### External image storage ##########################
 [external_image_storage]
diff --git a/docs/sources/features/datasources/index.md b/docs/sources/features/datasources/index.md
index fcef3370455..16a8578ed3e 100644
--- a/docs/sources/features/datasources/index.md
+++ b/docs/sources/features/datasources/index.md
@@ -30,5 +30,5 @@ The following datasources are officially supported:
 
 ## Data source plugins
 
-Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.net/plugins) for more data sources.
+Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.com/plugins) for more data sources.
 
diff --git a/docs/sources/guides/whats-new-in-v3-1.md b/docs/sources/guides/whats-new-in-v3-1.md
index 3f1c25eb937..1e8ef87297b 100644
--- a/docs/sources/guides/whats-new-in-v3-1.md
+++ b/docs/sources/guides/whats-new-in-v3-1.md
@@ -26,7 +26,7 @@ select data source and optional metrix prefix options.
 <img src="/img/docs/v31/import_step1.png">
 
 The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard.
-One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net).
+One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.com](https://grafana.com).
 
 The next step in the import process:
 
@@ -37,9 +37,9 @@ shows a CollectD dashboard for Graphite that requires a metric prefix be specifi
 
 ## Discover Dashboards
 
-On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but
+On [Grafana.com](https://grafana.com) you can now browse & search for dashboards. We have already added a few but
 more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana,
-then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL.
+then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL.
 
 <img src="/img/docs/v31/gnet_dashboards_list.png">
 
diff --git a/docs/sources/guides/whats-new-in-v3.md b/docs/sources/guides/whats-new-in-v3.md
index fd4d1e40a18..d82a833ec90 100644
--- a/docs/sources/guides/whats-new-in-v3.md
+++ b/docs/sources/guides/whats-new-in-v3.md
@@ -14,7 +14,7 @@ weight = 6
 
 ## Commercial Support
 
-Commercial Support subscriptions for Grafana are now [generally available](https://grafana.net/support/plans/).
+Commercial Support subscriptions for Grafana are now [generally available](https://grafana.com/support/plans/).
 
 Raintank is committed to a 100% open-source strategy for Grafana. We
 do not want to go down the “open core” route. If your organization
@@ -41,15 +41,15 @@ two new plugin types:
 Dashboards, and Grafana **Pages**. Apps are a great way to provide an
 entire experience right within Grafana.
 
-## Grafana.net
+## Grafana.com
 
 <img src="/img/docs/v3/grafana_net_tour.png">
 
-[Grafana.net](https://grafana.net) offers a central repository where the community can come together to discover, create and
+[Grafana.com](https://grafana.com) offers a central repository where the community can come together to discover, create and
 share plugins (data sources, panels, apps) and dashboards.
 
 We are also working on a hosted Graphite-compatible data source that will be optimized for use with Grafana.
-It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.net can
+It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.com can
 also be a hub to manage all your Grafana instances. You’ll be able to monitor their health and availability,
 perform dashboard backups, and more.
 
@@ -57,12 +57,12 @@ We are also working on a hosted Graphite-compatible Data Source that
 will be optimized for use with Grafana. It’ll be easy to combine your
 existing Data Source(s) with this OpenSaaS option.
 
-Finally, Grafana.net will also be a hub to manage all your Grafana
+Finally, Grafana.com will also be a hub to manage all your Grafana
 instances. You’ll be able to monitor their health and availability,
 perform Dashboard backups, and more.
 
 Grafana.net will officially launch along with the stable version of
-Grafana 3.0, but <a href=http://www.grafana.net>check out the preview
+Grafana 3.0, but go to <a href=https://grafana.com> and check out the preview
 and sign up for an account</a> in the meantime.
 
 
@@ -189,37 +189,37 @@ variable is interpolated.
 data source (or panel) they need to be updated as well.
 
 * InfluxDB 0.8: This data source is no longer included in releases,
-you can still install manually from [Grafana.net](http://grafana.net)
+you can still install manually from [Grafana.com](https://grafana.com)
 
 * KairosDB: This data source has also no longer shipped with Grafana,
-you can install it manually from [Grafana.net](http://grafana.net)
+you can install it manually from [Grafana.com](https://grafana.com)
 
 ## Plugin showcase
 
-Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.net](https://grafana.net). Here
+Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.com](https://grafana.com). Here
 are a couple that I incurage you try!
 
-#### [Clock Panel](https://grafana.net/plugins/grafana-clock-panel)
+#### [Clock Panel](https://grafana.com/plugins/grafana-clock-panel)
 Support's both current time and count down mode.
 <img src="/img/docs/v3/clock_panel.png">
 
-#### [Pie Chart Panel](https://grafana.net/plugins/grafana-piechart-panel)
+#### [Pie Chart Panel](https://grafana.com/plugins/grafana-piechart-panel)
 A simple pie chart panel is now available as an external plugin.
 <img src="/img/docs/v3/pie_chart_panel.png">
 
-#### [WorldPing App](https://grafana.net/plugins/raintank-worldping-app)
+#### [WorldPing App](https://grafana.com/plugins/raintank-worldping-app)
 This is full blown Grafana App that adds new panels, data sources and pages to give
 feature rich global performance monitoring directly from your on-prem Grafana.
 
 <img src="/img/docs/v3/wP-Screenshot-dash-web.png">
 
-#### [Zabbix App](https://grafana.net/plugins/alexanderzobnin-zabbix-app)
+#### [Zabbix App](https://grafana.com/plugins/alexanderzobnin-zabbix-app)
 This app contains the already very pouplar Zabbix data source plugin, 2 dashboards and a triggers panel. It is
 created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/grafana-zabbix).
 
 <img src="/img/docs/v3/zabbix_app.png">
 
-Checkout the full list of plugins on [Grafana.net](https://grafana.net/plugins)
+Checkout the full list of plugins on [Grafana.com](https://grafana.com/plugins)
 
 ## CHANGELOG
 
diff --git a/docs/sources/plugins/developing/code-styleguide.md b/docs/sources/plugins/developing/code-styleguide.md
index 99d9f565c7d..44379c4d4e5 100644
--- a/docs/sources/plugins/developing/code-styleguide.md
+++ b/docs/sources/plugins/developing/code-styleguide.md
@@ -13,7 +13,7 @@ This guide has two parts. The first part describes the metadata and the second p
 
 ## Metadata
 
-The plugin metadata consists of a plugin.json file and the README.md file. These two files are used by Grafana and Grafana.net.
+The plugin metadata consists of a plugin.json file and the README.md file. These two files are used by Grafana and Grafana.com.
 
 ### Plugin.json (mandatory)
 
diff --git a/docs/sources/plugins/developing/plugin.json.md b/docs/sources/plugins/developing/plugin.json.md
index 8d94ca93af5..7de5e91986f 100644
--- a/docs/sources/plugins/developing/plugin.json.md
+++ b/docs/sources/plugins/developing/plugin.json.md
@@ -19,7 +19,7 @@ The plugin.json file is mandatory for all plugins. When Grafana starts it will s
 | id | unique name of the plugin - [conventions described in styleguide]({{< relref "code-styleguide.md" >}}) |
 | type | panel/datasource/app |
 | name | Human readable name of the plugin |
-| info.description | Description of plugin. Used for searching grafana net plugins |
+| info.description | Description of plugin. Used for searching grafana.com plugins |
 | info.author | |
 | info.keywords | plugin keywords. Used for search on grafana net|
 | info.logos | link to project logos |
diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md
index 5880d18c0e3..745d7ce2304 100644
--- a/docs/sources/plugins/installation.md
+++ b/docs/sources/plugins/installation.md
@@ -17,7 +17,7 @@ Grafana already have a strong community of contributors and plugin developers.
 By making it easier to develop and install plugins we hope that the community
 can grow even stronger and develop new plugins that we would never think about.
 
-To discover plugins checkout the official [Plugin Repository](https://grafana.net/plugins).
+To discover plugins checkout the official [Plugin Repository](https://grafana.com/plugins).
 
 # Installing plugins
 
diff --git a/docs/sources/reference/export_import.md b/docs/sources/reference/export_import.md
index bc05795c030..4c2d5faa3d3 100644
--- a/docs/sources/reference/export_import.md
+++ b/docs/sources/reference/export_import.md
@@ -33,7 +33,7 @@ To import a dashboard open dashboard search and then hit the import button.
 
 <img src="/img/docs/v31/import_step1.png">
 
-From here you can upload a dashboard json file, paste a [Grafana.net](https://grafana.net) dashboard
+From here you can upload a dashboard json file, paste a [Grafana.com](https://grafana.com) dashboard
 url or paste dashboard json text directly into the text area.
 
 <img src="/img/docs/v31/import_step2.png">
@@ -41,15 +41,15 @@ url or paste dashboard json text directly into the text area.
 In step 2 of the import process Grafana will let you change the name of the dashboard, pick what
 data source you want the dashboard to use and specify any metric prefixes (if the dashboard use any).
 
-## Discover dashboards on Grafana.net
+## Discover dashboards on Grafana.com
 
-Find dashboards for common server applications at [Grafana.net/dashboards](https://grafana.net/dashboards).
+Find dashboards for common server applications at [Grafana.com/dashboards](https://grafana.com/dashboards).
 
 <img src="/img/docs/v31/gnet_dashboards_list.png">
 
 ## Import & Sharing with Grafana 2.x or 3.0
 
-Dashboards on Grafana.net use a new feature in Grafana 3.1 that allows the import process
+Dashboards on Grafana.com use a new feature in Grafana 3.1 that allows the import process
 to update each panel so that they are using a data source of your choosing. If you are running a
 Grafana version older than 3.1 then you might need to do some manual steps either
 before or after import in order for the dashboard to work properly.
@@ -99,10 +99,10 @@ These are then referenced in the dashboard panels like this:
 ```
 
 These inputs and their usage in data source properties are automatically added during export in Grafana 3.1.
-If you run an older version of Grafana and want to share a dashboard on Grafana.net you need to manually
+If you run an older version of Grafana and want to share a dashboard on Grafana.com you need to manually
 add the inputs and templatize the datasource properties like above.
 
-If you want to import a dashboard from Grafana.net into an older version of Grafana then you can either import
+If you want to import a dashboard from Grafana.com into an older version of Grafana then you can either import
 it as usual and then update the data source option in the metrics tab so that the panel is using the correct
 data source. Another alternative is to open the json file in a a text editor and update the data source properties
 to value that matches a name of your data source.
diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
index 658edd0f895..e586e606fb5 100644
--- a/pkg/cmd/grafana-cli/main.go
+++ b/pkg/cmd/grafana-cli/main.go
@@ -35,7 +35,7 @@ func main() {
 		cli.StringFlag{
 			Name:   "repo",
 			Usage:  "url to the plugin repository",
-			Value:  "https://grafana.net/api/plugins",
+			Value:  "https://grafana.com/api/plugins",
 			EnvVar: "GF_PLUGIN_REPO",
 		},
 		cli.BoolFlag{
diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go
index 76c566803ac..a2594ad915a 100644
--- a/pkg/plugins/update_checker.go
+++ b/pkg/plugins/update_checker.go
@@ -60,7 +60,7 @@ func checkForUpdates() {
 	log.Trace("Checking for updates")
 
 	pluginSlugs := getAllExternalPluginSlugs()
-	resp, err := httpClient.Get("https://grafana.net/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion)
+	resp, err := httpClient.Get("https://grafana.com/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion)
 
 	if err != nil {
 		log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error())
@@ -71,14 +71,14 @@ func checkForUpdates() {
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		log.Trace("Update check failed, reading response from grafana.net, %v", err.Error())
+		log.Trace("Update check failed, reading response from grafana.com, %v", err.Error())
 		return
 	}
 
 	gNetPlugins := []GrafanaNetPlugin{}
 	err = json.Unmarshal(body, &gNetPlugins)
 	if err != nil {
-		log.Trace("Failed to unmarshal plugin repo, reading response from grafana.net, %v", err.Error())
+		log.Trace("Failed to unmarshal plugin repo, reading response from grafana.com, %v", err.Error())
 		return
 	}
 
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index a5f46170db5..99390ecc1c9 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -574,7 +574,7 @@ func NewConfigContext(args *CommandLineArgs) error {
 		log.Warn("require_email_validation is enabled but smpt is disabled")
 	}
 
-	GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.net")
+	GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.com")
 
 	imageUploadingSection := Cfg.Section("external_image_storage")
 	ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")
diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index cc021bb69ed..91959114216 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -68,7 +68,7 @@
 			Import
 		</a>
 
-		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.net/dashboards?utm_source=grafana_search">
+		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.com/dashboards?utm_source=grafana_search">
       Find dashboards on
 		</a>
 
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index 7cb22c756cd..7deb46931c2 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -50,7 +50,7 @@
       <li>
 				<a class="pointer" ng-click="shareDashboard(2)">
 					<i class="fa fa-cloud-upload"></i>Export
-					<div class="dropdown-desc">Export the dashboard to a JSON file for others and to share on Grafana.net</div>
+					<div class="dropdown-desc">Export the dashboard to a JSON file for others and to share on Grafana.com</div>
 				</a>
 			</li>
 		</ul>
diff --git a/public/app/features/dashboard/export/export_modal.html b/public/app/features/dashboard/export/export_modal.html
index e890e405020..8533a4beea0 100644
--- a/public/app/features/dashboard/export/export_modal.html
+++ b/public/app/features/dashboard/export/export_modal.html
@@ -12,7 +12,7 @@
 		<p class="share-modal-info-text">
 			Export the dashboard to a JSON file. The exporter will templatize the
 			dashboard's data sources to make it easy for other's to to import and reuse.
-			You can share dashboards on <a class="external-link" href="https://grafana.net">Grafana.net</a>
+			You can share dashboards on <a class="external-link" href="https://grafana.com">Grafana.com</a>
 		</p>
 
 		<div class="gf-form-button-row">
diff --git a/public/app/features/dashboard/import/dash_import.html b/public/app/features/dashboard/import/dash_import.html
index 5e19a02c28c..8a42d64c0c5 100644
--- a/public/app/features/dashboard/import/dash_import.html
+++ b/public/app/features/dashboard/import/dash_import.html
@@ -18,11 +18,11 @@
 				<dash-upload on-upload="ctrl.onUpload(dash)"></dash-upload>
 			</form>
 
-			<h5 class="section-heading">Grafana.net Dashboard</h5>
+			<h5 class="section-heading">Grafana.com Dashboard</h5>
 
       <div class="gf-form-group">
 				<div class="gf-form">
-					<input type="text" class="gf-form-input" ng-model="ctrl.gnetUrl" placeholder="Paste Grafana.net dashboard url or id" ng-blur="ctrl.checkGnetDashboard()"></textarea>
+					<input type="text" class="gf-form-input" ng-model="ctrl.gnetUrl" placeholder="Paste Grafana.com dashboard url or id" ng-blur="ctrl.checkGnetDashboard()"></textarea>
 				</div>
         <div class="gf-form" ng-if="ctrl.gnetError">
           <label class="gf-form-label text-warning">
@@ -53,7 +53,7 @@
 			<div class="gf-form-group" ng-if="ctrl.dash.gnetId">
         <h3 class="section-heading">
           Importing Dashboard from
-          <a href="https://grafana.net/dashboards/{{ctrl.dash.gnetId}}" class="external-link" target="_blank">Grafana.net</a>
+          <a href="https://grafana.com/dashboards/{{ctrl.dash.gnetId}}" class="external-link" target="_blank">Grafana.com</a>
         </h3>
 
         <div class="gf-form">
diff --git a/public/app/features/dashboard/import/dash_import.ts b/public/app/features/dashboard/import/dash_import.ts
index a0856814e94..ff71df82dd6 100644
--- a/public/app/features/dashboard/import/dash_import.ts
+++ b/public/app/features/dashboard/import/dash_import.ts
@@ -147,7 +147,7 @@ export class DashImportCtrl {
 
     return this.backendSrv.get('api/gnet/dashboards/' + dashboardId).then(res => {
       this.gnetInfo = res;
-      // store reference to grafana.net
+      // store reference to grafana.com
       res.json.gnetId = res.id;
       this.onUpload(res.json);
     }).catch(err => {
diff --git a/public/app/features/dashboard/specs/dash_import_ctrl_specs.ts b/public/app/features/dashboard/specs/dash_import_ctrl_specs.ts
index 9e56a5081e3..97983d60dc9 100644
--- a/public/app/features/dashboard/specs/dash_import_ctrl_specs.ts
+++ b/public/app/features/dashboard/specs/dash_import_ctrl_specs.ts
@@ -47,9 +47,9 @@ describe('DashImportCtrl', function() {
     });
   });
 
-  describe('when specifing grafana.net url', function() {
+  describe('when specifing grafana.com url', function() {
     beforeEach(function() {
-      ctx.ctrl.gnetUrl = 'http://grafana.net/dashboards/123';
+      ctx.ctrl.gnetUrl = 'http://grafana.com/dashboards/123';
       // setup api mock
       backendSrv.get = sinon.spy(() => {
         return Promise.resolve({
diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html
index 7cfb14d238d..a396b9d5265 100644
--- a/public/app/features/plugins/partials/plugin_list.html
+++ b/public/app/features/plugins/partials/plugin_list.html
@@ -26,7 +26,7 @@
 				</li>
 			</ul>
 
-      <a class="get-more-plugins-link" href="https://grafana.net/plugins?utm_source=grafana_plugin_list" target="_blank">
+      <a class="get-more-plugins-link" href="https://grafana.com/plugins?utm_source=grafana_plugin_list" target="_blank">
         Find more plugins on
       </a>
     </div>
diff --git a/public/app/features/plugins/partials/update_instructions.html b/public/app/features/plugins/partials/update_instructions.html
index 9648be53c86..1a3bdeefaaf 100644
--- a/public/app/features/plugins/partials/update_instructions.html
+++ b/public/app/features/plugins/partials/update_instructions.html
@@ -14,7 +14,7 @@
 		<div class="gf-form-group">
 			<p>Type the following on the command line to update {{plugin.name}}.</p>
 			<pre><code>grafana-cli plugins update {{plugin.id}}</code></pre>
-			<span class="small">Check out {{plugin.name}} on <a href="https://grafana.net/plugins/{{plugin.id}}">Grafana.net</a> for README and changelog. If you do not have access to the command line, ask your Grafana administator.</span>
+			<span class="small">Check out {{plugin.name}} on <a href="https://grafana.com/plugins/{{plugin.id}}">Grafana.com</a> for README and changelog. If you do not have access to the command line, ask your Grafana administator.</span>
 		</div>
 		<p class="pluginlist-none-installed"><img class="pluginlist-inline-logo" src="public/img/grafana_icon.svg"><strong>Pro tip</strong>: To update all plugins at once, type <code class="code--small">grafana-cli plugins update-all</code> on the command line.</div>
 	</div>
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 6ef9c3b1501..1e457a99b71 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -60,7 +60,7 @@
 						with GitHub
 					</a>
 					<a class="btn btn-large btn-grafana-net" href="login/grafananet" target="_self" ng-if="oauth.grafananet">
-						with <span>Grafana.net</span>
+						with <span>Grafana.com</span>
 					</a>
 					<a class="btn btn-large btn-generic-oauth" href="login/generic_oauth" target="_self" ng-if="oauth.generic_oauth">
 						<i class="fa fa-gear"></i>
diff --git a/public/app/plugins/datasource/influxdb/README.md b/public/app/plugins/datasource/influxdb/README.md
index d8d98cf5c6b..aca126db36c 100644
--- a/public/app/plugins/datasource/influxdb/README.md
+++ b/public/app/plugins/datasource/influxdb/README.md
@@ -1,12 +1,12 @@
 # InfluxDB Datasource -  Native Plugin
 
-Grafana ships with **built in** support for InfluxDB 0.9. 
+Grafana ships with **built in** support for InfluxDB 0.9.
 
 There are currently two separate datasources for InfluxDB in Grafana: InfluxDB 0.8.x and InfluxDB 0.9.x. The API and capabilities of InfluxDB 0.9.x are completely different from InfluxDB 0.8.x which is why Grafana handles them as different data sources.
 
-This is the plugin for InfluxDB 0.9. It is rapidly evolving and we continue to track its API. 
+This is the plugin for InfluxDB 0.9. It is rapidly evolving and we continue to track its API.
 
-InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users. You can find it [here](https://grafana.net/plugins/grafana-influxdb-08-datasource).
+InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users. You can find it [here](https://grafana.com/plugins/grafana-influxdb-08-datasource).
 
 Read more about InfluxDB here:
 
diff --git a/public/app/plugins/panel/gettingstarted/module.ts b/public/app/plugins/panel/gettingstarted/module.ts
index 9e19cce1063..4ebc76f942e 100644
--- a/public/app/plugins/panel/gettingstarted/module.ts
+++ b/public/app/plugins/panel/gettingstarted/module.ts
@@ -69,7 +69,7 @@ class GettingStartedPanelCtrl extends PanelCtrl {
       title: 'Install apps & plugins',
       cta: 'Explore plugin repository',
       icon: 'icon-gf icon-gf-apps',
-      href: 'https://grafana.net/plugins?utm_source=grafana_getting_started',
+      href: 'https://grafana.com/plugins?utm_source=grafana_getting_started',
       check: () => {
         return this.backendSrv.get('api/plugins', {embedded: 0, core: 0}).then(plugins => {
           return plugins.length > 0;
diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html
index 1cf7cfac34f..1b2792b510c 100644
--- a/public/app/plugins/panel/pluginlist/module.html
+++ b/public/app/plugins/panel/pluginlist/module.html
@@ -22,7 +22,7 @@
       </a>
     </div>
     <div class="pluginlist-item" ng-show="category.list.length === 0">
-      <a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="https://grafana.net/plugins">
+      <a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="https://grafana.com/plugins">
         <span class="pluginlist-none-installed">None installed. <span class="pluginlist-emphasis">Browse Grafana.net</span></span>
       </a>
     </div>

From 6f324cd7942df3165d02aeeb025151b2e3e509ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 11:18:29 +0100
Subject: [PATCH 254/301] refactor: minor refactorings of #7876

---
 public/app/features/org/org_users_ctrl.ts     | 21 +++++++------------
 .../partials/{addUser.html => add_user.html}  |  0
 .../app/features/org/partials/orgUsers.html   | 12 ++++-------
 3 files changed, 12 insertions(+), 21 deletions(-)
 rename public/app/features/org/partials/{addUser.html => add_user.html} (100%)

diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts
index d6b594037b6..6181edddc9a 100644
--- a/public/app/features/org/org_users_ctrl.ts
+++ b/public/app/features/org/org_users_ctrl.ts
@@ -10,6 +10,7 @@ export class OrgUsersCtrl {
   users: any;
   pendingInvites: any;
   editor: any;
+  showInviteUI: boolean;
 
   /** @ngInject */
   constructor(private $scope, private $http, private backendSrv) {
@@ -17,10 +18,10 @@ export class OrgUsersCtrl {
       loginOrEmail: '',
       role: 'Viewer',
     };
+
     this.get();
     this.editor = { index: 0 };
-
-    $scope.disableInvites = config.disableLoginForm;
+    this.showInviteUI = config.disableLoginForm === false;
   }
 
   get() {
@@ -52,17 +53,13 @@ export class OrgUsersCtrl {
 
   removeUserConfirmed(user) {
     this.backendSrv.delete('/api/org/users/' + user.userId)
-      .then(() => {
-        this.get();
-      });
+      .then(this.get.bind(this));
   }
 
   revokeInvite(invite, evt) {
     evt.stopPropagation();
     this.backendSrv.patch('/api/org/invites/' + invite.code + '/revoke')
-      .then(() => {
-        this.get();
-      });
+      .then(this.get.bind(this));
   }
 
   copyInviteToClipboard(evt) {
@@ -71,13 +68,11 @@ export class OrgUsersCtrl {
 
   openInviteModal() {
     var modalScope = this.$scope.$new();
-    modalScope.invitesSent = () => {
-      this.get();
-    };
+    modalScope.invitesSent = this.get.bind(this);
 
-    var src = !this.$scope.disableInvites
+    var src = this.showInviteUI
       ? 'public/app/features/org/partials/invite.html'
-      : 'public/app/features/org/partials/addUser.html';
+      : 'public/app/features/org/partials/add_user.html';
 
     this.$scope.appEvent('show-modal', {
       src: src,
diff --git a/public/app/features/org/partials/addUser.html b/public/app/features/org/partials/add_user.html
similarity index 100%
rename from public/app/features/org/partials/addUser.html
rename to public/app/features/org/partials/add_user.html
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index f40a8484337..8d348721301 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -6,13 +6,9 @@
 		<h1>Organization users</h1>
 
 		<div class="page-header-tabs">
-			<button class="btn btn-success" ng-click="ctrl.openInviteModal()" ng-show="!disableInvites">
+			<button class="btn btn-success" ng-click="ctrl.openInviteModal()">
 				<i class="fa fa-plus"></i>
-				Add or Invite
-			</button>
-			<button class="btn btn-success" ng-click="ctrl.openInviteModal()" ng-show="!!disableInvites">
-				<i class="fa fa-plus"></i>
-				Add
+        Add <span ng-show="ctrl.showInviteUI"> or Invite</span>
 			</button>
 
 			<ul class="gf-tabs">
@@ -21,7 +17,7 @@
 						Users ({{ctrl.users.length}})
 					</a>
 				</li>
-				<li class="gf-tabs-item" ng-show="!disableInvites">
+				<li class="gf-tabs-item" ng-show="ctrl.showInviteUI">
 					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
 						Pending Invitations ({{ctrl.pendingInvites.length}})
 					</a>
@@ -56,7 +52,7 @@
 		</table>
 	</div>
 
-	<div ng-if="ctrl.editor.index === 1 && !disableInvites">
+	<div ng-if="ctrl.editor.index === 1 && ctrl.showInviteUI">
 		<table class="filter-table form-inline">
 			<thead>
 				<tr>

From 54c6699c2bedc035a84ff2a1624324de9d286b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 11:37:33 +0100
Subject: [PATCH 255/301] usermanagement: disable invite features when login
 form is disabled, cherry picked from master, #7875

---
 pkg/api/frontendsettings.go                   |  1 +
 pkg/api/login.go                              |  4 ++
 pkg/api/org_invite.go                         |  4 ++
 public/app/features/org/org_users_ctrl.ts     | 26 ++++-----
 .../app/features/org/partials/add_user.html   | 55 +++++++++++++++++++
 .../app/features/org/partials/orgUsers.html   |  6 +-
 6 files changed, 80 insertions(+), 16 deletions(-)
 create mode 100644 public/app/features/org/partials/add_user.html

diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index c0e27897ff4..328b8abbc5f 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -142,6 +142,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 		"ldapEnabled":       setting.LdapEnabled,
 		"alertingEnabled":   setting.AlertingEnabled,
 		"googleAnalyticsId": setting.GoogleAnalyticsId,
+		"disableLoginForm":  setting.DisableLoginForm,
 		"buildInfo": map[string]interface{}{
 			"version":       setting.BuildVersion,
 			"commit":        setting.BuildCommit,
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 8fbe414c08c..8ab76c7b48d 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -94,6 +94,10 @@ func LoginApiPing(c *middleware.Context) {
 }
 
 func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) Response {
+	if setting.DisableLoginForm {
+		return ApiError(401, "Login is disabled", nil)
+	}
+
 	authQuery := login.LoginUserQuery{
 		Username: cmd.User,
 		Password: cmd.Password,
diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go
index 8d916677ed2..9e85808950f 100644
--- a/pkg/api/org_invite.go
+++ b/pkg/api/org_invite.go
@@ -38,6 +38,10 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
 		if err != m.ErrUserNotFound {
 			return ApiError(500, "Failed to query db for existing user check", err)
 		}
+
+		if setting.DisableLoginForm {
+			return ApiError(401, "User could not be found", nil)
+		}
 	} else {
 		return inviteExistingUserToOrg(c, userQuery.Result, &inviteDto)
 	}
diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts
index 9e70328f345..6181edddc9a 100644
--- a/public/app/features/org/org_users_ctrl.ts
+++ b/public/app/features/org/org_users_ctrl.ts
@@ -1,8 +1,8 @@
 ///<reference path="../../headers/common.d.ts" />
 
-import angular from 'angular';
+import config from 'app/core/config';
 import _ from 'lodash';
-import coreModule from '../../core/core_module';
+import coreModule from 'app/core/core_module';
 
 export class OrgUsersCtrl {
 
@@ -10,6 +10,7 @@ export class OrgUsersCtrl {
   users: any;
   pendingInvites: any;
   editor: any;
+  showInviteUI: boolean;
 
   /** @ngInject */
   constructor(private $scope, private $http, private backendSrv) {
@@ -17,8 +18,10 @@ export class OrgUsersCtrl {
       loginOrEmail: '',
       role: 'Viewer',
     };
+
     this.get();
     this.editor = { index: 0 };
+    this.showInviteUI = config.disableLoginForm === false;
   }
 
   get() {
@@ -50,17 +53,13 @@ export class OrgUsersCtrl {
 
   removeUserConfirmed(user) {
     this.backendSrv.delete('/api/org/users/' + user.userId)
-      .then(() => {
-        this.get();
-      });
+      .then(this.get.bind(this));
   }
 
   revokeInvite(invite, evt) {
     evt.stopPropagation();
     this.backendSrv.patch('/api/org/invites/' + invite.code + '/revoke')
-      .then(() => {
-        this.get();
-      });
+      .then(this.get.bind(this));
   }
 
   copyInviteToClipboard(evt) {
@@ -69,17 +68,18 @@ export class OrgUsersCtrl {
 
   openInviteModal() {
     var modalScope = this.$scope.$new();
-    modalScope.invitesSent = function() {
-      this.get();
-    };
+    modalScope.invitesSent = this.get.bind(this);
+
+    var src = this.showInviteUI
+      ? 'public/app/features/org/partials/invite.html'
+      : 'public/app/features/org/partials/add_user.html';
 
     this.$scope.appEvent('show-modal', {
-      src: 'public/app/features/org/partials/invite.html',
+      src: src,
       modalClass: 'invite-modal',
       scope: modalScope
     });
   }
-
 }
 
 coreModule.controller('OrgUsersCtrl', OrgUsersCtrl);
diff --git a/public/app/features/org/partials/add_user.html b/public/app/features/org/partials/add_user.html
new file mode 100644
index 00000000000..53fe7884df9
--- /dev/null
+++ b/public/app/features/org/partials/add_user.html
@@ -0,0 +1,55 @@
+<div class="modal-body" ng-controller="UserInviteCtrl" ng-init="init()">
+
+	<div class="modal-header">
+		<h2 class="modal-header-title">
+			Add Users
+		</h2>
+		<a class="modal-header-close" ng-click="dismiss();">
+			<i class="fa fa-remove"></i>
+		</a>
+	</div>
+
+	<div class="modal-content">
+
+		<div class="modal-tagline p-b-2">
+			Add existing Grafana users to the organization
+			<span class="highlight-word">{{contextSrv.user.orgName}}</span>
+		</div>
+
+		<form name="inviteForm">
+			<div class="gf-form-group">
+				<div class="gf-form-inline" ng-repeat="invite in invites">
+					<div class="gf-form max-width-21">
+						<span class="gf-form-label">Email or Username</span>
+						<input type="text" ng-model="invite.loginOrEmail" required class="gf-form-input" placeholder="email@test.com">
+					</div>
+					<div class="gf-form max-width-10">
+						<span class="gf-form-label">Role</span>
+						<select ng-model="invite.role" class="gf-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']">
+						</select>
+					</div>
+					<div class="gf-form gf-size-auto">
+						<a class="gf-form-label pointer" tabindex="1" ng-click="removeInvite(invite)">
+							<i class="fa fa-remove"></i>
+						</a>
+					</div>
+				</div>
+			</div>
+
+			<div class="gf-form-inline gf-form-group">
+				<div class="gf-form">
+					<a class="btn btn-inverse btn-small" ng-click="addInvite()">
+						<i class="fa fa-plus"></i>
+						Add another
+					</a>
+				</div>
+			</div>
+
+			<div class="gf-form-button-row">
+				<button type="submit" class="btn btn-success" ng-click="sendInvites();">Add Users</button>
+				<a class="btn-text" ng-click="dismiss()">Cancel</a>
+			</div>
+			<div class="clearfix"></div>
+		</form>
+	</div>
+</div>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 36b00b3bc03..8d348721301 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -8,7 +8,7 @@
 		<div class="page-header-tabs">
 			<button class="btn btn-success" ng-click="ctrl.openInviteModal()">
 				<i class="fa fa-plus"></i>
-				Add or Invite
+        Add <span ng-show="ctrl.showInviteUI"> or Invite</span>
 			</button>
 
 			<ul class="gf-tabs">
@@ -17,7 +17,7 @@
 						Users ({{ctrl.users.length}})
 					</a>
 				</li>
-				<li class="gf-tabs-item">
+				<li class="gf-tabs-item" ng-show="ctrl.showInviteUI">
 					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
 						Pending Invitations ({{ctrl.pendingInvites.length}})
 					</a>
@@ -52,7 +52,7 @@
 		</table>
 	</div>
 
-	<div ng-if="ctrl.editor.index === 1" >
+	<div ng-if="ctrl.editor.index === 1 && ctrl.showInviteUI">
 		<table class="filter-table form-inline">
 			<thead>
 				<tr>

From dce63ec1d8f4279c532904edc5e57a2d177b4034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 11:40:06 +0100
Subject: [PATCH 256/301] docs: updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33507c30e34..57a5670d1e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
 * **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge)
 * **Admin**: Global User List: add search and pagination [#7469](https://github.com/grafana/grafana/issues/7469)
+* **User Management**: Invite UI is now disabled when login form is disabled [#7875](https://github.com/grafana/grafana/issues/7875)
 
 ## Bugfixes
 * **Webhook**: Use proxy settings from environment variables [#7710](https://github.com/grafana/grafana/issues/7710)

From 711081950e89c8c29f3b987e5731b4ae48e2829e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 13:29:34 +0100
Subject: [PATCH 257/301] lib: updated dependency, fixes #7579

---
 vendor/github.com/klauspost/crc32/.gitignore  |  24 --
 vendor/github.com/klauspost/crc32/.travis.yml |  11 -
 vendor/github.com/klauspost/crc32/README.md   |   5 +-
 vendor/github.com/klauspost/crc32/crc32.go    | 169 +++++++-----
 .../github.com/klauspost/crc32/crc32_amd64.go | 230 +++++++++++++---
 .../github.com/klauspost/crc32/crc32_amd64.s  | 126 +++++++--
 .../klauspost/crc32/crc32_amd64p32.go         |  40 +--
 .../klauspost/crc32/crc32_amd64p32.s          |   4 +-
 .../klauspost/crc32/crc32_generic.go          |  95 +++++--
 .../klauspost/crc32/crc32_otherarch.go        |  15 ++
 .../github.com/klauspost/crc32/crc32_s390x.go |  91 +++++++
 .../github.com/klauspost/crc32/crc32_s390x.s  | 249 ++++++++++++++++++
 vendor/vendor.json                            |   6 +
 13 files changed, 867 insertions(+), 198 deletions(-)
 delete mode 100644 vendor/github.com/klauspost/crc32/.gitignore
 delete mode 100644 vendor/github.com/klauspost/crc32/.travis.yml
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_otherarch.go
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_s390x.go
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_s390x.s

diff --git a/vendor/github.com/klauspost/crc32/.gitignore b/vendor/github.com/klauspost/crc32/.gitignore
deleted file mode 100644
index daf913b1b34..00000000000
--- a/vendor/github.com/klauspost/crc32/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/vendor/github.com/klauspost/crc32/.travis.yml b/vendor/github.com/klauspost/crc32/.travis.yml
deleted file mode 100644
index c62e25f5a5b..00000000000
--- a/vendor/github.com/klauspost/crc32/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: go
-
-go:
-  - 1.3
-  - 1.4
-  - 1.5
-  - tip
-
-script: 
- - go test -v .
- - go test -v -race .
diff --git a/vendor/github.com/klauspost/crc32/README.md b/vendor/github.com/klauspost/crc32/README.md
index 440541c7ff3..029625d3609 100644
--- a/vendor/github.com/klauspost/crc32/README.md
+++ b/vendor/github.com/klauspost/crc32/README.md
@@ -12,12 +12,15 @@ Install using `go get github.com/klauspost/crc32`. This library is based on Go 1
 Replace `import "hash/crc32"` with `import "github.com/klauspost/crc32"` and you are good to go.
 
 # changes
-
+* Oct 20, 2016: Changes have been merged to upstream Go. Package updated to match.
 * Dec 4, 2015: Uses the "slice-by-8" trick more extensively, which gives a 1.5 to 2.5x speedup if assembler is unavailable.
 
 
 # performance
 
+For *Go 1.7* performance is equivalent to the standard library. So if you use this package for Go 1.7 you can switch back.
+
+
 For IEEE tables (the most common), there is approximately a factor 10 speedup with "CLMUL" (Carryless multiplication) instruction:
 ```
 benchmark            old ns/op     new ns/op     delta
diff --git a/vendor/github.com/klauspost/crc32/crc32.go b/vendor/github.com/klauspost/crc32/crc32.go
index b584e410350..8aa91b17e90 100644
--- a/vendor/github.com/klauspost/crc32/crc32.go
+++ b/vendor/github.com/klauspost/crc32/crc32.go
@@ -40,70 +40,96 @@ const (
 // Table is a 256-word table representing the polynomial for efficient processing.
 type Table [256]uint32
 
+// This file makes use of functions implemented in architecture-specific files.
+// The interface that they implement is as follows:
+//
+//    // archAvailableIEEE reports whether an architecture-specific CRC32-IEEE
+//    // algorithm is available.
+//    archAvailableIEEE() bool
+//
+//    // archInitIEEE initializes the architecture-specific CRC3-IEEE algorithm.
+//    // It can only be called if archAvailableIEEE() returns true.
+//    archInitIEEE()
+//
+//    // archUpdateIEEE updates the given CRC32-IEEE. It can only be called if
+//    // archInitIEEE() was previously called.
+//    archUpdateIEEE(crc uint32, p []byte) uint32
+//
+//    // archAvailableCastagnoli reports whether an architecture-specific
+//    // CRC32-C algorithm is available.
+//    archAvailableCastagnoli() bool
+//
+//    // archInitCastagnoli initializes the architecture-specific CRC32-C
+//    // algorithm. It can only be called if archAvailableCastagnoli() returns
+//    // true.
+//    archInitCastagnoli()
+//
+//    // archUpdateCastagnoli updates the given CRC32-C. It can only be called
+//    // if archInitCastagnoli() was previously called.
+//    archUpdateCastagnoli(crc uint32, p []byte) uint32
+
 // castagnoliTable points to a lazily initialized Table for the Castagnoli
 // polynomial. MakeTable will always return this value when asked to make a
 // Castagnoli table so we can compare against it to find when the caller is
 // using this polynomial.
 var castagnoliTable *Table
 var castagnoliTable8 *slicing8Table
+var castagnoliArchImpl bool
+var updateCastagnoli func(crc uint32, p []byte) uint32
 var castagnoliOnce sync.Once
 
 func castagnoliInit() {
-	castagnoliTable = makeTable(Castagnoli)
-	castagnoliTable8 = makeTable8(Castagnoli)
+	castagnoliTable = simpleMakeTable(Castagnoli)
+	castagnoliArchImpl = archAvailableCastagnoli()
+
+	if castagnoliArchImpl {
+		archInitCastagnoli()
+		updateCastagnoli = archUpdateCastagnoli
+	} else {
+		// Initialize the slicing-by-8 table.
+		castagnoliTable8 = slicingMakeTable(Castagnoli)
+		updateCastagnoli = func(crc uint32, p []byte) uint32 {
+			return slicingUpdate(crc, castagnoliTable8, p)
+		}
+	}
 }
 
 // IEEETable is the table for the IEEE polynomial.
-var IEEETable = makeTable(IEEE)
+var IEEETable = simpleMakeTable(IEEE)
 
-// slicing8Table is array of 8 Tables
-type slicing8Table [8]Table
+// ieeeTable8 is the slicing8Table for IEEE
+var ieeeTable8 *slicing8Table
+var ieeeArchImpl bool
+var updateIEEE func(crc uint32, p []byte) uint32
+var ieeeOnce sync.Once
 
-// iEEETable8 is the slicing8Table for IEEE
-var iEEETable8 *slicing8Table
-var iEEETable8Once sync.Once
+func ieeeInit() {
+	ieeeArchImpl = archAvailableIEEE()
 
-// MakeTable returns the Table constructed from the specified polynomial.
+	if ieeeArchImpl {
+		archInitIEEE()
+		updateIEEE = archUpdateIEEE
+	} else {
+		// Initialize the slicing-by-8 table.
+		ieeeTable8 = slicingMakeTable(IEEE)
+		updateIEEE = func(crc uint32, p []byte) uint32 {
+			return slicingUpdate(crc, ieeeTable8, p)
+		}
+	}
+}
+
+// MakeTable returns a Table constructed from the specified polynomial.
+// The contents of this Table must not be modified.
 func MakeTable(poly uint32) *Table {
 	switch poly {
 	case IEEE:
+		ieeeOnce.Do(ieeeInit)
 		return IEEETable
 	case Castagnoli:
 		castagnoliOnce.Do(castagnoliInit)
 		return castagnoliTable
 	}
-	return makeTable(poly)
-}
-
-// makeTable returns the Table constructed from the specified polynomial.
-func makeTable(poly uint32) *Table {
-	t := new(Table)
-	for i := 0; i < 256; i++ {
-		crc := uint32(i)
-		for j := 0; j < 8; j++ {
-			if crc&1 == 1 {
-				crc = (crc >> 1) ^ poly
-			} else {
-				crc >>= 1
-			}
-		}
-		t[i] = crc
-	}
-	return t
-}
-
-// makeTable8 returns slicing8Table constructed from the specified polynomial.
-func makeTable8(poly uint32) *slicing8Table {
-	t := new(slicing8Table)
-	t[0] = *makeTable(poly)
-	for i := 0; i < 256; i++ {
-		crc := t[0][i]
-		for j := 1; j < 8; j++ {
-			crc = t[0][crc&0xFF] ^ (crc >> 8)
-			t[j][i] = crc
-		}
-	}
-	return t
+	return simpleMakeTable(poly)
 }
 
 // digest represents the partial evaluation of a checksum.
@@ -114,10 +140,17 @@ type digest struct {
 
 // New creates a new hash.Hash32 computing the CRC-32 checksum
 // using the polynomial represented by the Table.
-func New(tab *Table) hash.Hash32 { return &digest{0, tab} }
+// Its Sum method will lay the value out in big-endian byte order.
+func New(tab *Table) hash.Hash32 {
+	if tab == IEEETable {
+		ieeeOnce.Do(ieeeInit)
+	}
+	return &digest{0, tab}
+}
 
 // NewIEEE creates a new hash.Hash32 computing the CRC-32 checksum
 // using the IEEE polynomial.
+// Its Sum method will lay the value out in big-endian byte order.
 func NewIEEE() hash.Hash32 { return New(IEEETable) }
 
 func (d *digest) Size() int { return Size }
@@ -126,43 +159,32 @@ func (d *digest) BlockSize() int { return 1 }
 
 func (d *digest) Reset() { d.crc = 0 }
 
-func update(crc uint32, tab *Table, p []byte) uint32 {
-	crc = ^crc
-	for _, v := range p {
-		crc = tab[byte(crc)^v] ^ (crc >> 8)
-	}
-	return ^crc
-}
-
-// updateSlicingBy8 updates CRC using Slicing-by-8
-func updateSlicingBy8(crc uint32, tab *slicing8Table, p []byte) uint32 {
-	crc = ^crc
-	for len(p) > 8 {
-		crc ^= uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
-		crc = tab[0][p[7]] ^ tab[1][p[6]] ^ tab[2][p[5]] ^ tab[3][p[4]] ^
-			tab[4][crc>>24] ^ tab[5][(crc>>16)&0xFF] ^
-			tab[6][(crc>>8)&0xFF] ^ tab[7][crc&0xFF]
-		p = p[8:]
-	}
-	crc = ^crc
-	if len(p) == 0 {
-		return crc
-	}
-	return update(crc, &tab[0], p)
-}
-
 // Update returns the result of adding the bytes in p to the crc.
 func Update(crc uint32, tab *Table, p []byte) uint32 {
-	if tab == castagnoliTable {
+	switch tab {
+	case castagnoliTable:
 		return updateCastagnoli(crc, p)
-	} else if tab == IEEETable {
+	case IEEETable:
+		// Unfortunately, because IEEETable is exported, IEEE may be used without a
+		// call to MakeTable. We have to make sure it gets initialized in that case.
+		ieeeOnce.Do(ieeeInit)
 		return updateIEEE(crc, p)
+	default:
+		return simpleUpdate(crc, tab, p)
 	}
-	return update(crc, tab, p)
 }
 
 func (d *digest) Write(p []byte) (n int, err error) {
-	d.crc = Update(d.crc, d.tab, p)
+	switch d.tab {
+	case castagnoliTable:
+		d.crc = updateCastagnoli(d.crc, p)
+	case IEEETable:
+		// We only create digest objects through New() which takes care of
+		// initialization in this case.
+		d.crc = updateIEEE(d.crc, p)
+	default:
+		d.crc = simpleUpdate(d.crc, d.tab, p)
+	}
 	return len(p), nil
 }
 
@@ -179,4 +201,7 @@ func Checksum(data []byte, tab *Table) uint32 { return Update(0, tab, data) }
 
 // ChecksumIEEE returns the CRC-32 checksum of data
 // using the IEEE polynomial.
-func ChecksumIEEE(data []byte) uint32 { return updateIEEE(0, data) }
+func ChecksumIEEE(data []byte) uint32 {
+	ieeeOnce.Do(ieeeInit)
+	return updateIEEE(0, data)
+}
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64.go b/vendor/github.com/klauspost/crc32/crc32_amd64.go
index 669fe17114e..af2a0b844bd 100644
--- a/vendor/github.com/klauspost/crc32/crc32_amd64.go
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64.go
@@ -1,62 +1,230 @@
-//+build !appengine,!gccgo
-
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build !appengine,!gccgo
+
+// AMD64-specific hardware-assisted CRC32 algorithms. See crc32.go for a
+// description of the interface that each architecture-specific file
+// implements.
+
 package crc32
 
+import "unsafe"
+
 // This file contains the code to call the SSE 4.2 version of the Castagnoli
 // and IEEE CRC.
 
-// haveSSE41/haveSSE42/haveCLMUL are defined in crc_amd64.s and uses
+// haveSSE41/haveSSE42/haveCLMUL are defined in crc_amd64.s and use
 // CPUID to test for SSE 4.1, 4.2 and CLMUL support.
 func haveSSE41() bool
 func haveSSE42() bool
 func haveCLMUL() bool
 
-// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
+// castagnoliSSE42 is defined in crc32_amd64.s and uses the SSE4.2 CRC32
 // instruction.
-// go:noescape
+//go:noescape
 func castagnoliSSE42(crc uint32, p []byte) uint32
 
+// castagnoliSSE42Triple is defined in crc32_amd64.s and uses the SSE4.2 CRC32
+// instruction.
+//go:noescape
+func castagnoliSSE42Triple(
+	crcA, crcB, crcC uint32,
+	a, b, c []byte,
+	rounds uint32,
+) (retA uint32, retB uint32, retC uint32)
+
 // ieeeCLMUL is defined in crc_amd64.s and uses the PCLMULQDQ
 // instruction as well as SSE 4.1.
-// go:noescape
+//go:noescape
 func ieeeCLMUL(crc uint32, p []byte) uint32
 
 var sse42 = haveSSE42()
 var useFastIEEE = haveCLMUL() && haveSSE41()
 
-func updateCastagnoli(crc uint32, p []byte) uint32 {
-	if sse42 {
-		return castagnoliSSE42(crc, p)
-	}
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		return updateSlicingBy8(crc, castagnoliTable8, p)
-	}
-	return update(crc, castagnoliTable, p)
+const castagnoliK1 = 168
+const castagnoliK2 = 1344
+
+type sse42Table [4]Table
+
+var castagnoliSSE42TableK1 *sse42Table
+var castagnoliSSE42TableK2 *sse42Table
+
+func archAvailableCastagnoli() bool {
+	return sse42
 }
 
-func updateIEEE(crc uint32, p []byte) uint32 {
-	if useFastIEEE && len(p) >= 64 {
+func archInitCastagnoli() {
+	if !sse42 {
+		panic("arch-specific Castagnoli not available")
+	}
+	castagnoliSSE42TableK1 = new(sse42Table)
+	castagnoliSSE42TableK2 = new(sse42Table)
+	// See description in updateCastagnoli.
+	//    t[0][i] = CRC(i000, O)
+	//    t[1][i] = CRC(0i00, O)
+	//    t[2][i] = CRC(00i0, O)
+	//    t[3][i] = CRC(000i, O)
+	// where O is a sequence of K zeros.
+	var tmp [castagnoliK2]byte
+	for b := 0; b < 4; b++ {
+		for i := 0; i < 256; i++ {
+			val := uint32(i) << uint32(b*8)
+			castagnoliSSE42TableK1[b][i] = castagnoliSSE42(val, tmp[:castagnoliK1])
+			castagnoliSSE42TableK2[b][i] = castagnoliSSE42(val, tmp[:])
+		}
+	}
+}
+
+// castagnoliShift computes the CRC32-C of K1 or K2 zeroes (depending on the
+// table given) with the given initial crc value. This corresponds to
+// CRC(crc, O) in the description in updateCastagnoli.
+func castagnoliShift(table *sse42Table, crc uint32) uint32 {
+	return table[3][crc>>24] ^
+		table[2][(crc>>16)&0xFF] ^
+		table[1][(crc>>8)&0xFF] ^
+		table[0][crc&0xFF]
+}
+
+func archUpdateCastagnoli(crc uint32, p []byte) uint32 {
+	if !sse42 {
+		panic("not available")
+	}
+
+	// This method is inspired from the algorithm in Intel's white paper:
+	//    "Fast CRC Computation for iSCSI Polynomial Using CRC32 Instruction"
+	// The same strategy of splitting the buffer in three is used but the
+	// combining calculation is different; the complete derivation is explained
+	// below.
+	//
+	// -- The basic idea --
+	//
+	// The CRC32 instruction (available in SSE4.2) can process 8 bytes at a
+	// time. In recent Intel architectures the instruction takes 3 cycles;
+	// however the processor can pipeline up to three instructions if they
+	// don't depend on each other.
+	//
+	// Roughly this means that we can process three buffers in about the same
+	// time we can process one buffer.
+	//
+	// The idea is then to split the buffer in three, CRC the three pieces
+	// separately and then combine the results.
+	//
+	// Combining the results requires precomputed tables, so we must choose a
+	// fixed buffer length to optimize. The longer the length, the faster; but
+	// only buffers longer than this length will use the optimization. We choose
+	// two cutoffs and compute tables for both:
+	//  - one around 512: 168*3=504
+	//  - one around 4KB: 1344*3=4032
+	//
+	// -- The nitty gritty --
+	//
+	// Let CRC(I, X) be the non-inverted CRC32-C of the sequence X (with
+	// initial non-inverted CRC I). This function has the following properties:
+	//   (a) CRC(I, AB) = CRC(CRC(I, A), B)
+	//   (b) CRC(I, A xor B) = CRC(I, A) xor CRC(0, B)
+	//
+	// Say we want to compute CRC(I, ABC) where A, B, C are three sequences of
+	// K bytes each, where K is a fixed constant. Let O be the sequence of K zero
+	// bytes.
+	//
+	// CRC(I, ABC) = CRC(I, ABO xor C)
+	//             = CRC(I, ABO) xor CRC(0, C)
+	//             = CRC(CRC(I, AB), O) xor CRC(0, C)
+	//             = CRC(CRC(I, AO xor B), O) xor CRC(0, C)
+	//             = CRC(CRC(I, AO) xor CRC(0, B), O) xor CRC(0, C)
+	//             = CRC(CRC(CRC(I, A), O) xor CRC(0, B), O) xor CRC(0, C)
+	//
+	// The castagnoliSSE42Triple function can compute CRC(I, A), CRC(0, B),
+	// and CRC(0, C) efficiently.  We just need to find a way to quickly compute
+	// CRC(uvwx, O) given a 4-byte initial value uvwx. We can precompute these
+	// values; since we can't have a 32-bit table, we break it up into four
+	// 8-bit tables:
+	//
+	//    CRC(uvwx, O) = CRC(u000, O) xor
+	//                   CRC(0v00, O) xor
+	//                   CRC(00w0, O) xor
+	//                   CRC(000x, O)
+	//
+	// We can compute tables corresponding to the four terms for all 8-bit
+	// values.
+
+	crc = ^crc
+
+	// If a buffer is long enough to use the optimization, process the first few
+	// bytes to align the buffer to an 8 byte boundary (if necessary).
+	if len(p) >= castagnoliK1*3 {
+		delta := int(uintptr(unsafe.Pointer(&p[0])) & 7)
+		if delta != 0 {
+			delta = 8 - delta
+			crc = castagnoliSSE42(crc, p[:delta])
+			p = p[delta:]
+		}
+	}
+
+	// Process 3*K2 at a time.
+	for len(p) >= castagnoliK2*3 {
+		// Compute CRC(I, A), CRC(0, B), and CRC(0, C).
+		crcA, crcB, crcC := castagnoliSSE42Triple(
+			crc, 0, 0,
+			p, p[castagnoliK2:], p[castagnoliK2*2:],
+			castagnoliK2/24)
+
+		// CRC(I, AB) = CRC(CRC(I, A), O) xor CRC(0, B)
+		crcAB := castagnoliShift(castagnoliSSE42TableK2, crcA) ^ crcB
+		// CRC(I, ABC) = CRC(CRC(I, AB), O) xor CRC(0, C)
+		crc = castagnoliShift(castagnoliSSE42TableK2, crcAB) ^ crcC
+		p = p[castagnoliK2*3:]
+	}
+
+	// Process 3*K1 at a time.
+	for len(p) >= castagnoliK1*3 {
+		// Compute CRC(I, A), CRC(0, B), and CRC(0, C).
+		crcA, crcB, crcC := castagnoliSSE42Triple(
+			crc, 0, 0,
+			p, p[castagnoliK1:], p[castagnoliK1*2:],
+			castagnoliK1/24)
+
+		// CRC(I, AB) = CRC(CRC(I, A), O) xor CRC(0, B)
+		crcAB := castagnoliShift(castagnoliSSE42TableK1, crcA) ^ crcB
+		// CRC(I, ABC) = CRC(CRC(I, AB), O) xor CRC(0, C)
+		crc = castagnoliShift(castagnoliSSE42TableK1, crcAB) ^ crcC
+		p = p[castagnoliK1*3:]
+	}
+
+	// Use the simple implementation for what's left.
+	crc = castagnoliSSE42(crc, p)
+	return ^crc
+}
+
+func archAvailableIEEE() bool {
+	return useFastIEEE
+}
+
+var archIeeeTable8 *slicing8Table
+
+func archInitIEEE() {
+	if !useFastIEEE {
+		panic("not available")
+	}
+	// We still use slicing-by-8 for small buffers.
+	archIeeeTable8 = slicingMakeTable(IEEE)
+}
+
+func archUpdateIEEE(crc uint32, p []byte) uint32 {
+	if !useFastIEEE {
+		panic("not available")
+	}
+
+	if len(p) >= 64 {
 		left := len(p) & 15
 		do := len(p) - left
-		crc := ^ieeeCLMUL(^crc, p[:do])
-		if left > 0 {
-			crc = update(crc, IEEETable, p[do:])
-		}
+		crc = ^ieeeCLMUL(^crc, p[:do])
+		p = p[do:]
+	}
+	if len(p) == 0 {
 		return crc
 	}
-
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		iEEETable8Once.Do(func() {
-			iEEETable8 = makeTable8(IEEE)
-		})
-		return updateSlicingBy8(crc, iEEETable8, p)
-	}
-
-	return update(crc, IEEETable, p)
+	return slicingUpdate(crc, archIeeeTable8, p)
 }
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64.s b/vendor/github.com/klauspost/crc32/crc32_amd64.s
index 1b1cd8b6740..e8a7941ce75 100644
--- a/vendor/github.com/klauspost/crc32/crc32_amd64.s
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64.s
@@ -1,60 +1,142 @@
-//+build gc
-
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build gc
+
 #define NOSPLIT 4
 #define RODATA 8
 
+// castagnoliSSE42 updates the (non-inverted) crc with the given buffer.
+//
 // func castagnoliSSE42(crc uint32, p []byte) uint32
 TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
 	MOVL crc+0(FP), AX    // CRC value
 	MOVQ p+8(FP), SI      // data pointer
 	MOVQ p_len+16(FP), CX // len(p)
 
-	NOTL AX
-
-	// If there's less than 8 bytes to process, we do it byte-by-byte.
+	// If there are fewer than 8 bytes to process, skip alignment.
 	CMPQ CX, $8
-	JL   cleanup
+	JL   less_than_8
 
-	// Process individual bytes until the input is 8-byte aligned.
-startup:
 	MOVQ SI, BX
 	ANDQ $7, BX
 	JZ   aligned
 
+	// Process the first few bytes to 8-byte align the input.
+
+	// BX = 8 - BX. We need to process this many bytes to align.
+	SUBQ $1, BX
+	XORQ $7, BX
+
+	BTQ $0, BX
+	JNC align_2
+
 	CRC32B (SI), AX
 	DECQ   CX
 	INCQ   SI
-	JMP    startup
+
+align_2:
+	BTQ $1, BX
+	JNC align_4
+
+	// CRC32W (SI), AX
+	BYTE $0x66; BYTE $0xf2; BYTE $0x0f; BYTE $0x38; BYTE $0xf1; BYTE $0x06
+
+	SUBQ $2, CX
+	ADDQ $2, SI
+
+align_4:
+	BTQ $2, BX
+	JNC aligned
+
+	// CRC32L (SI), AX
+	BYTE $0xf2; BYTE $0x0f; BYTE $0x38; BYTE $0xf1; BYTE $0x06
+
+	SUBQ $4, CX
+	ADDQ $4, SI
 
 aligned:
 	// The input is now 8-byte aligned and we can process 8-byte chunks.
 	CMPQ CX, $8
-	JL   cleanup
+	JL   less_than_8
 
 	CRC32Q (SI), AX
 	ADDQ   $8, SI
 	SUBQ   $8, CX
 	JMP    aligned
 
-cleanup:
-	// We may have some bytes left over that we process one at a time.
-	CMPQ CX, $0
-	JE   done
+less_than_8:
+	// We may have some bytes left over; process 4 bytes, then 2, then 1.
+	BTQ $2, CX
+	JNC less_than_4
+
+	// CRC32L (SI), AX
+	BYTE $0xf2; BYTE $0x0f; BYTE $0x38; BYTE $0xf1; BYTE $0x06
+	ADDQ $4, SI
+
+less_than_4:
+	BTQ $1, CX
+	JNC less_than_2
+
+	// CRC32W (SI), AX
+	BYTE $0x66; BYTE $0xf2; BYTE $0x0f; BYTE $0x38; BYTE $0xf1; BYTE $0x06
+	ADDQ $2, SI
+
+less_than_2:
+	BTQ $0, CX
+	JNC done
 
 	CRC32B (SI), AX
-	INCQ   SI
-	DECQ   CX
-	JMP    cleanup
 
 done:
-	NOTL AX
 	MOVL AX, ret+32(FP)
 	RET
 
+// castagnoliSSE42Triple updates three (non-inverted) crcs with (24*rounds)
+// bytes from each buffer.
+//
+// func castagnoliSSE42Triple(
+//     crc1, crc2, crc3 uint32,
+//     a, b, c []byte,
+//     rounds uint32,
+// ) (retA uint32, retB uint32, retC uint32)
+TEXT ·castagnoliSSE42Triple(SB), NOSPLIT, $0
+	MOVL crcA+0(FP), AX
+	MOVL crcB+4(FP), CX
+	MOVL crcC+8(FP), DX
+
+	MOVQ a+16(FP), R8  // data pointer
+	MOVQ b+40(FP), R9  // data pointer
+	MOVQ c+64(FP), R10 // data pointer
+
+	MOVL rounds+88(FP), R11
+
+loop:
+	CRC32Q (R8), AX
+	CRC32Q (R9), CX
+	CRC32Q (R10), DX
+
+	CRC32Q 8(R8), AX
+	CRC32Q 8(R9), CX
+	CRC32Q 8(R10), DX
+
+	CRC32Q 16(R8), AX
+	CRC32Q 16(R9), CX
+	CRC32Q 16(R10), DX
+
+	ADDQ $24, R8
+	ADDQ $24, R9
+	ADDQ $24, R10
+
+	DECQ R11
+	JNZ  loop
+
+	MOVL AX, retA+96(FP)
+	MOVL CX, retB+100(FP)
+	MOVL DX, retC+104(FP)
+	RET
+
 // func haveSSE42() bool
 TEXT ·haveSSE42(SB), NOSPLIT, $0
 	XORQ AX, AX
@@ -123,7 +205,7 @@ TEXT ·ieeeCLMUL(SB), NOSPLIT, $0
 	CMPQ  CX, $64    // Less than 64 bytes left
 	JB    remain64
 
-	MOVOU r2r1kp<>+0(SB), X0
+	MOVOA r2r1kp<>+0(SB), X0
 
 loopback64:
 	MOVOA X1, X5
@@ -165,7 +247,7 @@ loopback64:
 
 	// Fold result into a single register (X1)
 remain64:
-	MOVOU r4r3kp<>+0(SB), X0
+	MOVOA r4r3kp<>+0(SB), X0
 
 	MOVOA     X1, X5
 	PCLMULQDQ $0, X0, X1
@@ -185,7 +267,7 @@ remain64:
 	PXOR      X5, X1
 	PXOR      X4, X1
 
-	// More than 16 bytes left?
+	// If there is less than 16 bytes left we are done
 	CMPQ CX, $16
 	JB   finish
 
@@ -220,7 +302,7 @@ finish:
 	PCLMULQDQ $0, X0, X1
 	PXOR      X2, X1
 
-	MOVOU rupolykp<>+0(SB), X0
+	MOVOA rupolykp<>+0(SB), X0
 
 	MOVOA     X1, X2
 	PAND      X3, X1
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64p32.go b/vendor/github.com/klauspost/crc32/crc32_amd64p32.go
index 64a356feca3..3222b06a5a0 100644
--- a/vendor/github.com/klauspost/crc32/crc32_amd64p32.go
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64p32.go
@@ -1,39 +1,43 @@
-//+build !appengine,!gccgo
-
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build !appengine,!gccgo
+
 package crc32
 
 // This file contains the code to call the SSE 4.2 version of the Castagnoli
 // CRC.
 
-// haveSSE42 is defined in crc_amd64p32.s and uses CPUID to test for 4.2
+// haveSSE42 is defined in crc32_amd64p32.s and uses CPUID to test for SSE 4.2
 // support.
 func haveSSE42() bool
 
-// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
+// castagnoliSSE42 is defined in crc32_amd64p32.s and uses the SSE4.2 CRC32
 // instruction.
+//go:noescape
 func castagnoliSSE42(crc uint32, p []byte) uint32
 
 var sse42 = haveSSE42()
 
-func updateCastagnoli(crc uint32, p []byte) uint32 {
-	if sse42 {
-		return castagnoliSSE42(crc, p)
-	}
-	return update(crc, castagnoliTable, p)
+func archAvailableCastagnoli() bool {
+	return sse42
 }
 
-func updateIEEE(crc uint32, p []byte) uint32 {
-	// only use slicing-by-8 when input is >= 4KB
-	if len(p) >= 4096 {
-		iEEETable8Once.Do(func() {
-			iEEETable8 = makeTable8(IEEE)
-		})
-		return updateSlicingBy8(crc, iEEETable8, p)
+func archInitCastagnoli() {
+	if !sse42 {
+		panic("not available")
 	}
-
-	return update(crc, IEEETable, p)
+	// No initialization necessary.
 }
+
+func archUpdateCastagnoli(crc uint32, p []byte) uint32 {
+	if !sse42 {
+		panic("not available")
+	}
+	return castagnoliSSE42(crc, p)
+}
+
+func archAvailableIEEE() bool                    { return false }
+func archInitIEEE()                              { panic("not available") }
+func archUpdateIEEE(crc uint32, p []byte) uint32 { panic("not available") }
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64p32.s b/vendor/github.com/klauspost/crc32/crc32_amd64p32.s
index 65944c5ac77..a578d685cc5 100644
--- a/vendor/github.com/klauspost/crc32/crc32_amd64p32.s
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64p32.s
@@ -1,9 +1,9 @@
-//+build gc
-
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build gc
+
 #define NOSPLIT 4
 #define RODATA 8
 
diff --git a/vendor/github.com/klauspost/crc32/crc32_generic.go b/vendor/github.com/klauspost/crc32/crc32_generic.go
index 43f5d1dd911..abacbb663d4 100644
--- a/vendor/github.com/klauspost/crc32/crc32_generic.go
+++ b/vendor/github.com/klauspost/crc32/crc32_generic.go
@@ -2,27 +2,88 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build 386 arm arm64 ppc64 ppc64le appengine gccgo
+// This file contains CRC32 algorithms that are not specific to any architecture
+// and don't use hardware acceleration.
+//
+// The simple (and slow) CRC32 implementation only uses a 256*4 bytes table.
+//
+// The slicing-by-8 algorithm is a faster implementation that uses a bigger
+// table (8*256*4 bytes).
 
 package crc32
 
-// The file contains the generic version of updateCastagnoli which does
-// slicing-by-8, or uses the fallback for very small sizes.
-func updateCastagnoli(crc uint32, p []byte) uint32 {
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		return updateSlicingBy8(crc, castagnoliTable8, p)
-	}
-	return update(crc, castagnoliTable, p)
+// simpleMakeTable allocates and constructs a Table for the specified
+// polynomial. The table is suitable for use with the simple algorithm
+// (simpleUpdate).
+func simpleMakeTable(poly uint32) *Table {
+	t := new(Table)
+	simplePopulateTable(poly, t)
+	return t
 }
 
-func updateIEEE(crc uint32, p []byte) uint32 {
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		iEEETable8Once.Do(func() {
-			iEEETable8 = makeTable8(IEEE)
-		})
-		return updateSlicingBy8(crc, iEEETable8, p)
+// simplePopulateTable constructs a Table for the specified polynomial, suitable
+// for use with simpleUpdate.
+func simplePopulateTable(poly uint32, t *Table) {
+	for i := 0; i < 256; i++ {
+		crc := uint32(i)
+		for j := 0; j < 8; j++ {
+			if crc&1 == 1 {
+				crc = (crc >> 1) ^ poly
+			} else {
+				crc >>= 1
+			}
+		}
+		t[i] = crc
 	}
-	return update(crc, IEEETable, p)
+}
+
+// simpleUpdate uses the simple algorithm to update the CRC, given a table that
+// was previously computed using simpleMakeTable.
+func simpleUpdate(crc uint32, tab *Table, p []byte) uint32 {
+	crc = ^crc
+	for _, v := range p {
+		crc = tab[byte(crc)^v] ^ (crc >> 8)
+	}
+	return ^crc
+}
+
+// Use slicing-by-8 when payload >= this value.
+const slicing8Cutoff = 16
+
+// slicing8Table is array of 8 Tables, used by the slicing-by-8 algorithm.
+type slicing8Table [8]Table
+
+// slicingMakeTable constructs a slicing8Table for the specified polynomial. The
+// table is suitable for use with the slicing-by-8 algorithm (slicingUpdate).
+func slicingMakeTable(poly uint32) *slicing8Table {
+	t := new(slicing8Table)
+	simplePopulateTable(poly, &t[0])
+	for i := 0; i < 256; i++ {
+		crc := t[0][i]
+		for j := 1; j < 8; j++ {
+			crc = t[0][crc&0xFF] ^ (crc >> 8)
+			t[j][i] = crc
+		}
+	}
+	return t
+}
+
+// slicingUpdate uses the slicing-by-8 algorithm to update the CRC, given a
+// table that was previously computed using slicingMakeTable.
+func slicingUpdate(crc uint32, tab *slicing8Table, p []byte) uint32 {
+	if len(p) >= slicing8Cutoff {
+		crc = ^crc
+		for len(p) > 8 {
+			crc ^= uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
+			crc = tab[0][p[7]] ^ tab[1][p[6]] ^ tab[2][p[5]] ^ tab[3][p[4]] ^
+				tab[4][crc>>24] ^ tab[5][(crc>>16)&0xFF] ^
+				tab[6][(crc>>8)&0xFF] ^ tab[7][crc&0xFF]
+			p = p[8:]
+		}
+		crc = ^crc
+	}
+	if len(p) == 0 {
+		return crc
+	}
+	return simpleUpdate(crc, &tab[0], p)
 }
diff --git a/vendor/github.com/klauspost/crc32/crc32_otherarch.go b/vendor/github.com/klauspost/crc32/crc32_otherarch.go
new file mode 100644
index 00000000000..cc960764bce
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_otherarch.go
@@ -0,0 +1,15 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !amd64,!amd64p32,!s390x
+
+package crc32
+
+func archAvailableIEEE() bool                    { return false }
+func archInitIEEE()                              { panic("not available") }
+func archUpdateIEEE(crc uint32, p []byte) uint32 { panic("not available") }
+
+func archAvailableCastagnoli() bool                    { return false }
+func archInitCastagnoli()                              { panic("not available") }
+func archUpdateCastagnoli(crc uint32, p []byte) uint32 { panic("not available") }
diff --git a/vendor/github.com/klauspost/crc32/crc32_s390x.go b/vendor/github.com/klauspost/crc32/crc32_s390x.go
new file mode 100644
index 00000000000..ce96f032819
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_s390x.go
@@ -0,0 +1,91 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x
+
+package crc32
+
+const (
+	vxMinLen    = 64
+	vxAlignMask = 15 // align to 16 bytes
+)
+
+// hasVectorFacility reports whether the machine has the z/Architecture
+// vector facility installed and enabled.
+func hasVectorFacility() bool
+
+var hasVX = hasVectorFacility()
+
+// vectorizedCastagnoli implements CRC32 using vector instructions.
+// It is defined in crc32_s390x.s.
+//go:noescape
+func vectorizedCastagnoli(crc uint32, p []byte) uint32
+
+// vectorizedIEEE implements CRC32 using vector instructions.
+// It is defined in crc32_s390x.s.
+//go:noescape
+func vectorizedIEEE(crc uint32, p []byte) uint32
+
+func archAvailableCastagnoli() bool {
+	return hasVX
+}
+
+var archCastagnoliTable8 *slicing8Table
+
+func archInitCastagnoli() {
+	if !hasVX {
+		panic("not available")
+	}
+	// We still use slicing-by-8 for small buffers.
+	archCastagnoliTable8 = slicingMakeTable(Castagnoli)
+}
+
+// archUpdateCastagnoli calculates the checksum of p using
+// vectorizedCastagnoli.
+func archUpdateCastagnoli(crc uint32, p []byte) uint32 {
+	if !hasVX {
+		panic("not available")
+	}
+	// Use vectorized function if data length is above threshold.
+	if len(p) >= vxMinLen {
+		aligned := len(p) & ^vxAlignMask
+		crc = vectorizedCastagnoli(crc, p[:aligned])
+		p = p[aligned:]
+	}
+	if len(p) == 0 {
+		return crc
+	}
+	return slicingUpdate(crc, archCastagnoliTable8, p)
+}
+
+func archAvailableIEEE() bool {
+	return hasVX
+}
+
+var archIeeeTable8 *slicing8Table
+
+func archInitIEEE() {
+	if !hasVX {
+		panic("not available")
+	}
+	// We still use slicing-by-8 for small buffers.
+	archIeeeTable8 = slicingMakeTable(IEEE)
+}
+
+// archUpdateIEEE calculates the checksum of p using vectorizedIEEE.
+func archUpdateIEEE(crc uint32, p []byte) uint32 {
+	if !hasVX {
+		panic("not available")
+	}
+	// Use vectorized function if data length is above threshold.
+	if len(p) >= vxMinLen {
+		aligned := len(p) & ^vxAlignMask
+		crc = vectorizedIEEE(crc, p[:aligned])
+		p = p[aligned:]
+	}
+	if len(p) == 0 {
+		return crc
+	}
+	return slicingUpdate(crc, archIeeeTable8, p)
+}
diff --git a/vendor/github.com/klauspost/crc32/crc32_s390x.s b/vendor/github.com/klauspost/crc32/crc32_s390x.s
new file mode 100644
index 00000000000..e980ca29d6d
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_s390x.s
@@ -0,0 +1,249 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x
+
+#include "textflag.h"
+
+// Vector register range containing CRC-32 constants
+
+#define CONST_PERM_LE2BE        V9
+#define CONST_R2R1              V10
+#define CONST_R4R3              V11
+#define CONST_R5                V12
+#define CONST_RU_POLY           V13
+#define CONST_CRC_POLY          V14
+
+// The CRC-32 constant block contains reduction constants to fold and
+// process particular chunks of the input data stream in parallel.
+//
+// Note that the constant definitions below are extended in order to compute
+// intermediate results with a single VECTOR GALOIS FIELD MULTIPLY instruction.
+// The rightmost doubleword can be 0 to prevent contribution to the result or
+// can be multiplied by 1 to perform an XOR without the need for a separate
+// VECTOR EXCLUSIVE OR instruction.
+//
+// The polynomials used are bit-reflected:
+//
+//            IEEE: P'(x) = 0x0edb88320
+//      Castagnoli: P'(x) = 0x082f63b78
+
+// IEEE polynomial constants
+DATA ·crcleconskp+0(SB)/8, $0x0F0E0D0C0B0A0908 // LE-to-BE mask
+DATA ·crcleconskp+8(SB)/8, $0x0706050403020100
+DATA ·crcleconskp+16(SB)/8, $0x00000001c6e41596 // R2
+DATA ·crcleconskp+24(SB)/8, $0x0000000154442bd4 // R1
+DATA ·crcleconskp+32(SB)/8, $0x00000000ccaa009e // R4
+DATA ·crcleconskp+40(SB)/8, $0x00000001751997d0 // R3
+DATA ·crcleconskp+48(SB)/8, $0x0000000000000000
+DATA ·crcleconskp+56(SB)/8, $0x0000000163cd6124 // R5
+DATA ·crcleconskp+64(SB)/8, $0x0000000000000000
+DATA ·crcleconskp+72(SB)/8, $0x00000001F7011641 // u'
+DATA ·crcleconskp+80(SB)/8, $0x0000000000000000
+DATA ·crcleconskp+88(SB)/8, $0x00000001DB710641 // P'(x) << 1
+
+GLOBL ·crcleconskp(SB), RODATA, $144
+
+// Castagonli Polynomial constants
+DATA ·crccleconskp+0(SB)/8, $0x0F0E0D0C0B0A0908 // LE-to-BE mask
+DATA ·crccleconskp+8(SB)/8, $0x0706050403020100
+DATA ·crccleconskp+16(SB)/8, $0x000000009e4addf8 // R2
+DATA ·crccleconskp+24(SB)/8, $0x00000000740eef02 // R1
+DATA ·crccleconskp+32(SB)/8, $0x000000014cd00bd6 // R4
+DATA ·crccleconskp+40(SB)/8, $0x00000000f20c0dfe // R3
+DATA ·crccleconskp+48(SB)/8, $0x0000000000000000
+DATA ·crccleconskp+56(SB)/8, $0x00000000dd45aab8 // R5
+DATA ·crccleconskp+64(SB)/8, $0x0000000000000000
+DATA ·crccleconskp+72(SB)/8, $0x00000000dea713f1 // u'
+DATA ·crccleconskp+80(SB)/8, $0x0000000000000000
+DATA ·crccleconskp+88(SB)/8, $0x0000000105ec76f0 // P'(x) << 1
+
+GLOBL ·crccleconskp(SB), RODATA, $144
+
+// func hasVectorFacility() bool
+TEXT ·hasVectorFacility(SB), NOSPLIT, $24-1
+	MOVD  $x-24(SP), R1
+	XC    $24, 0(R1), 0(R1) // clear the storage
+	MOVD  $2, R0            // R0 is the number of double words stored -1
+	WORD  $0xB2B01000       // STFLE 0(R1)
+	XOR   R0, R0            // reset the value of R0
+	MOVBZ z-8(SP), R1
+	AND   $0x40, R1
+	BEQ   novector
+
+vectorinstalled:
+	// check if the vector instruction has been enabled
+	VLEIB  $0, $0xF, V16
+	VLGVB  $0, V16, R1
+	CMPBNE R1, $0xF, novector
+	MOVB   $1, ret+0(FP)      // have vx
+	RET
+
+novector:
+	MOVB $0, ret+0(FP) // no vx
+	RET
+
+// The CRC-32 function(s) use these calling conventions:
+//
+// Parameters:
+//
+//      R2:    Initial CRC value, typically ~0; and final CRC (return) value.
+//      R3:    Input buffer pointer, performance might be improved if the
+//             buffer is on a doubleword boundary.
+//      R4:    Length of the buffer, must be 64 bytes or greater.
+//
+// Register usage:
+//
+//      R5:     CRC-32 constant pool base pointer.
+//      V0:     Initial CRC value and intermediate constants and results.
+//      V1..V4: Data for CRC computation.
+//      V5..V8: Next data chunks that are fetched from the input buffer.
+//
+//      V9..V14: CRC-32 constants.
+
+// func vectorizedIEEE(crc uint32, p []byte) uint32
+TEXT ·vectorizedIEEE(SB), NOSPLIT, $0
+	MOVWZ crc+0(FP), R2    // R2 stores the CRC value
+	MOVD  p+8(FP), R3      // data pointer
+	MOVD  p_len+16(FP), R4 // len(p)
+
+	MOVD $·crcleconskp(SB), R5
+	BR   vectorizedBody<>(SB)
+
+// func vectorizedCastagnoli(crc uint32, p []byte) uint32
+TEXT ·vectorizedCastagnoli(SB), NOSPLIT, $0
+	MOVWZ crc+0(FP), R2    // R2 stores the CRC value
+	MOVD  p+8(FP), R3      // data pointer
+	MOVD  p_len+16(FP), R4 // len(p)
+
+	// R5: crc-32 constant pool base pointer, constant is used to reduce crc
+	MOVD $·crccleconskp(SB), R5
+	BR   vectorizedBody<>(SB)
+
+TEXT vectorizedBody<>(SB), NOSPLIT, $0
+	XOR $0xffffffff, R2                         // NOTW R2
+	VLM 0(R5), CONST_PERM_LE2BE, CONST_CRC_POLY
+
+	// Load the initial CRC value into the rightmost word of V0
+	VZERO V0
+	VLVGF $3, R2, V0
+
+	// Crash if the input size is less than 64-bytes.
+	CMP R4, $64
+	BLT crash
+
+	// Load a 64-byte data chunk and XOR with CRC
+	VLM 0(R3), V1, V4 // 64-bytes into V1..V4
+
+	// Reflect the data if the CRC operation is in the bit-reflected domain
+	VPERM V1, V1, CONST_PERM_LE2BE, V1
+	VPERM V2, V2, CONST_PERM_LE2BE, V2
+	VPERM V3, V3, CONST_PERM_LE2BE, V3
+	VPERM V4, V4, CONST_PERM_LE2BE, V4
+
+	VX  V0, V1, V1 // V1 ^= CRC
+	ADD $64, R3    // BUF = BUF + 64
+	ADD $(-64), R4
+
+	// Check remaining buffer size and jump to proper folding method
+	CMP R4, $64
+	BLT less_than_64bytes
+
+fold_64bytes_loop:
+	// Load the next 64-byte data chunk into V5 to V8
+	VLM   0(R3), V5, V8
+	VPERM V5, V5, CONST_PERM_LE2BE, V5
+	VPERM V6, V6, CONST_PERM_LE2BE, V6
+	VPERM V7, V7, CONST_PERM_LE2BE, V7
+	VPERM V8, V8, CONST_PERM_LE2BE, V8
+
+	// Perform a GF(2) multiplication of the doublewords in V1 with
+	// the reduction constants in V0.  The intermediate result is
+	// then folded (accumulated) with the next data chunk in V5 and
+	// stored in V1.  Repeat this step for the register contents
+	// in V2, V3, and V4 respectively.
+
+	VGFMAG CONST_R2R1, V1, V5, V1
+	VGFMAG CONST_R2R1, V2, V6, V2
+	VGFMAG CONST_R2R1, V3, V7, V3
+	VGFMAG CONST_R2R1, V4, V8, V4
+
+	// Adjust buffer pointer and length for next loop
+	ADD $64, R3    // BUF = BUF + 64
+	ADD $(-64), R4 // LEN = LEN - 64
+
+	CMP R4, $64
+	BGE fold_64bytes_loop
+
+less_than_64bytes:
+	// Fold V1 to V4 into a single 128-bit value in V1
+	VGFMAG CONST_R4R3, V1, V2, V1
+	VGFMAG CONST_R4R3, V1, V3, V1
+	VGFMAG CONST_R4R3, V1, V4, V1
+
+	// Check whether to continue with 64-bit folding
+	CMP R4, $16
+	BLT final_fold
+
+fold_16bytes_loop:
+	VL    0(R3), V2                    // Load next data chunk
+	VPERM V2, V2, CONST_PERM_LE2BE, V2
+
+	VGFMAG CONST_R4R3, V1, V2, V1 // Fold next data chunk
+
+	// Adjust buffer pointer and size for folding next data chunk
+	ADD $16, R3
+	ADD $-16, R4
+
+	// Process remaining data chunks
+	CMP R4, $16
+	BGE fold_16bytes_loop
+
+final_fold:
+	VLEIB $7, $0x40, V9
+	VSRLB V9, CONST_R4R3, V0
+	VLEIG $0, $1, V0
+
+	VGFMG V0, V1, V1
+
+	VLEIB  $7, $0x20, V9        // Shift by words
+	VSRLB  V9, V1, V2           // Store remaining bits in V2
+	VUPLLF V1, V1               // Split rightmost doubleword
+	VGFMAG CONST_R5, V1, V2, V1 // V1 = (V1 * R5) XOR V2
+
+	// The input values to the Barret reduction are the degree-63 polynomial
+	// in V1 (R(x)), degree-32 generator polynomial, and the reduction
+	// constant u.  The Barret reduction result is the CRC value of R(x) mod
+	// P(x).
+	//
+	// The Barret reduction algorithm is defined as:
+	//
+	//    1. T1(x) = floor( R(x) / x^32 ) GF2MUL u
+	//    2. T2(x) = floor( T1(x) / x^32 ) GF2MUL P(x)
+	//    3. C(x)  = R(x) XOR T2(x) mod x^32
+	//
+	// Note: To compensate the division by x^32, use the vector unpack
+	// instruction to move the leftmost word into the leftmost doubleword
+	// of the vector register.  The rightmost doubleword is multiplied
+	// with zero to not contribute to the intermedate results.
+
+	// T1(x) = floor( R(x) / x^32 ) GF2MUL u
+	VUPLLF V1, V2
+	VGFMG  CONST_RU_POLY, V2, V2
+
+	// Compute the GF(2) product of the CRC polynomial in VO with T1(x) in
+	// V2 and XOR the intermediate result, T2(x),  with the value in V1.
+	// The final result is in the rightmost word of V2.
+
+	VUPLLF V2, V2
+	VGFMAG CONST_CRC_POLY, V2, V1, V2
+
+done:
+	VLGVF $2, V2, R2
+	XOR   $0xffffffff, R2  // NOTW R2
+	MOVWZ R2, ret + 32(FP)
+	RET
+
+crash:
+	MOVD $0, (R0) // input size is less than 64-bytes
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 8eb84fd6aa2..3e60914ffa8 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -328,6 +328,12 @@
 			"revision": "3ab3a8b8831546bd18fd182c20687ca853b2bb13",
 			"revisionTime": "2016-12-15T22:53:35Z"
 		},
+		{
+			"checksumSHA1": "BM6ZlNJmtKy3GBoWwg2X55gnZ4A=",
+			"path": "github.com/klauspost/crc32",
+			"revision": "1bab8b35b6bb565f92cbc97939610af9369f942a",
+			"revisionTime": "2017-02-10T14:05:23Z"
+		},
 		{
 			"checksumSHA1": "8z32QKTSDusa4QQyunKE4kyYXZ8=",
 			"path": "github.com/patrickmn/go-cache",

From f2e4269242ec92e486d3b6d387b12b53ec6e36c4 Mon Sep 17 00:00:00 2001
From: Andrii Skomorokhov <askomorokhov@users.noreply.github.com>
Date: Fri, 17 Mar 2017 12:48:28 +0200
Subject: [PATCH 258/301] Fixed position of tooltip with description at graph.
 (#7854)

---
 public/app/features/panel/panel_directive.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 24977bd386c..165de76333c 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -160,6 +160,7 @@ module.directive('grafanaPanel', function($rootScope) {
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             hoverOpenDelay: 100,
+            constrainToScrollParent: false,
           });
         }
       }

From 122b4695e7f5afd3473ea6ed5062a29e2fdb359f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 13:37:55 +0100
Subject: [PATCH 259/301] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57a5670d1e9..e5f2f492522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 * **Docs**: router_logging not documented [#7723](https://github.com/grafana/grafana/issues/7723)
 * **Alerting**: Spelling mistake [#7739](https://github.com/grafana/grafana/pull/7739) thx [@woutersmit](https://github.com/woutersmit)
 * **Alerting**: Graph legend scrolls to top when an alias is toggled/clicked [#7680](https://github.com/grafana/grafana/issues/7680) thx [@p4ddy1](https://github.com/p4ddy1)
+* **Panels**: Fixed panel tooltip description after scrolling down [#7708](https://github.com/grafana/grafana/issues/7708) thx [@askomorokhov](https://github.com/askomorokhov)
 
 # 4.2.0-beta1 (2017-02-27)
 

From be5c4f47a6a19c96d43e99bafbba7f2369470654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 14:10:44 +0100
Subject: [PATCH 260/301] s3: support for alternative s3 bucket url syntax,
 closes #7871

---
 pkg/components/imguploader/imguploader.go     | 54 ++++++++++-----
 .../imguploader/imguploader_test.go           | 65 +++++++++++++++----
 2 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
index 94cde098297..ae5c89a0049 100644
--- a/pkg/components/imguploader/imguploader.go
+++ b/pkg/components/imguploader/imguploader.go
@@ -27,25 +27,15 @@ func NewImageUploader() (ImageUploader, error) {
 			return nil, err
 		}
 
-		bucket := s3sec.Key("bucket_url").MustString("")
+		bucketUrl := s3sec.Key("bucket_url").MustString("")
 		accessKey := s3sec.Key("access_key").MustString("")
 		secretKey := s3sec.Key("secret_key").MustString("")
-
-		region := ""
-		rBucket := regexp.MustCompile(`https?:\/\/(.*)\.s3(-([^.]+))?\.amazonaws\.com\/?`)
-		matches := rBucket.FindStringSubmatch(bucket)
-		if len(matches) == 0 {
-			return nil, fmt.Errorf("Could not find bucket setting for image.uploader.s3")
-		} else {
-			bucket = matches[1]
-			if matches[3] != "" {
-				region = matches[3]
-			} else {
-				region = "us-east-1"
-			}
+		info, err := getRegionAndBucketFromUrl(bucketUrl)
+		if err != nil {
+			return nil, err
 		}
 
-		return NewS3Uploader(region, bucket, "public-read", accessKey, secretKey), nil
+		return NewS3Uploader(info.region, info.bucket, "public-read", accessKey, secretKey), nil
 	case "webdav":
 		webdavSec, err := setting.Cfg.GetSection("external_image_storage.webdav")
 		if err != nil {
@@ -65,3 +55,37 @@ func NewImageUploader() (ImageUploader, error) {
 
 	return NopImageUploader{}, nil
 }
+
+type s3Info struct {
+	region string
+	bucket string
+}
+
+func getRegionAndBucketFromUrl(url string) (*s3Info, error) {
+	info := &s3Info{}
+	urlRegex := regexp.MustCompile(`https?:\/\/(.*)\.s3(-([^.]+))?\.amazonaws\.com\/?`)
+	matches := urlRegex.FindStringSubmatch(url)
+	if len(matches) > 0 {
+		info.bucket = matches[1]
+		if matches[3] != "" {
+			info.region = matches[3]
+		} else {
+			info.region = "us-east-1"
+		}
+		return info, nil
+	}
+
+	urlRegex2 := regexp.MustCompile(`https?:\/\/s3(-([^.]+))?\.amazonaws\.com\/(.*)?`)
+	matches2 := urlRegex2.FindStringSubmatch(url)
+	if len(matches2) > 0 {
+		info.bucket = matches2[3]
+		if matches2[2] != "" {
+			info.region = matches2[2]
+		} else {
+			info.region = "us-east-1"
+		}
+		return info, nil
+	}
+
+	return nil, fmt.Errorf("Could not find bucket setting for image.uploader.s3")
+}
diff --git a/pkg/components/imguploader/imguploader_test.go b/pkg/components/imguploader/imguploader_test.go
index b871aa55a64..4faaa6415f0 100644
--- a/pkg/components/imguploader/imguploader_test.go
+++ b/pkg/components/imguploader/imguploader_test.go
@@ -10,29 +10,66 @@ import (
 
 func TestImageUploaderFactory(t *testing.T) {
 	Convey("Can create image uploader for ", t, func() {
-		Convey("S3ImageUploader", func() {
-			var err error
+		Convey("S3ImageUploader config", func() {
 			setting.NewConfigContext(&setting.CommandLineArgs{
 				HomePath: "../../../",
 			})
 
 			setting.ImageUploadProvider = "s3"
 
-			s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
-			s3sec.NewKey("bucket_url", "https://foo.bar.baz.s3-us-east-2.amazonaws.com")
-			s3sec.NewKey("access_key", "access_key")
-			s3sec.NewKey("secret_key", "secret_key")
+			Convey("with bucket url https://foo.bar.baz.s3-us-east-2.amazonaws.com", func() {
+				s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+				s3sec.NewKey("bucket_url", "https://foo.bar.baz.s3-us-east-2.amazonaws.com")
+				s3sec.NewKey("access_key", "access_key")
+				s3sec.NewKey("secret_key", "secret_key")
 
-			uploader, err := NewImageUploader()
+				uploader, err := NewImageUploader()
 
-			So(err, ShouldBeNil)
-			original, ok := uploader.(*S3Uploader)
+				So(err, ShouldBeNil)
+				original, ok := uploader.(*S3Uploader)
 
-			So(ok, ShouldBeTrue)
-			So(original.region, ShouldEqual, "us-east-2")
-			So(original.bucket, ShouldEqual, "foo.bar.baz")
-			So(original.accessKey, ShouldEqual, "access_key")
-			So(original.secretKey, ShouldEqual, "secret_key")
+				So(ok, ShouldBeTrue)
+				So(original.region, ShouldEqual, "us-east-2")
+				So(original.bucket, ShouldEqual, "foo.bar.baz")
+				So(original.accessKey, ShouldEqual, "access_key")
+				So(original.secretKey, ShouldEqual, "secret_key")
+			})
+
+			Convey("with bucket url https://s3.amazonaws.com/mybucket", func() {
+				s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+				s3sec.NewKey("bucket_url", "https://s3.amazonaws.com/my.bucket.com")
+				s3sec.NewKey("access_key", "access_key")
+				s3sec.NewKey("secret_key", "secret_key")
+
+				uploader, err := NewImageUploader()
+
+				So(err, ShouldBeNil)
+				original, ok := uploader.(*S3Uploader)
+
+				So(ok, ShouldBeTrue)
+				So(original.region, ShouldEqual, "us-east-1")
+				So(original.bucket, ShouldEqual, "my.bucket.com")
+				So(original.accessKey, ShouldEqual, "access_key")
+				So(original.secretKey, ShouldEqual, "secret_key")
+			})
+
+			Convey("with bucket url https://s3-us-west-2.amazonaws.com/mybucket", func() {
+				s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+				s3sec.NewKey("bucket_url", "https://s3-us-west-2.amazonaws.com/my.bucket.com")
+				s3sec.NewKey("access_key", "access_key")
+				s3sec.NewKey("secret_key", "secret_key")
+
+				uploader, err := NewImageUploader()
+
+				So(err, ShouldBeNil)
+				original, ok := uploader.(*S3Uploader)
+
+				So(ok, ShouldBeTrue)
+				So(original.region, ShouldEqual, "us-west-2")
+				So(original.bucket, ShouldEqual, "my.bucket.com")
+				So(original.accessKey, ShouldEqual, "access_key")
+				So(original.secretKey, ShouldEqual, "secret_key")
+			})
 		})
 
 		Convey("Webdav uploader", func() {

From f78a28395d57d6d5d3e955ff89b80e685b809c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 14:10:44 +0100
Subject: [PATCH 261/301] s3: support for alternative s3 bucket url syntax,
 closes #7871

---
 pkg/components/imguploader/imguploader.go     | 54 ++++++++++-----
 .../imguploader/imguploader_test.go           | 65 +++++++++++++++----
 2 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
index 94cde098297..ae5c89a0049 100644
--- a/pkg/components/imguploader/imguploader.go
+++ b/pkg/components/imguploader/imguploader.go
@@ -27,25 +27,15 @@ func NewImageUploader() (ImageUploader, error) {
 			return nil, err
 		}
 
-		bucket := s3sec.Key("bucket_url").MustString("")
+		bucketUrl := s3sec.Key("bucket_url").MustString("")
 		accessKey := s3sec.Key("access_key").MustString("")
 		secretKey := s3sec.Key("secret_key").MustString("")
-
-		region := ""
-		rBucket := regexp.MustCompile(`https?:\/\/(.*)\.s3(-([^.]+))?\.amazonaws\.com\/?`)
-		matches := rBucket.FindStringSubmatch(bucket)
-		if len(matches) == 0 {
-			return nil, fmt.Errorf("Could not find bucket setting for image.uploader.s3")
-		} else {
-			bucket = matches[1]
-			if matches[3] != "" {
-				region = matches[3]
-			} else {
-				region = "us-east-1"
-			}
+		info, err := getRegionAndBucketFromUrl(bucketUrl)
+		if err != nil {
+			return nil, err
 		}
 
-		return NewS3Uploader(region, bucket, "public-read", accessKey, secretKey), nil
+		return NewS3Uploader(info.region, info.bucket, "public-read", accessKey, secretKey), nil
 	case "webdav":
 		webdavSec, err := setting.Cfg.GetSection("external_image_storage.webdav")
 		if err != nil {
@@ -65,3 +55,37 @@ func NewImageUploader() (ImageUploader, error) {
 
 	return NopImageUploader{}, nil
 }
+
+type s3Info struct {
+	region string
+	bucket string
+}
+
+func getRegionAndBucketFromUrl(url string) (*s3Info, error) {
+	info := &s3Info{}
+	urlRegex := regexp.MustCompile(`https?:\/\/(.*)\.s3(-([^.]+))?\.amazonaws\.com\/?`)
+	matches := urlRegex.FindStringSubmatch(url)
+	if len(matches) > 0 {
+		info.bucket = matches[1]
+		if matches[3] != "" {
+			info.region = matches[3]
+		} else {
+			info.region = "us-east-1"
+		}
+		return info, nil
+	}
+
+	urlRegex2 := regexp.MustCompile(`https?:\/\/s3(-([^.]+))?\.amazonaws\.com\/(.*)?`)
+	matches2 := urlRegex2.FindStringSubmatch(url)
+	if len(matches2) > 0 {
+		info.bucket = matches2[3]
+		if matches2[2] != "" {
+			info.region = matches2[2]
+		} else {
+			info.region = "us-east-1"
+		}
+		return info, nil
+	}
+
+	return nil, fmt.Errorf("Could not find bucket setting for image.uploader.s3")
+}
diff --git a/pkg/components/imguploader/imguploader_test.go b/pkg/components/imguploader/imguploader_test.go
index b871aa55a64..4faaa6415f0 100644
--- a/pkg/components/imguploader/imguploader_test.go
+++ b/pkg/components/imguploader/imguploader_test.go
@@ -10,29 +10,66 @@ import (
 
 func TestImageUploaderFactory(t *testing.T) {
 	Convey("Can create image uploader for ", t, func() {
-		Convey("S3ImageUploader", func() {
-			var err error
+		Convey("S3ImageUploader config", func() {
 			setting.NewConfigContext(&setting.CommandLineArgs{
 				HomePath: "../../../",
 			})
 
 			setting.ImageUploadProvider = "s3"
 
-			s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
-			s3sec.NewKey("bucket_url", "https://foo.bar.baz.s3-us-east-2.amazonaws.com")
-			s3sec.NewKey("access_key", "access_key")
-			s3sec.NewKey("secret_key", "secret_key")
+			Convey("with bucket url https://foo.bar.baz.s3-us-east-2.amazonaws.com", func() {
+				s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+				s3sec.NewKey("bucket_url", "https://foo.bar.baz.s3-us-east-2.amazonaws.com")
+				s3sec.NewKey("access_key", "access_key")
+				s3sec.NewKey("secret_key", "secret_key")
 
-			uploader, err := NewImageUploader()
+				uploader, err := NewImageUploader()
 
-			So(err, ShouldBeNil)
-			original, ok := uploader.(*S3Uploader)
+				So(err, ShouldBeNil)
+				original, ok := uploader.(*S3Uploader)
 
-			So(ok, ShouldBeTrue)
-			So(original.region, ShouldEqual, "us-east-2")
-			So(original.bucket, ShouldEqual, "foo.bar.baz")
-			So(original.accessKey, ShouldEqual, "access_key")
-			So(original.secretKey, ShouldEqual, "secret_key")
+				So(ok, ShouldBeTrue)
+				So(original.region, ShouldEqual, "us-east-2")
+				So(original.bucket, ShouldEqual, "foo.bar.baz")
+				So(original.accessKey, ShouldEqual, "access_key")
+				So(original.secretKey, ShouldEqual, "secret_key")
+			})
+
+			Convey("with bucket url https://s3.amazonaws.com/mybucket", func() {
+				s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+				s3sec.NewKey("bucket_url", "https://s3.amazonaws.com/my.bucket.com")
+				s3sec.NewKey("access_key", "access_key")
+				s3sec.NewKey("secret_key", "secret_key")
+
+				uploader, err := NewImageUploader()
+
+				So(err, ShouldBeNil)
+				original, ok := uploader.(*S3Uploader)
+
+				So(ok, ShouldBeTrue)
+				So(original.region, ShouldEqual, "us-east-1")
+				So(original.bucket, ShouldEqual, "my.bucket.com")
+				So(original.accessKey, ShouldEqual, "access_key")
+				So(original.secretKey, ShouldEqual, "secret_key")
+			})
+
+			Convey("with bucket url https://s3-us-west-2.amazonaws.com/mybucket", func() {
+				s3sec, err := setting.Cfg.GetSection("external_image_storage.s3")
+				s3sec.NewKey("bucket_url", "https://s3-us-west-2.amazonaws.com/my.bucket.com")
+				s3sec.NewKey("access_key", "access_key")
+				s3sec.NewKey("secret_key", "secret_key")
+
+				uploader, err := NewImageUploader()
+
+				So(err, ShouldBeNil)
+				original, ok := uploader.(*S3Uploader)
+
+				So(ok, ShouldBeTrue)
+				So(original.region, ShouldEqual, "us-west-2")
+				So(original.bucket, ShouldEqual, "my.bucket.com")
+				So(original.accessKey, ShouldEqual, "access_key")
+				So(original.secretKey, ShouldEqual, "secret_key")
+			})
 		})
 
 		Convey("Webdav uploader", func() {

From adf7645bf5dc69d4f5dbd18aee35da36ef587d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 20 Mar 2017 16:04:57 +0100
Subject: [PATCH 262/301] docs: added alias

---
 docs/sources/guides/getting_started.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md
index d4ead7d8577..f4c9bb9647f 100644
--- a/docs/sources/guides/getting_started.md
+++ b/docs/sources/guides/getting_started.md
@@ -3,6 +3,7 @@ title = "Getting Started"
 description = "Getting started with Grafana guide"
 keywords = ["grafana", "intro", "guide", "started"]
 type = "docs"
+aliases = ["/guides/gettingstarted"]
 [menu.docs]
 name = "Getting Started"
 identifier = "getting_started_guide"

From 65910db99106c92a64dbd899525acb76ebe0581e Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 20 Mar 2017 17:14:24 +0100
Subject: [PATCH 263/301] template: tweak to warning message

---
 public/app/features/templating/editor_ctrl.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index 002afa4264b..7d0a0a5465a 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -78,7 +78,7 @@ export class VariableEditorCtrl {
       }
 
       if ($scope.current.type === 'query' && $scope.current.query.match(new RegExp('\\$' + $scope.current.name))) {
-        $scope.appEvent('alert-warning', ['Validation', 'Query contains variable self-reference']);
+        $scope.appEvent('alert-warning', ['Validation', 'Query cannot contain a reference to itself. Variable: $'  + $scope.current.name]);
         return false;
       }
 

From 94498d533b0d44d0b39989adc2e6ac4d0f3c182c Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 20 Mar 2017 22:51:55 +0100
Subject: [PATCH 264/301] template: fix validation for required selects

Since upgrading to Angular 1.6.1, selects with a default empty option
no longer show a popup with an error on submit. This fix adds an
empty option that is then removed with ng-if. Having the default
option set to null or undefined seems to be the cause of the bug.

The list of changes in 1.6 is here but could not find any obvious
cause for this bug:

https://docs.angularjs.org/guide/migration#migrating-from-1-5-to-1-6
---
 public/app/features/templating/partials/editor.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 2d514060cb7..a0683debc5c 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -159,7 +159,9 @@
           <div class="gf-form max-width-21">
             <span class="gf-form-label width-7">Data source</span>
             <div class="gf-form-select-wrapper max-width-14">
-              <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required></select>
+              <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required>
+                <option value="" ng-if="false"></option>
+              </select>
             </div>
           </div>
           <div class="gf-form max-width-21">
@@ -230,7 +232,9 @@
         <div class="gf-form max-width-21">
           <span class="gf-form-label width-8">Data source</span>
           <div class="gf-form-select-wrapper max-width-14">
-            <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()"></select>
+            <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()">
+              <option value="" ng-if="false"></option>
+            </select>
           </div>
         </div>
       </div>

From 3d3357ee41154195c61ce06ba5f09152ba79a563 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 20 Mar 2017 23:14:33 +0100
Subject: [PATCH 265/301] docs: add note for #7614

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5f2f492522..8c0937a872c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ## Minor Enchancements
 
 * **Prometheus**: Make Prometheus query field a textarea [#7663](https://github.com/grafana/grafana/issues/7663), thx [@hagen1778](https://github.com/hagen1778)
+* **Templating**: Should not be possible to create self-referencing (recursive) template variable definitions [#7614](https://github.com/grafana/grafana/issues/7614) thx [@thuck](https://github.com/thuck)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements

From 5ecc8a171f6503cde295087653769e8a682495d8 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 20 Mar 2017 22:51:55 +0100
Subject: [PATCH 266/301] template: fix validation for required selects

Since upgrading to Angular 1.6.1, selects with a default empty option
no longer show a popup with an error on submit. This fix adds an
empty option that is then removed with ng-if. Having the default
option set to null or undefined seems to be the cause of the bug.

The list of changes in 1.6 is here but could not find any obvious
cause for this bug:

https://docs.angularjs.org/guide/migration#migrating-from-1-5-to-1-6
---
 public/app/features/templating/partials/editor.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 2d514060cb7..a0683debc5c 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -159,7 +159,9 @@
           <div class="gf-form max-width-21">
             <span class="gf-form-label width-7">Data source</span>
             <div class="gf-form-select-wrapper max-width-14">
-              <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required></select>
+              <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required>
+                <option value="" ng-if="false"></option>
+              </select>
             </div>
           </div>
           <div class="gf-form max-width-21">
@@ -230,7 +232,9 @@
         <div class="gf-form max-width-21">
           <span class="gf-form-label width-8">Data source</span>
           <div class="gf-form-select-wrapper max-width-14">
-            <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()"></select>
+            <select class="gf-form-input" ng-model="current.datasource" ng-options="f.value as f.name for f in datasources" required ng-change="validate()">
+              <option value="" ng-if="false"></option>
+            </select>
           </div>
         </div>
       </div>

From 99064603a4c1f9113a8d0cb8a87b8ca93af7e4da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 21 Mar 2017 10:35:18 +0100
Subject: [PATCH 267/301] packaging: added rpm posttrans script to fix config
 file change, fixes #7686

---
 build.go                        | 16 ++++++++++++----
 packaging/rpm/control/postinst  |  7 -------
 packaging/rpm/control/posttrans | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 packaging/rpm/control/postinst
 create mode 100755 packaging/rpm/control/posttrans

diff --git a/build.go b/build.go
index 7943bd8716c..72f7f498d97 100644
--- a/build.go
+++ b/build.go
@@ -14,13 +14,13 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
 	"time"
-	"path"
 )
 
 var (
@@ -126,9 +126,9 @@ func makeLatestDistCopies() {
 		log.Fatalf("failed to create latest copies. Cannot read from /dist")
 	}
 
-	latestMapping := map[string]string {
-		".deb": "dist/grafana_latest_amd64.deb",
-		".rpm": "dist/grafana-latest-1.x86_64.rpm",
+	latestMapping := map[string]string{
+		".deb":    "dist/grafana_latest_amd64.deb",
+		".rpm":    "dist/grafana-latest-1.x86_64.rpm",
 		".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
 	}
 
@@ -287,6 +287,14 @@ func createPackage(options linuxPackageOptions) {
 		"-p", "./dist",
 	}
 
+	if options.packageType == "rpm" {
+		args = append(args, "--rpm-posttrans", "packaging/rpm/control/posttrans")
+	}
+
+	if options.packageType == "deb" {
+		args = append(args, "--deb-no-default-config-files")
+	}
+
 	if pkgArch != "" {
 		args = append(args, "-a", pkgArch)
 	}
diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst
old mode 100644
new mode 100755
index be3d7692a5f..cf31112679d
--- a/packaging/rpm/control/postinst
+++ b/packaging/rpm/control/postinst
@@ -68,13 +68,6 @@ if [ $1 -eq 1 ] ; then
     echo " sudo service grafana-server start"
   fi
 elif [ $1 -ge 2 ] ; then
-  if [ -x /opt/grafana/ ]; then
-    echo "### Upgrading Notice ### "
-    echo "-- New grafana install home is /usr/share/grafana"
-    echo "-- Please move sqlite3 database to /var/lib/grafana/"
-    echo "-- Notice: service name && binary changed to grafana-server"
-  fi
-
   if [ "$RESTART_ON_UPGRADE" == "true" ]; then
     stopGrafana
     startGrafana
diff --git a/packaging/rpm/control/posttrans b/packaging/rpm/control/posttrans
new file mode 100755
index 00000000000..0afe4561a93
--- /dev/null
+++ b/packaging/rpm/control/posttrans
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+echo "POSTTRANS: Running script"
+
+[ -f /etc/sysconfig/grafana-server ] && . /etc/sysconfig/grafana-server
+
+# copy config files if missing
+if [ ! -f /etc/grafana/grafana.ini ]; then
+  echo "POSTTRANS: Config file not found"
+
+  if [ -f /etc/grafana/grafana.ini.rpmsave ]; then
+    echo "POSTTRANS: /etc/grafana/grafana.ini.rpmsave config file found."
+    mv /etc/grafana/grafana.ini.rpmsave /etc/grafana/grafana.ini
+    echo "POSTTRANS: /etc/grafana/grafana.ini restored"
+
+    if [ -f /etc/grafana/ldap.toml.rpmsave ]; then
+      echo "POSTTRANS: /etc/grafana/ldap.toml.rpmsave found"
+      mv /etc/grafana/ldap.toml.rpmsave /etc/grafana/ldap.toml
+      echo "POSTTRANS: /etc/grafana/ldap.toml restored"
+    fi
+
+    echo "POSTTRANS: Restoring config file permissions"
+    chown -Rh root:$GRAFANA_GROUP /etc/grafana/*
+    chmod 755 /etc/grafana
+    find /etc/grafana -type f -exec chmod 640 {} ';'
+    find /etc/grafana -type d -exec chmod 755 {} ';'
+  fi
+fi
+
+

From b9940e618c5e5f5d261441598e8a1ced227c1ee1 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 21 Mar 2017 14:34:48 +0100
Subject: [PATCH 268/301] profile: locks login fields if disable_login_form

If the auth config variable, disable_login_form, is set to true then
the username and email fields are set to read-only on the profile page.

The reason for this is so that the user does not lock themselves out by
changing their email address or username. Or create a new user by
changing both.

ref #7810
---
 public/app/features/org/partials/profile.html | 24 ++++++++++---------
 public/app/features/org/profile_ctrl.ts       |  1 +
 public/sass/_grafana.scss                     |  1 -
 public/sass/components/_gf-form.scss          |  7 ++++++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html
index c51c3750ee5..7f52fbbd9d1 100644
--- a/public/app/features/org/partials/profile.html
+++ b/public/app/features/org/partials/profile.html
@@ -9,18 +9,20 @@
 	<form name="ctrl.userForm" class="gf-form-group">
 		<h3 class="page-heading">Information</h3>
 
-		<div class="gf-form">
-			<span class="gf-form-label width-9">Name</span>
-			<input class="gf-form-input max-width-21" type="text" required ng-model="ctrl.user.name" >
-		</div>
-		<div class="gf-form">
-			<span class="gf-form-label width-9">Email</span>
-			<input class="gf-form-input max-width-21" type="email" required ng-model="ctrl.user.email">
-		</div>
-		<div class="gf-form">
-			<span class="gf-form-label width-9">Username</span>
-			<input class="gf-form-input max-width-21" type="text" required ng-model="ctrl.user.login">
+		<div class="gf-form max-width-30">
+			<span class="gf-form-label width-8">Name</span>
+			<input class="gf-form-input max-width-22" type="text" required ng-model="ctrl.user.name" >
 		</div>
+		<div class="gf-form max-width-30">
+			<span class="gf-form-label width-8">Email</span>
+			<input class="gf-form-input max-width-22" type="email" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.email">
+      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
+    </div>
+		<div class="gf-form max-width-30">
+			<span class="gf-form-label width-8">Username</span>
+      <input class="gf-form-input max-width-22" type="text" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.login">
+      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
+    </div>
 		<div class="gf-form-button-row">
 			<button type="submit" class="btn btn-success" ng-click="ctrl.update()">Update</button>
 		</div>
diff --git a/public/app/features/org/profile_ctrl.ts b/public/app/features/org/profile_ctrl.ts
index c0e8b5ae246..4687218826c 100644
--- a/public/app/features/org/profile_ctrl.ts
+++ b/public/app/features/org/profile_ctrl.ts
@@ -10,6 +10,7 @@ export class ProfileCtrl {
   orgs: any = [];
   userForm: any;
   showOrgsList = false;
+  readonlyLoginFields = config.disableLoginForm;
 
   /** @ngInject **/
   constructor(private backendSrv, private contextSrv, private $location) {
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 25db63858e8..370a5db943a 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -85,6 +85,5 @@
 @import "pages/signup";
 @import "pages/styleguide";
 
-
 @import "old_responsive";
 @import "components/view_states.scss";
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 19588634dd3..94691334fe2 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -286,3 +286,10 @@ $gf-form-margin: 0.25rem;
 select.gf-form-input ~ .gf-form-help-icon {
   right: 10px;
 }
+
+.gf-form-icon--right-absolute {
+  position: absolute;
+  right: $spacer;
+  top: 10px;
+  color: $text-muted;
+}

From 69bec989624d6a37726041728094866b1b05d433 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 21 Mar 2017 15:37:55 +0100
Subject: [PATCH 269/301] chore: update all grafana.org urls to .com

---
 CHANGELOG.md                                              | 2 +-
 README.md                                                 | 2 +-
 build.go                                                  | 4 ++--
 docs/sources/guides/whats-new-in-v2-5.md                  | 2 +-
 docs/sources/index.md                                     | 2 +-
 docs/sources/installation/debian.md                       | 2 +-
 docs/sources/installation/index.md                        | 2 +-
 docs/sources/installation/rpm.md                          | 2 +-
 docs/sources/plugins/developing/development.md            | 2 +-
 docs/sources/reference/admin.md                           | 2 +-
 pkg/services/alerting/notifiers/hipchat.go                | 2 +-
 pkg/services/alerting/notifiers/slack.go                  | 2 +-
 public/app/plugins/app/testdata/datasource/plugin.json    | 2 +-
 public/app/plugins/app/testdata/plugin.json               | 2 +-
 public/app/plugins/datasource/cloudwatch/plugin.json      | 2 +-
 public/app/plugins/datasource/elasticsearch/plugin.json   | 2 +-
 public/app/plugins/datasource/graphite/plugin.json        | 2 +-
 public/app/plugins/datasource/influxdb/plugin.json        | 2 +-
 public/app/plugins/datasource/opentsdb/plugin.json        | 2 +-
 .../prometheus/dashboards/prometheus_stats.json           | 4 ++--
 public/app/plugins/datasource/prometheus/plugin.json      | 2 +-
 public/app/plugins/panel/alertlist/plugin.json            | 2 +-
 public/app/plugins/panel/dashlist/plugin.json             | 2 +-
 public/app/plugins/panel/gettingstarted/plugin.json       | 2 +-
 public/app/plugins/panel/graph/plugin.json                | 2 +-
 public/app/plugins/panel/pluginlist/plugin.json           | 2 +-
 public/app/plugins/panel/singlestat/plugin.json           | 2 +-
 public/app/plugins/panel/table/plugin.json                | 2 +-
 public/app/plugins/panel/text/plugin.json                 | 2 +-
 public/views/index.html                                   | 8 ++++----
 30 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c0937a872c..bce9b10f792 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -798,7 +798,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
 
 # 1.8.0 (2014-09-22)
 
-Read this [blog post](http://grafana.org/blog/2014/09/11/grafana-1-8-0-rc1-released.html) for an overview of all improvements.
+Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-released) for an overview of all improvements.
 
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
diff --git a/README.md b/README.md
index 6e0289e2bd5..cefa8d605d7 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ There are no dependencies except an external time series data store. For dashboa
 database (sqlite3) or you can use an external SQL data base like MySQL or Postgres.
 
 ## Installation
-Head to [grafana.org](http://docs.grafana.org/installation/) and [download](http://grafana.org/download/)
+Head to [grafana.org](http://docs.grafana.org/installation/) and [download](https://grafana.com/get)
 the latest release.
 
 If you have any problems please read the [troubleshooting guide](http://docs.grafana.org/installation/troubleshooting/).
diff --git a/build.go b/build.go
index 72f7f498d97..8ac7fada898 100644
--- a/build.go
+++ b/build.go
@@ -275,9 +275,9 @@ func createPackage(options linuxPackageOptions) {
 		"--description", "Grafana",
 		"-C", packageRoot,
 		"--vendor", "Grafana",
-		"--url", "http://grafana.org",
+		"--url", "https://grafana.com",
 		"--license", "\"Apache 2.0\"",
-		"--maintainer", "contact@grafana.org",
+		"--maintainer", "contact@grafana.com",
 		"--config-files", options.initdScriptFilePath,
 		"--config-files", options.etcDefaultFilePath,
 		"--config-files", options.systemdServiceFilePath,
diff --git a/docs/sources/guides/whats-new-in-v2-5.md b/docs/sources/guides/whats-new-in-v2-5.md
index 93cdd59cb50..ff80ec1f4f4 100644
--- a/docs/sources/guides/whats-new-in-v2-5.md
+++ b/docs/sources/guides/whats-new-in-v2-5.md
@@ -107,5 +107,5 @@ view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG
 
 - - -
 
-### <a href="http://grafana.org/download">Download Grafana 2.5 now</a>
+### <a href="https://grafana.com/get">Download Grafana 2.5 now</a>
 
diff --git a/docs/sources/index.md b/docs/sources/index.md
index 62e5dac7fa5..f22ee82cc5c 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -23,7 +23,7 @@ other domains including industrial sensors, home automation, weather, and proces
 - [Installing on Windows](installation/windows)
 - [Installing on Docker](installation/docker)
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
-- [Nightly Builds](http://grafana.org/builds)
+- [Nightly Builds](https://grafana.com/grafana/download)
 
 For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
 instructions for more information.
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 607d683bbb2..19d2c87a2b6 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -130,7 +130,7 @@ those options.
 
 ## Installing from binary tar file
 
-Download [the latest `.tar.gz` file](http://grafana.org/download) and
+Download [the latest `.tar.gz` file](https://grafana.com/get) and
 extract it.  This will extract into a folder named after the version you
 downloaded. This folder contains all files required to run Grafana.  There are
 no init scripts or install scripts in this package.
diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md
index 837de3a2354..47d52817b64 100644
--- a/docs/sources/installation/index.md
+++ b/docs/sources/installation/index.md
@@ -17,6 +17,6 @@ identifier = "installation"
 - [Installing on Windows](windows)
 - [Installing on Docker](docker)
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](provisioning)
-- [Nightly Builds](http://grafana.org/builds)
+- [Nightly Builds](https://grafana.com/grafana/download)
 
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index d329b7032c4..799e3441b66 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -142,7 +142,7 @@ yum install urw-fonts
 
 ## Installing from binary tar file
 
-Download [the latest `.tar.gz` file](http://grafana.org/download) and
+Download [the latest `.tar.gz` file](https://grafana.com/get) and
 extract it.  This will extract into a folder named after the version you
 downloaded. This folder contains all files required to run Grafana.  There are
 no init scripts or install scripts in this package.
diff --git a/docs/sources/plugins/developing/development.md b/docs/sources/plugins/developing/development.md
index 2c2bc445411..1f8db99424b 100644
--- a/docs/sources/plugins/developing/development.md
+++ b/docs/sources/plugins/developing/development.md
@@ -12,7 +12,7 @@ weight = 1
 
 From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.
 
-There are two blog posts about authoring a plugin that might also be of interest to any plugin authors, [Timing is Everything. Writing the Clock Panel Plugin for Grafana 3.0- part 1](http://grafana.org/blog/2016/04/08/timing-is-everything.-writing-the-clock-panel-plugin-for-grafana-3.0/) and [Timing is Everything. Editor Mode in Grafana 3.0 for the Clock Panel Plugin](http://grafana.org/blog/2016/04/15/timing-is-everything.-editor-mode-in-grafana-3.0-for-the-clock-panel-plugin/).
+There are two blog posts about authoring a plugin that might also be of interest to any plugin authors, [Timing is Everything. Writing the Clock Panel Plugin for Grafana 3.0- part 1](https://grafana.com/blog/2016/04/08/timing-is-everything.-writing-the-clock-panel-plugin-for-grafana-3.0/) and [Timing is Everything. Editor Mode in Grafana 3.0 for the Clock Panel Plugin](https://grafana.com/blog/2016/04/15/timing-is-everything.-editor-mode-in-grafana-3.0-for-the-clock-panel-plugin/).
 
 ## Short version
 
diff --git a/docs/sources/reference/admin.md b/docs/sources/reference/admin.md
index df396fed212..a6863b4ea71 100644
--- a/docs/sources/reference/admin.md
+++ b/docs/sources/reference/admin.md
@@ -27,7 +27,7 @@ modify Organization details and options.
 
 ## Grafana Administrators
 
-<img src="img/v2/admin_sidenav.png" class="right" style="margin-left: 15px">
+<img src="/img/v2/admin_sidenav.png" class="pull-right" style="margin-left: 15px">
 As a Grafana Administrator, you have complete access to any Organization or User in that instance of Grafana.
 When performing actions as a Grafana admin, the sidebar will change it's appearance as below to indicate you are performing global server administration.
 
diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go
index ad649cb084d..0eb21865b9f 100644
--- a/pkg/services/alerting/notifiers/hipchat.go
+++ b/pkg/services/alerting/notifiers/hipchat.go
@@ -129,7 +129,7 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"title":       evalContext.GetNotificationTitle(),
 		"description": evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text,
 		"icon": map[string]interface{}{
-			"url": "http://grafana.org/assets/img/fav32.png",
+			"url": "https://grafana.com/assets/img/fav32.png",
 		},
 		"date": evalContext.EndTime.Unix(),
 	}
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
index 7b2bfd09c9a..0dc88a926c4 100644
--- a/pkg/services/alerting/notifiers/slack.go
+++ b/pkg/services/alerting/notifiers/slack.go
@@ -123,7 +123,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"fields":      fields,
 				"image_url":   evalContext.ImagePublicUrl,
 				"footer":      "Grafana v" + setting.BuildVersion,
-				"footer_icon": "http://grafana.org/assets/img/fav32.png",
+				"footer_icon": "https://grafana.com/assets/img/fav32.png",
 				"ts":          time.Now().Unix(),
 			},
 		},
diff --git a/public/app/plugins/app/testdata/datasource/plugin.json b/public/app/plugins/app/testdata/datasource/plugin.json
index 4d66253d78e..80445dfb3bc 100644
--- a/public/app/plugins/app/testdata/datasource/plugin.json
+++ b/public/app/plugins/app/testdata/datasource/plugin.json
@@ -10,7 +10,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "",
diff --git a/public/app/plugins/app/testdata/plugin.json b/public/app/plugins/app/testdata/plugin.json
index 1d6264c54c1..3efcd687453 100644
--- a/public/app/plugins/app/testdata/plugin.json
+++ b/public/app/plugins/app/testdata/plugin.json
@@ -7,7 +7,7 @@
     "description": "Grafana test data app",
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "version": "1.0.17",
     "updated": "2016-09-26"
diff --git a/public/app/plugins/datasource/cloudwatch/plugin.json b/public/app/plugins/datasource/cloudwatch/plugin.json
index eb2f97335da..bac2ddca8b9 100644
--- a/public/app/plugins/datasource/cloudwatch/plugin.json
+++ b/public/app/plugins/datasource/cloudwatch/plugin.json
@@ -9,7 +9,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/amazon-web-services.png",
diff --git a/public/app/plugins/datasource/elasticsearch/plugin.json b/public/app/plugins/datasource/elasticsearch/plugin.json
index 62d6a93b3b0..34a9750ee6b 100644
--- a/public/app/plugins/datasource/elasticsearch/plugin.json
+++ b/public/app/plugins/datasource/elasticsearch/plugin.json
@@ -7,7 +7,7 @@
     "description": "Elasticsearch Data Source for Grafana",
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "keywords": ["elasticsearch"],
     "logos": {
diff --git a/public/app/plugins/datasource/graphite/plugin.json b/public/app/plugins/datasource/graphite/plugin.json
index 76242fd883c..85009cfd294 100644
--- a/public/app/plugins/datasource/graphite/plugin.json
+++ b/public/app/plugins/datasource/graphite/plugin.json
@@ -14,7 +14,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/graphite_logo.png",
diff --git a/public/app/plugins/datasource/influxdb/plugin.json b/public/app/plugins/datasource/influxdb/plugin.json
index 635309d1610..56587f91c78 100644
--- a/public/app/plugins/datasource/influxdb/plugin.json
+++ b/public/app/plugins/datasource/influxdb/plugin.json
@@ -11,7 +11,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/influxdb_logo.svg",
diff --git a/public/app/plugins/datasource/opentsdb/plugin.json b/public/app/plugins/datasource/opentsdb/plugin.json
index 7de072c6948..b2f4503b5ff 100644
--- a/public/app/plugins/datasource/opentsdb/plugin.json
+++ b/public/app/plugins/datasource/opentsdb/plugin.json
@@ -11,7 +11,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/opentsdb_logo.png",
diff --git a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
index 67fa58e68de..23f4226e69f 100644
--- a/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
+++ b/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
@@ -167,7 +167,7 @@
           "valueName": "current"
         },
         {
-          "content": "<img src=\"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg\" alt=\"Prometheus logo\" style=\"height: 40px;\">\n<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"http://www.grafana.org/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
+          "content": "<img src=\"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg\" alt=\"Prometheus logo\" style=\"height: 40px;\">\n<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"https://grafana.com/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
           "editable": true,
           "error": false,
           "id": 9,
@@ -563,7 +563,7 @@
       "title": "Grafana Docs",
       "tooltip": "",
       "type": "link",
-      "url": "http://www.grafana.org/docs"
+      "url": "http://docs.grafana.org/"
     },
     {
       "icon": "info",
diff --git a/public/app/plugins/datasource/prometheus/plugin.json b/public/app/plugins/datasource/prometheus/plugin.json
index 54fd1129b8b..43bb0c53595 100644
--- a/public/app/plugins/datasource/prometheus/plugin.json
+++ b/public/app/plugins/datasource/prometheus/plugin.json
@@ -14,7 +14,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/prometheus_logo.svg",
diff --git a/public/app/plugins/panel/alertlist/plugin.json b/public/app/plugins/panel/alertlist/plugin.json
index 4767eec9e2a..9fd42bc5ed2 100644
--- a/public/app/plugins/panel/alertlist/plugin.json
+++ b/public/app/plugins/panel/alertlist/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-singlestat-panel.svg",
diff --git a/public/app/plugins/panel/dashlist/plugin.json b/public/app/plugins/panel/dashlist/plugin.json
index d46622e5e27..3b8eca5e49d 100644
--- a/public/app/plugins/panel/dashlist/plugin.json
+++ b/public/app/plugins/panel/dashlist/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",
diff --git a/public/app/plugins/panel/gettingstarted/plugin.json b/public/app/plugins/panel/gettingstarted/plugin.json
index 106f509281f..1737abdff4c 100644
--- a/public/app/plugins/panel/gettingstarted/plugin.json
+++ b/public/app/plugins/panel/gettingstarted/plugin.json
@@ -8,7 +8,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",
diff --git a/public/app/plugins/panel/graph/plugin.json b/public/app/plugins/panel/graph/plugin.json
index b2976c27e04..102c7d14e56 100644
--- a/public/app/plugins/panel/graph/plugin.json
+++ b/public/app/plugins/panel/graph/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-graph-panel.svg",
diff --git a/public/app/plugins/panel/pluginlist/plugin.json b/public/app/plugins/panel/pluginlist/plugin.json
index 72f5ea06d25..0cdc506167c 100644
--- a/public/app/plugins/panel/pluginlist/plugin.json
+++ b/public/app/plugins/panel/pluginlist/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",
diff --git a/public/app/plugins/panel/singlestat/plugin.json b/public/app/plugins/panel/singlestat/plugin.json
index 197cf3ec27d..8bf45d3b690 100644
--- a/public/app/plugins/panel/singlestat/plugin.json
+++ b/public/app/plugins/panel/singlestat/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-singlestat-panel.svg",
diff --git a/public/app/plugins/panel/table/plugin.json b/public/app/plugins/panel/table/plugin.json
index 84a527db565..c1d2c43b128 100644
--- a/public/app/plugins/panel/table/plugin.json
+++ b/public/app/plugins/panel/table/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-table-panel.svg",
diff --git a/public/app/plugins/panel/text/plugin.json b/public/app/plugins/panel/text/plugin.json
index e63974c6167..9bc604a87bb 100644
--- a/public/app/plugins/panel/text/plugin.json
+++ b/public/app/plugins/panel/text/plugin.json
@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-text-panel.svg",
diff --git a/public/views/index.html b/public/views/index.html
index 55fe9408a73..6d5d65e5201 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -49,24 +49,24 @@
 							</a>
 						</li>
 						<li>
-							<a href="https://grafana.net/support/plans" target="_blank">
+							<a href="https://grafana.com/services/support" target="_blank">
 								<i class="fa fa-support"></i>
 								Support Plans
 							</a>
 						</li>
 						<li>
-							<a href="http://grafana.org/community" target="_blank">
+							<a href="https://community.grafana.com/" target="_blank">
 								<i class="fa fa-comments-o"></i>
 								Community
 							</a>
 						</li>
 						<li>
-							<a href="http://grafana.org" target="_blank">Grafana</a>
+							<a href="https://grafana.com" target="_blank">Grafana</a>
 							<span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
 						</li>
 						[[if .NewGrafanaVersionExists]]
 							<li>
-								<a href="http://grafana.org/download" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
+								<a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
 									New version available!
 								</a>
 							</li>

From d4f2f410884907fc828aa7f783f234f2a76043eb Mon Sep 17 00:00:00 2001
From: Trent White <trent@raintank.io>
Date: Tue, 21 Mar 2017 11:12:58 -0400
Subject: [PATCH 270/301] add dashboard and plugin icons to plugin list and
 dash search

---
 public/app/core/components/search/search.html |  2 +-
 .../plugins/partials/plugin_list.html         |  2 +-
 public/img/icn-dashboard-tiny.svg             | 45 +++++++++++++++++++
 public/img/icn-plugins-tiny.svg               | 38 ++++++++++++++++
 public/sass/components/_search.scss           |  9 ++--
 public/sass/pages/_plugins.scss               |  7 +--
 6 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 public/img/icn-dashboard-tiny.svg
 create mode 100644 public/img/icn-plugins-tiny.svg

diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index 91959114216..c5c130df9ef 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -69,7 +69,7 @@
 		</a>
 
 		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.com/dashboards?utm_source=grafana_search">
-      Find dashboards on
+      		Find <img src="public/img/icn-dashboard-tiny.svg" /> dashboards on <span>Grafana.com</span>
 		</a>
 
  		<div class="clearfix"></div>
diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html
index a396b9d5265..9296494994f 100644
--- a/public/app/features/plugins/partials/plugin_list.html
+++ b/public/app/features/plugins/partials/plugin_list.html
@@ -27,7 +27,7 @@
 			</ul>
 
       <a class="get-more-plugins-link" href="https://grafana.com/plugins?utm_source=grafana_plugin_list" target="_blank">
-        Find more plugins on
+        Find more <img src="public/img/icn-plugins-tiny.svg" />plugins on <span>Grafana.com</span>
       </a>
     </div>
   </div>
diff --git a/public/img/icn-dashboard-tiny.svg b/public/img/icn-dashboard-tiny.svg
new file mode 100644
index 00000000000..d8529cbf336
--- /dev/null
+++ b/public/img/icn-dashboard-tiny.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="3.8684" y1="23.9248" x2="3.8684" y2="-0.5685">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st0" d="M5.9,7.4H1.8C1,7.4,0.4,6.8,0.4,6V1.9c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4V6
+			C7.3,6.8,6.7,7.4,5.9,7.4z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.1316" y1="23.9248" x2="12.1316" y2="-0.5685">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st1" d="M14.2,7.4h-4.2C9.3,7.4,8.7,6.8,8.7,6V1.9c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4V6
+			C15.6,6.8,15,7.4,14.2,7.4z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="3.8684" y1="23.9248" x2="3.8684" y2="-0.5685">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st2" d="M5.9,15.5H1.8c-0.8,0-1.4-0.6-1.4-1.4V10c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.2
+			C7.3,14.9,6.7,15.5,5.9,15.5z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.1316" y1="23.9248" x2="12.1316" y2="-0.5685">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st3" d="M14.2,15.5h-4.2c-0.8,0-1.4-0.6-1.4-1.4V10c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.2
+			C15.6,14.9,15,15.5,14.2,15.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/public/img/icn-plugins-tiny.svg b/public/img/icn-plugins-tiny.svg
new file mode 100644
index 00000000000..24af6e988ab
--- /dev/null
+++ b/public/img/icn-plugins-tiny.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="8" y1="22.9255" x2="8" y2="-0.8717">
+		<stop  offset="0" style="stop-color:#FFF200"/>
+		<stop  offset="1" style="stop-color:#F15A29"/>
+	</linearGradient>
+	<path class="st0" d="M14.2,7.1c-0.5,0-0.9,0.3-1.1,0.8h-3c0-0.3-0.1-0.5-0.2-0.7l2-1.1c0.2,0.2,0.6,0.4,0.9,0.4
+		c0.7,0,1.3-0.6,1.3-1.3c0-0.7-0.6-1.3-1.3-1.3s-1.3,0.6-1.3,1.3c0,0.1,0,0.2,0.1,0.4l-2,1.1C9.5,6.5,9.3,6.3,9.1,6.1l0.4-0.6
+		c0.1,0,0.2,0.1,0.4,0.1c0.7,0,1.3-0.6,1.3-1.3s-0.6-1.3-1.3-1.3S8.5,3.5,8.5,4.2c0,0.4,0.2,0.7,0.4,1L8.6,5.8
+		C8.3,5.7,8.1,5.7,7.8,5.6V1.9C8.2,1.8,8.5,1.4,8.5,1c0-0.5-0.4-1-1-1s-1,0.4-1,1c0,0.4,0.3,0.8,0.7,0.9v3.7C7,5.7,6.7,5.7,6.5,5.8
+		L5.2,3.5c0.2-0.2,0.3-0.5,0.3-0.7c0-0.6-0.5-1.1-1.1-1.1S3.3,2.2,3.3,2.8s0.5,1.1,1.1,1.1c0.1,0,0.2,0,0.2,0l1.3,2.3
+		C5.7,6.3,5.6,6.5,5.4,6.7L3.1,5.4c0-0.1,0-0.2,0-0.2C3.2,4.5,2.7,4,2.1,4S1,4.5,1,5.1c0,0.6,0.5,1.1,1.1,1.1c0.3,0,0.5-0.1,0.7-0.3
+		l2.3,1.3C5,7.5,4.9,7.7,4.9,7.9H4C3.9,7.3,3.3,6.8,2.6,6.8c-0.8,0-1.5,0.7-1.5,1.5s0.7,1.5,1.5,1.5c0.7,0,1.3-0.5,1.4-1.1h0.9
+		c0,0.3,0.1,0.5,0.2,0.7l-2.4,1.4c-0.2-0.2-0.5-0.3-0.8-0.3c-0.6,0-1.2,0.5-1.2,1.2c0,0.6,0.5,1.2,1.2,1.2S3,12.2,3,11.5
+		c0-0.1,0-0.2,0-0.3l2.4-1.4c0.2,0.2,0.3,0.4,0.5,0.5L4,13.7c-0.1,0-0.2,0-0.3,0c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1
+		s1.1-0.5,1.1-1.1c0-0.3-0.1-0.6-0.3-0.8l1.9-3.3c0.2,0.1,0.5,0.2,0.7,0.2v0.9c-0.6,0.1-1,0.7-1,1.3c0,0.7,0.6,1.3,1.3,1.3
+		s1.3-0.6,1.3-1.3c0-0.6-0.4-1.1-1-1.3v-0.9c0.3,0,0.5-0.1,0.7-0.2l1.6,2.7c-0.2,0.2-0.3,0.5-0.3,0.8c0,0.6,0.5,1.2,1.2,1.2
+		s1.2-0.5,1.2-1.2c0-0.6-0.5-1.2-1.2-1.2c-0.1,0-0.2,0-0.3,0l-1.6-2.7c0.2-0.2,0.4-0.3,0.5-0.5L9.9,10c0,0.1-0.1,0.3-0.1,0.5
+		c0,0.8,0.7,1.5,1.5,1.5s1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5c-0.4,0-0.9,0.2-1.1,0.5L10,9.3c0.1-0.2,0.2-0.5,0.2-0.7h3
+		c0.1,0.5,0.6,0.8,1.1,0.8c0.6,0,1.1-0.5,1.1-1.1C15.3,7.6,14.8,7.1,14.2,7.1z M14.2,8.9c-0.3,0-0.6-0.3-0.6-0.6
+		c0-0.3,0.3-0.6,0.6-0.6c0.3,0,0.6,0.3,0.6,0.6C14.8,8.6,14.5,8.9,14.2,8.9z M7.5,10.3c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2
+		S8.6,10.3,7.5,10.3z M12.1,5.2c0-0.4,0.4-0.8,0.8-0.8c0.4,0,0.8,0.4,0.8,0.8c0,0.4-0.4,0.8-0.8,0.8C12.5,6,12.1,5.6,12.1,5.2z
+		 M10.7,4.2c0,0.5-0.4,0.8-0.8,0.8C9.4,5,9,4.7,9,4.2s0.4-0.8,0.8-0.8C10.3,3.4,10.7,3.7,10.7,4.2z M7,1c0-0.3,0.2-0.5,0.5-0.5
+		S8,0.7,8,1S7.8,1.5,7.5,1.5S7,1.3,7,1z M3.8,2.8c0-0.3,0.3-0.6,0.6-0.6C4.7,2.2,5,2.5,5,2.8S4.7,3.4,4.4,3.4
+		C4.1,3.4,3.8,3.1,3.8,2.8z M2.1,5.7c-0.3,0-0.6-0.3-0.6-0.6s0.3-0.6,0.6-0.6s0.6,0.3,0.6,0.6S2.4,5.7,2.1,5.7z M2.6,9.2
+		c-0.5,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S3.1,9.2,2.6,9.2z M2.5,11.5c0,0.4-0.3,0.7-0.7,0.7s-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7
+		S2.5,11.2,2.5,11.5z M4.4,14.8c0,0.3-0.3,0.6-0.6,0.6s-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6S4.4,14.5,4.4,14.8z M7.5,13.9
+		c-0.4,0-0.8-0.4-0.8-0.8c0-0.4,0.4-0.8,0.8-0.8s0.8,0.4,0.8,0.8C8.3,13.5,8,13.9,7.5,13.9z M11.6,14.2c0,0.4-0.3,0.7-0.7,0.7
+		c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7C11.3,13.6,11.6,13.9,11.6,14.2z M11.4,9.5c0.6,0,1,0.5,1,1s-0.5,1-1,1s-1-0.5-1-1
+		S10.8,9.5,11.4,9.5z"/>
+</g>
+</svg>
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index d8c3942bc24..d715789d2eb 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -109,16 +109,13 @@
   .search-button-row-explore-link {
     color: $text-muted;
     font-size: $font-size-sm;
-    padding-right: 7rem;
-    background: url(../img/grafana_net_logo.svg);
-    background-size: 6.5rem;
-    background-repeat: no-repeat;
-    background-position: right;
     position: relative;
-    top: 0.8rem;
+    top: 0;
     &:hover {
       color: $link-hover-color;
     }
+    span {color: $brand-primary;}
+    img {vertical-align: top;}
   }
 }
 
diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss
index 075a7f1649c..2ef993757e2 100644
--- a/public/sass/pages/_plugins.scss
+++ b/public/sass/pages/_plugins.scss
@@ -40,16 +40,13 @@
 .get-more-plugins-link {
   color: $text-muted;
   font-size: $font-size-sm;
-  padding-right: 7rem;
-  background: url(../img/grafana_net_logo.svg);
-  background-size: 6.5rem 3rem;
-  background-repeat: no-repeat;
-  background-position: right;
   position: relative;
   top: 1.2rem;
   &:hover {
     color: $link-hover-color;
   }
+  span {color: $brand-primary;}
+  img {vertical-align: top;}
 }
 
 @include media-breakpoint-down(sm) {

From 182a30e22cc34fbdd4d184e11aef8cbe112a55a6 Mon Sep 17 00:00:00 2001
From: Trent White <trent@raintank.io>
Date: Tue, 21 Mar 2017 11:16:42 -0400
Subject: [PATCH 271/301] style tweak

---
 public/sass/components/_search.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index d715789d2eb..f88ca52aa45 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -114,8 +114,12 @@
     &:hover {
       color: $link-hover-color;
     }
-    span {color: $brand-primary;}
-    img {vertical-align: top;}
+    span {
+      color: $brand-primary;
+    }
+    img {
+      vertical-align: top;
+    }
   }
 }
 

From a510d85480ba31e2b1cef3e0ac364652b3a9f628 Mon Sep 17 00:00:00 2001
From: Trent White <trent@raintank.io>
Date: Tue, 21 Mar 2017 11:17:28 -0400
Subject: [PATCH 272/301] format css

---
 public/sass/pages/_plugins.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss
index 2ef993757e2..e95cd380089 100644
--- a/public/sass/pages/_plugins.scss
+++ b/public/sass/pages/_plugins.scss
@@ -45,8 +45,12 @@
   &:hover {
     color: $link-hover-color;
   }
-  span {color: $brand-primary;}
-  img {vertical-align: top;}
+  span {
+    color: $brand-primary;
+  }
+  img {
+    vertical-align: top;
+  }
 }
 
 @include media-breakpoint-down(sm) {

From 5ed7d65b0e5c2c9222647b475e01975d8dee0f1f Mon Sep 17 00:00:00 2001
From: Trent White <trent@raintank.io>
Date: Tue, 21 Mar 2017 13:13:35 -0400
Subject: [PATCH 273/301] orange grafana.com seemed too much. making it gray

---
 public/app/core/components/search/search.html |  2 +-
 .../plugins/partials/plugin_list.html         |  2 +-
 public/img/icn-dashboard-tiny.svg             | 30 +++++++++++--------
 public/sass/components/_search.scss           |  9 ++----
 public/sass/pages/_plugins.scss               |  5 +---
 5 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html
index c5c130df9ef..c9710e1403f 100644
--- a/public/app/core/components/search/search.html
+++ b/public/app/core/components/search/search.html
@@ -69,7 +69,7 @@
 		</a>
 
 		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.com/dashboards?utm_source=grafana_search">
-      		Find <img src="public/img/icn-dashboard-tiny.svg" /> dashboards on <span>Grafana.com</span>
+      		Find <img src="public/img/icn-dashboard-tiny.svg" width="14" /> dashboards on Grafana.com
 		</a>
 
  		<div class="clearfix"></div>
diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html
index 9296494994f..88911a0ec2f 100644
--- a/public/app/features/plugins/partials/plugin_list.html
+++ b/public/app/features/plugins/partials/plugin_list.html
@@ -27,7 +27,7 @@
 			</ul>
 
       <a class="get-more-plugins-link" href="https://grafana.com/plugins?utm_source=grafana_plugin_list" target="_blank">
-        Find more <img src="public/img/icn-plugins-tiny.svg" />plugins on <span>Grafana.com</span>
+        Find more <img src="public/img/icn-plugins-tiny.svg" />plugins on Grafana.com
       </a>
     </div>
   </div>
diff --git a/public/img/icn-dashboard-tiny.svg b/public/img/icn-dashboard-tiny.svg
index d8529cbf336..3d24f95cbdf 100644
--- a/public/img/icn-dashboard-tiny.svg
+++ b/public/img/icn-dashboard-tiny.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+	 width="16px" height="17px" viewBox="0 0 16 17" style="enable-background:new 0 0 16 17;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:url(#SVGID_1_);}
 	.st1{fill:url(#SVGID_2_);}
@@ -10,36 +10,40 @@
 </style>
 <g>
 	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="3.8684" y1="23.9248" x2="3.8684" y2="-0.5685">
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="3.9" y1="-5.2803" x2="3.9" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
 			<stop  offset="0" style="stop-color:#FFF200"/>
 			<stop  offset="1" style="stop-color:#F15A29"/>
 		</linearGradient>
-		<path class="st0" d="M5.9,7.4H1.8C1,7.4,0.4,6.8,0.4,6V1.9c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4V6
-			C7.3,6.8,6.7,7.4,5.9,7.4z"/>
+		<path class="st0" d="M5.9,7H1.8C1,7,0.4,6.4,0.4,5.6V1.5c0-0.8,0.6-1.4,1.4-1.4H6c0.8,0,1.4,0.6,1.4,1.4v4.1C7.3,6.4,6.7,7,5.9,7z
+			"/>
 	</g>
 	<g>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.1316" y1="23.9248" x2="12.1316" y2="-0.5685">
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.2" y1="-5.2803" x2="12.2" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
 			<stop  offset="0" style="stop-color:#FFF200"/>
 			<stop  offset="1" style="stop-color:#F15A29"/>
 		</linearGradient>
-		<path class="st1" d="M14.2,7.4h-4.2C9.3,7.4,8.7,6.8,8.7,6V1.9c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4V6
-			C15.6,6.8,15,7.4,14.2,7.4z"/>
+		<path class="st1" d="M14.2,7H10C9.3,7,8.7,6.4,8.7,5.6V1.5c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.1
+			C15.6,6.4,15,7,14.2,7z"/>
 	</g>
 	<g>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="3.8684" y1="23.9248" x2="3.8684" y2="-0.5685">
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="3.9" y1="-5.2803" x2="3.9" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
 			<stop  offset="0" style="stop-color:#FFF200"/>
 			<stop  offset="1" style="stop-color:#F15A29"/>
 		</linearGradient>
-		<path class="st2" d="M5.9,15.5H1.8c-0.8,0-1.4-0.6-1.4-1.4V10c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.2
-			C7.3,14.9,6.7,15.5,5.9,15.5z"/>
+		<path class="st2" d="M5.9,15.1H1.8c-0.8,0-1.4-0.6-1.4-1.4V9.6c0-0.8,0.6-1.4,1.4-1.4H6c0.8,0,1.4,0.6,1.4,1.4v4.2
+			C7.3,14.5,6.7,15.1,5.9,15.1z"/>
 	</g>
 	<g>
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.1316" y1="23.9248" x2="12.1316" y2="-0.5685">
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.1" y1="-5.2803" x2="12.1" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
 			<stop  offset="0" style="stop-color:#FFF200"/>
 			<stop  offset="1" style="stop-color:#F15A29"/>
 		</linearGradient>
-		<path class="st3" d="M14.2,15.5h-4.2c-0.8,0-1.4-0.6-1.4-1.4V10c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.2
-			C15.6,14.9,15,15.5,14.2,15.5z"/>
+		<path class="st3" d="M14.2,15.1H10c-0.8,0-1.4-0.6-1.4-1.4V9.6c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.2
+			C15.6,14.5,15,15.1,14.2,15.1z"/>
 	</g>
 </g>
 </svg>
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index f88ca52aa45..dc4ba998f63 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -107,18 +107,15 @@
   }
 
   .search-button-row-explore-link {
-    color: $text-muted;
+    color: $gray-3;
     font-size: $font-size-sm;
     position: relative;
-    top: 0;
+    top: 1.0rem;
     &:hover {
       color: $link-hover-color;
     }
-    span {
-      color: $brand-primary;
-    }
     img {
-      vertical-align: top;
+      vertical-align: text-bottom;
     }
   }
 }
diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss
index e95cd380089..c93d94f40b5 100644
--- a/public/sass/pages/_plugins.scss
+++ b/public/sass/pages/_plugins.scss
@@ -38,16 +38,13 @@
 }
 
 .get-more-plugins-link {
-  color: $text-muted;
+  color: $gray-3;
   font-size: $font-size-sm;
   position: relative;
   top: 1.2rem;
   &:hover {
     color: $link-hover-color;
   }
-  span {
-    color: $brand-primary;
-  }
   img {
     vertical-align: top;
   }

From e99137598eff8717dcff7141649dd0ec74cde26e Mon Sep 17 00:00:00 2001
From: gomlgs <aparajit@grokstyle.com>
Date: Tue, 21 Mar 2017 23:15:19 -0700
Subject: [PATCH 274/301] Cloudwatch: Correctly obtain IAM roles within ECS
 container tasks. (#7892)

We now obtain credentials based on the container task's role
rather than just relying on the credentials of the enclosing
container instance.

Fixes #6700.
---
 pkg/api/cloudwatch/cloudwatch.go      | 29 ++++++++++++++++++-
 pkg/api/cloudwatch/cloudwatch_test.go | 41 +++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 pkg/api/cloudwatch/cloudwatch_test.go

diff --git a/pkg/api/cloudwatch/cloudwatch.go b/pkg/api/cloudwatch/cloudwatch.go
index 1cf4b671e2d..9f7bf01a884 100644
--- a/pkg/api/cloudwatch/cloudwatch.go
+++ b/pkg/api/cloudwatch/cloudwatch.go
@@ -3,7 +3,9 @@ package cloudwatch
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -12,6 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
@@ -122,7 +125,7 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 			[]credentials.Provider{
 				&credentials.EnvProvider{},
 				&credentials.SharedCredentialsProvider{Filename: "", Profile: dsInfo.Profile},
-				&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(stsSess), ExpiryWindow: 5 * time.Minute},
+				remoteCredProvider(stsSess),
 			})
 		stsConfig := &aws.Config{
 			Region:      aws.String(dsInfo.Region),
@@ -176,6 +179,30 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 	return creds, nil
 }
 
+func remoteCredProvider(sess *session.Session) credentials.Provider {
+	ecsCredURI := os.Getenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI")
+
+	if len(ecsCredURI) > 0 {
+		return ecsCredProvider(sess, ecsCredURI)
+	}
+	return ec2RoleProvider(sess)
+}
+
+func ecsCredProvider(sess *session.Session, uri string) credentials.Provider {
+	const host = `169.254.170.2`
+
+	c := ec2metadata.New(sess)
+	return endpointcreds.NewProviderClient(
+		c.Client.Config,
+		c.Client.Handlers,
+		fmt.Sprintf("http://%s%s", host, uri),
+		func(p *endpointcreds.Provider) { p.ExpiryWindow = 5 * time.Minute })
+}
+
+func ec2RoleProvider(sess *session.Session) credentials.Provider {
+	return &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(sess), ExpiryWindow: 5 * time.Minute}
+}
+
 func getAwsConfig(req *cwRequest) (*aws.Config, error) {
 	creds, err := getCredentials(req.GetDatasourceInfo())
 	if err != nil {
diff --git a/pkg/api/cloudwatch/cloudwatch_test.go b/pkg/api/cloudwatch/cloudwatch_test.go
new file mode 100644
index 00000000000..41050c102ff
--- /dev/null
+++ b/pkg/api/cloudwatch/cloudwatch_test.go
@@ -0,0 +1,41 @@
+package cloudwatch
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
+	"github.com/aws/aws-sdk-go/aws/session"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestECSCredProvider(t *testing.T) {
+	Convey("Running in an ECS container task", t, func() {
+		defer os.Clearenv()
+		os.Setenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "/abc/123")
+
+		provider := remoteCredProvider(&session.Session{})
+
+		So(provider, ShouldNotBeNil)
+
+		ecsProvider, ok := provider.(*endpointcreds.Provider)
+		So(ecsProvider, ShouldNotBeNil)
+		So(ok, ShouldBeTrue)
+
+		So(ecsProvider.Client.Endpoint, ShouldEqual, fmt.Sprintf("http://169.254.170.2/abc/123"))
+	})
+}
+
+func TestDefaultEC2RoleProvider(t *testing.T) {
+	Convey("Running outside an ECS container task", t, func() {
+		provider := remoteCredProvider(&session.Session{})
+
+		So(provider, ShouldNotBeNil)
+
+		ec2Provider, ok := provider.(*ec2rolecreds.EC2RoleProvider)
+		So(ec2Provider, ShouldNotBeNil)
+		So(ok, ShouldBeTrue)
+	})
+}

From 362a349d9fc3787ae9237476c45a5b4c21f6ecd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 22 Mar 2017 07:20:29 +0100
Subject: [PATCH 275/301] cloudwatch: added #7892 to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bce9b10f792..bdd6a7750c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 * **Prometheus**: Make Prometheus query field a textarea [#7663](https://github.com/grafana/grafana/issues/7663), thx [@hagen1778](https://github.com/hagen1778)
 * **Templating**: Should not be possible to create self-referencing (recursive) template variable definitions [#7614](https://github.com/grafana/grafana/issues/7614) thx [@thuck](https://github.com/thuck)
+* **Cloudwatch**: Correctly obtain IAM roles within ECS container tasks [#7892](https://github.com/grafana/grafana/issues/7892) thx [@gomlgs](https://github.com/gomlgs)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements

From 578ba9bbd5a618080a95d5341dc1160e3c41ff18 Mon Sep 17 00:00:00 2001
From: Matt <cadnce@users.noreply.github.com>
Date: Wed, 22 Mar 2017 09:49:31 +0000
Subject: [PATCH 276/301] Added scientific notation as a unit for #7763 (#7781)

---
 public/app/core/utils/kbn.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js
index f5255b52697..d619d9c4977 100644
--- a/public/app/core/utils/kbn.js
+++ b/public/app/core/utils/kbn.js
@@ -394,6 +394,10 @@ function($, _) {
     return "0x" + hexString;
   };
 
+  kbn.valueFormats.sci = function(value, decimals) {
+    return value.toExponential(decimals);
+  };
+
   // Currencies
   kbn.valueFormats.currencyUSD = kbn.formatBuilders.currency('$');
   kbn.valueFormats.currencyGBP = kbn.formatBuilders.currency('£');
@@ -703,15 +707,16 @@ function($, _) {
       {
         text: 'none',
         submenu: [
-          {text: 'none' ,             value: 'none'       },
-          {text: 'short',             value: 'short'      },
-          {text: 'percent (0-100)',   value: 'percent'    },
-          {text: 'percent (0.0-1.0)', value: 'percentunit'},
-          {text: 'Humidity (%H)',     value: 'humidity'   },
-          {text: 'ppm',               value: 'ppm'        },
-          {text: 'decibel',           value: 'dB'         },
-          {text: 'hexadecimal (0x)',  value: 'hex0x'      },
-          {text: 'hexadecimal',       value: 'hex'        },
+          {text: 'none' ,               value: 'none'       },
+          {text: 'short',               value: 'short'      },
+          {text: 'percent (0-100)',     value: 'percent'    },
+          {text: 'percent (0.0-1.0)',   value: 'percentunit'},
+          {text: 'Humidity (%H)',       value: 'humidity'   },
+          {text: 'ppm',                 value: 'ppm'        },
+          {text: 'decibel',             value: 'dB'         },
+          {text: 'hexadecimal (0x)',    value: 'hex0x'      },
+          {text: 'hexadecimal',         value: 'hex'        },
+          {text: 'scientific notation', value: 'sci'        },
         ]
       },
       {

From 7dd09d4185318a126d622d43ad06e746251ba2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 22 Mar 2017 10:51:06 +0100
Subject: [PATCH 277/301] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd6a7750c8..b1ec84c374f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * **Prometheus**: Make Prometheus query field a textarea [#7663](https://github.com/grafana/grafana/issues/7663), thx [@hagen1778](https://github.com/hagen1778)
 * **Templating**: Should not be possible to create self-referencing (recursive) template variable definitions [#7614](https://github.com/grafana/grafana/issues/7614) thx [@thuck](https://github.com/thuck)
 * **Cloudwatch**: Correctly obtain IAM roles within ECS container tasks [#7892](https://github.com/grafana/grafana/issues/7892) thx [@gomlgs](https://github.com/gomlgs)
+* **Units**: New number format: Scientific notation [#7781](https://github.com/grafana/grafana/issues/7781) thx [@cadnce](https://github.com/cadnce)
 
 # 4.2.0-beta2 (unreleased)
 ## Minor Enhancements

From 01f646c1910706fa4e91651f0394f3ceccb87a08 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 22 Mar 2017 14:06:53 +0100
Subject: [PATCH 278/301] docs: adds 4.2.0 release date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ec84c374f..e4502ec251d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 * **Cloudwatch**: Correctly obtain IAM roles within ECS container tasks [#7892](https://github.com/grafana/grafana/issues/7892) thx [@gomlgs](https://github.com/gomlgs)
 * **Units**: New number format: Scientific notation [#7781](https://github.com/grafana/grafana/issues/7781) thx [@cadnce](https://github.com/cadnce)
 
-# 4.2.0-beta2 (unreleased)
+# 4.2.0 (2017-03-22)
 ## Minor Enhancements
 * **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)
 * **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)

From b404f32a09510e8fc310b6c825b57a523c91bd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 22 Mar 2017 14:26:45 +0100
Subject: [PATCH 279/301] docs: updated download links

---
 docs/sources/installation/debian.md  | 15 +++------------
 docs/sources/installation/rpm.md     | 10 +++++-----
 docs/sources/installation/windows.md |  3 +--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 19d2c87a2b6..c82b7f1c0e5 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -15,23 +15,14 @@ weight = 1
 
 Description | Download
 ------------ | -------------
-Stable for Debian-based Linux | [4.1.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb)
-Beta for Debian-based Linux | [4.2.0-beta1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.2.0-beta1_amd64.deb)
+Stable for Debian-based Linux | [4.2.0 (x86-64 deb)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.2.0_amd64.deb)
 
 ## Install Stable
 
 ```
-$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb
+$ wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.2.0_amd64.deb
 $ sudo apt-get install -y adduser libfontconfig
-$ sudo dpkg -i grafana_4.1.2-1486989747_amd64.deb
-```
-
-## Install Beta
-
-```
-$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.2.0-beta1_amd64.deb
-$ sudo apt-get install -y adduser libfontconfig
-$ sudo dpkg -i grafana_4.2.0-beta1_amd64.deb
+$ sudo dpkg -i grafana_4.2.0_amd64.deb
 ```
 
 ## APT Repository
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 799e3441b66..c0952328cbe 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -15,25 +15,25 @@ weight = 2
 
 Description | Download
 ------------ | -------------
-Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2-1486989747.x86_64.rpm)
-Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.2.0-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.2.0-beta1.x86_64.rpm)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.2.0 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm)
 
 ## Install Stable
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2-1486989747.x86_64.rpm
+    $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm
 
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:
 
+    $ wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-4.1.2-1486989747.x86_64.rpm
+    $ sudo rpm -Uvh grafana-4.2.0-1.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-4.1.2-1486989747.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-4.2.0-1.x86_64.rpm
 
 ## Install via YUM Repository
 
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index b495ad81e98..229654ef58e 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -13,8 +13,7 @@ weight = 3
 
 Description | Download
 ------------ | -------------
-Latest stable package for Windows | [grafana.4.1.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2.windows-x64.zip)
-Latest beta package for Windows | [grafana-4.2.0-beta1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.2.0-beta1.windows-x64.zip)
+Latest stable package for Windows | [grafana.4.2.0.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0.windows-x64.zip)
 
 ## Configure
 

From 8aa00f9227c7f40150486bb3c65536b176f47c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 22 Mar 2017 15:07:24 +0100
Subject: [PATCH 280/301] build: updated publish script

---
 packaging/publish/publish_both.sh | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packaging/publish/publish_both.sh b/packaging/publish/publish_both.sh
index 3a70c6d9133..5edf679b481 100755
--- a/packaging/publish/publish_both.sh
+++ b/packaging/publish/publish_both.sh
@@ -1,19 +1,18 @@
 #! /usr/bin/env bash
-deb_ver=4.1.2-1486989747
-rpm_ver=4.1.2-1486989747
+version=4.2.0
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${version}_amd64.deb
 
-package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/stable/debian/jessie grafana_${version}_amd64.deb
+package_cloud push grafana/stable/debian/wheezy grafana_${version}_amd64.deb
 
-package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/testing/debian/jessie grafana_${version}_amd64.deb
+package_cloud push grafana/testing/debian/wheezy grafana_${version}_amd64.deb
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}-1.x86_64.rpm
 
-package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
-package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/testing/el/6 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/testing/el/7 grafana-${version}-1.x86_64.rpm
 
-package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm
-package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm

From 68e6700663dc643d4feb55aad233f4d423a9d571 Mon Sep 17 00:00:00 2001
From: Tobias Wolf <towolf@gmail.com>
Date: Wed, 22 Mar 2017 16:49:35 +0100
Subject: [PATCH 281/301] Add an After= DB ordering relation to systemd
 .service (#7903)

In systemd `After=` merely codes an ordering relation and does not start
other units.

Grafana needs to specify that it wants to start up _after_ either of the
supported DB services have started, _if they start_.

Enabling the database services, however, is out of scope for Grafana.
---
 packaging/deb/systemd/grafana-server.service | 1 +
 packaging/rpm/systemd/grafana-server.service | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packaging/deb/systemd/grafana-server.service b/packaging/deb/systemd/grafana-server.service
index ea7193c55a6..a2eb6f1880a 100644
--- a/packaging/deb/systemd/grafana-server.service
+++ b/packaging/deb/systemd/grafana-server.service
@@ -3,6 +3,7 @@ Description=Grafana instance
 Documentation=http://docs.grafana.org
 Wants=network-online.target
 After=network-online.target
+After=postgresql.service mariadb.service mysql.service
 
 [Service]
 EnvironmentFile=/etc/default/grafana-server
diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
index ec0ef7e804e..a6e02073d46 100644
--- a/packaging/rpm/systemd/grafana-server.service
+++ b/packaging/rpm/systemd/grafana-server.service
@@ -3,6 +3,7 @@ Description=Grafana instance
 Documentation=http://docs.grafana.org
 Wants=network-online.target
 After=network-online.target
+After=postgresql.service mariadb.service mysql.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/grafana-server

From 7864828e756a0efcd35fd9c7f1df187b06caa62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 23 Mar 2017 11:09:35 +0100
Subject: [PATCH 282/301] packaging: publish nightly builds

---
 build.go                 |   2 +-
 circle.yml               |   1 +
 scripts/build/publish.go | 150 +++++++++++++++++++++++++++++++++++++++
 tasks/build_task.js      |   4 ++
 4 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 scripts/build/publish.go

diff --git a/build.go b/build.go
index 8ac7fada898..a706842dfec 100644
--- a/build.go
+++ b/build.go
@@ -351,7 +351,7 @@ func grunt(params ...string) {
 func gruntBuildArg(task string) []string {
 	args := []string{task}
 	if includeBuildNumber {
-		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", version, linuxPackageIteration))
+		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
 	} else {
 		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
 	}
diff --git a/circle.yml b/circle.yml
index 9c5f0f1ccbd..8ae37162490 100644
--- a/circle.yml
+++ b/circle.yml
@@ -45,6 +45,7 @@ deployment:
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master
       - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
+      - go run ./scripts/build/publish.go -apiKey "${GRAFANA_COM_API_KEY}"
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
     commands:
diff --git a/scripts/build/publish.go b/scripts/build/publish.go
new file mode 100644
index 00000000000..447d38068bd
--- /dev/null
+++ b/scripts/build/publish.go
@@ -0,0 +1,150 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"time"
+)
+
+var apiUrl = flag.String("apiUrl", "https://grafana.com/api", "api url")
+var apiKey = flag.String("apiKey", "", "api key")
+var version = ""
+var versionRe = regexp.MustCompile(`grafana-(.*)\.(linux|windows)`)
+var builds = []build{}
+
+func main() {
+	flag.Parse()
+	if *apiKey == "" {
+		log.Fatalf("Require apiKey command line parameters")
+	}
+
+	err := filepath.Walk("dist", packageWalker)
+	if err != nil {
+		log.Fatalf("Cannot find any packages to publish, %v", err)
+	}
+
+	if version == "" {
+		log.Fatalf("No version found")
+	}
+
+	if len(builds) == 0 {
+		log.Fatalf("No builds found")
+	}
+
+	nightly := release{
+		Version:         version,
+		ReleaseDate:     time.Now(),
+		Stable:          false,
+		Nightly:         true,
+		Beta:            false,
+		WhatsNewUrl:     "",
+		ReleaseNotesUrl: "",
+		Builds:          builds,
+	}
+
+	postRequest("/grafana/versions", nightly, fmt.Sprintf("Create Release %s", nightly.Version))
+	postRequest("/grafana/versions/"+nightly.Version, nightly, fmt.Sprintf("Update Release %s", nightly.Version))
+
+	for _, b := range nightly.Builds {
+		postRequest(fmt.Sprintf("/grafana/versions/%s/packages", nightly.Version), b, fmt.Sprintf("Create Build %s %s", b.Os, b.Arch))
+		postRequest(fmt.Sprintf("/grafana/versions/%s/packages/%s/%s", nightly.Version, b.Arch, b.Os), b, fmt.Sprintf("Update Build %s %s", b.Os, b.Arch))
+	}
+}
+
+func packageWalker(path string, f os.FileInfo, err error) error {
+	if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") {
+		return nil
+	}
+
+	log.Printf("Finding package file %s", f.Name())
+	result := versionRe.FindSubmatch([]byte(f.Name()))
+
+	if len(result) > 0 {
+		version = string(result[1])
+		log.Printf("Version detected: %v", version)
+	}
+
+	shaBytes, err := ioutil.ReadFile(path + ".sha256")
+	if err != nil {
+		log.Fatalf("Failed to read sha256 file", err)
+	}
+
+	os := ""
+	if strings.Contains(f.Name(), "linux-x64.tar.gz") {
+		os = "linux"
+	}
+	if strings.HasSuffix(f.Name(), "windows-x64.zip") {
+		os = "win"
+	}
+	if strings.HasSuffix(f.Name(), ".rpm") {
+		os = "rhel"
+	}
+	if strings.HasSuffix(f.Name(), ".deb") {
+		os = "deb"
+	}
+
+	builds = append(builds, build{
+		Os:     os,
+		Arch:   "amd64",
+		Url:    "https://s3-us-west-2.amazonaws.com/grafana-releases/master/" + f.Name(),
+		Sha256: string(shaBytes),
+	})
+
+	return nil
+}
+
+func postRequest(url string, obj interface{}, desc string) {
+	jsonBytes, _ := json.Marshal(obj)
+	req, _ := http.NewRequest(http.MethodPost, (*apiUrl)+url, bytes.NewReader(jsonBytes))
+	req.Header.Add("Authorization", "Bearer "+(*apiKey))
+	req.Header.Add("Content-Type", "application/json")
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+
+	if res.StatusCode == http.StatusOK {
+		log.Printf("Action: %s \t OK", desc)
+	} else {
+
+		if res.Body != nil {
+			defer res.Body.Close()
+			body, _ := ioutil.ReadAll(res.Body)
+			if strings.Contains(string(body), "already exists") || strings.Contains(string(body), "Nothing to update") {
+				log.Printf("Action: %s \t Already exists", desc)
+			} else {
+				log.Printf("Action: %s \t Failed - Status: %v", desc, res.Status)
+				log.Printf("Resp: %s", body)
+				log.Fatalf("Quiting")
+			}
+		}
+	}
+}
+
+type release struct {
+	Version         string    `json:"version"`
+	ReleaseDate     time.Time `json:"releaseDate"`
+	Stable          bool      `json:"stable"`
+	Beta            bool      `json:"beta"`
+	Nightly         bool      `json:"nightly"`
+	WhatsNewUrl     string    `json:"whatsNewUrl"`
+	ReleaseNotesUrl string    `json:"releaseNotesUrl"`
+	Builds          []build   `json:"-"`
+}
+
+type build struct {
+	Os     string `json:"os"`
+	Url    string `json:"url"`
+	Sha256 string `json:"sha256"`
+	Arch   string `json:"arch"`
+}
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 7956c66fc23..e6751aa399d 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -1,3 +1,5 @@
+var path = require('path');
+
 module.exports = function(grunt) {
   "use strict";
 
@@ -67,6 +69,8 @@ module.exports = function(grunt) {
     grunt.task.run('copy:public_gen_to_temp');
     grunt.task.run('copy:backend_bin');
     grunt.task.run('copy:backend_files');
+
+    grunt.file.write(path.join(grunt.config('tempDir'), 'VERSION'), grunt.config('pkg.version'));
   });
 
 };

From 887867165c9c2ac9f67691e07d01fe3fd02fa9e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 23 Mar 2017 11:31:47 +0100
Subject: [PATCH 283/301] packaging: testing fix

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 8ae37162490..b8767b79b8b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -45,7 +45,7 @@ deployment:
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
       - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master
       - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
-      - go run ./scripts/build/publish.go -apiKey "${GRAFANA_COM_API_KEY}"
+      - go run ./scripts/build/publish.go -apiKey ${GRAFANA_COM_API_KEY}
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
     commands:

From 6828d35480fc9d53b52694c0fa1734a0156b3e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 23 Mar 2017 12:38:42 +0100
Subject: [PATCH 284/301] packaging: build fix

---
 scripts/build/publish.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/publish.go b/scripts/build/publish.go
index 447d38068bd..ed738e2312a 100644
--- a/scripts/build/publish.go
+++ b/scripts/build/publish.go
@@ -61,7 +61,7 @@ func main() {
 }
 
 func packageWalker(path string, f os.FileInfo, err error) error {
-	if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") {
+	if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") || strings.Contains(f.Name(), "latest") {
 		return nil
 	}
 

From 83d864e7e42dc46e2fc015146f84200417718097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 23 Mar 2017 14:23:22 +0100
Subject: [PATCH 285/301] fix: graph and fill below to issue, fixes #7916

---
 public/app/plugins/panel/graph/series_overrides_ctrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/graph/series_overrides_ctrl.js b/public/app/plugins/panel/graph/series_overrides_ctrl.js
index 0a338ff86e8..f5dae8e3c7e 100644
--- a/public/app/plugins/panel/graph/series_overrides_ctrl.js
+++ b/public/app/plugins/panel/graph/series_overrides_ctrl.js
@@ -39,7 +39,7 @@ define([
       // can be removed by the user if they still want lines
       if (item.propertyName === 'fillBelowTo') {
         $scope.override['lines'] = false;
-        $scope.addSeriesOverride({ alias: subItem.value, lines: false });
+        $scope.ctrl.addSeriesOverride({alias: subItem.value, lines: false });
       }
 
       $scope.updateCurrentOverrides();

From beb85f413ac3549b83cd7cc94acd1439934a2986 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 23 Mar 2017 15:26:13 +0100
Subject: [PATCH 286/301] oauth: delete session key instead of set to empty

Adds the Delete function to the Session wrapper so that the Macaron
function for deleting keys from a Session can be used.

https://go-macaron.com/docs/middlewares/session#implement-provider-interface
---
 pkg/api/login.go          | 2 +-
 pkg/middleware/session.go | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/api/login.go b/pkg/api/login.go
index 83a2a2713eb..d2bbf4e81b9 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -36,7 +36,7 @@ func LoginView(c *middleware.Context) {
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
 
 	if loginError, ok := c.Session.Get("loginError").(string); ok {
-		c.Session.Set("loginError", "") // TODO: is there a proper way to delete a session var?
+		c.Session.Delete("loginError")
 		viewData.Settings["loginError"] = loginError
 	}
 
diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go
index dad2ad20efc..a6af63d18de 100644
--- a/pkg/middleware/session.go
+++ b/pkg/middleware/session.go
@@ -93,6 +93,8 @@ type SessionStore interface {
 	Set(interface{}, interface{}) error
 	// Get gets value by given key in session.
 	Get(interface{}) interface{}
+	// Delete deletes a key from session.
+	Delete(interface{}) interface{}
 	// ID returns current session ID.
 	ID() string
 	// Release releases session resource and save data to provider.
@@ -128,6 +130,13 @@ func (s *SessionWrapper) Get(k interface{}) interface{} {
 	return nil
 }
 
+func (s *SessionWrapper) Delete(k interface{}) interface{} {
+	if s.session != nil {
+		return s.session.Delete(k)
+	}
+	return nil
+}
+
 func (s *SessionWrapper) ID() string {
 	if s.session != nil {
 		return s.session.ID()

From 5773499dbae1b82cabe665fea8ea4ba4b6a3422c Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 23 Mar 2017 15:33:59 +0100
Subject: [PATCH 287/301] docs: adds note for #6428

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4502ec251d..5470a86fb47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * **Templating**: Should not be possible to create self-referencing (recursive) template variable definitions [#7614](https://github.com/grafana/grafana/issues/7614) thx [@thuck](https://github.com/thuck)
 * **Cloudwatch**: Correctly obtain IAM roles within ECS container tasks [#7892](https://github.com/grafana/grafana/issues/7892) thx [@gomlgs](https://github.com/gomlgs)
 * **Units**: New number format: Scientific notation [#7781](https://github.com/grafana/grafana/issues/7781) thx [@cadnce](https://github.com/cadnce)
+* **Oauth**: Add common type for oauth authorization errors [#6428](https://github.com/grafana/grafana/issues/6428) thx [@amenzhinsky](https://github.com/amenzhinsky)
 
 # 4.2.0 (2017-03-22)
 ## Minor Enhancements

From f45d63702581a6358ae5266fdece61612b42e25f Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 23 Mar 2017 15:52:08 +0100
Subject: [PATCH 288/301] auth: fix warning in test

---
 pkg/middleware/auth_proxy_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/middleware/auth_proxy_test.go b/pkg/middleware/auth_proxy_test.go
index cc9253b6a77..bd587bc0c7f 100644
--- a/pkg/middleware/auth_proxy_test.go
+++ b/pkg/middleware/auth_proxy_test.go
@@ -90,6 +90,10 @@ func (s *mockSession) Get(k interface{}) interface{} {
 	return s.value
 }
 
+func (s *mockSession) Delete(k interface{}) interface{} {
+	return nil
+}
+
 func (s *mockSession) ID() string {
 	return ""
 }

From 77ca62b1bc6ba17fc0e8183edccb52d821b2daf9 Mon Sep 17 00:00:00 2001
From: 0x6875790d0a <doxuanhuy@gmail.com>
Date: Fri, 24 Mar 2017 01:04:18 +0900
Subject: [PATCH 289/301] Update README.md

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

diff --git a/README.md b/README.md
index cefa8d605d7..35bfad353fc 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [What's New in Grafana 3.0](http://docs.grafana.org/guides/whats-new-in-v3/)
 - [What's New in Grafana 4.0](http://docs.grafana.org/guides/whats-new-in-v4/)
 - [What's New in Grafana 4.1](http://docs.grafana.org/guides/whats-new-in-v4-1/)
+- [What's New in Grafana 4.2](http://docs.grafana.org/guides/whats-new-in-v4-2/)
 
 ## Features
 ### Graphite Target Editor

From 44c9ba2edf2a1a2337f4d280f47068493bb81c20 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Thu, 23 Mar 2017 18:07:29 +0100
Subject: [PATCH 290/301] docs: add query parameter to api user search

ref #7469
---
 docs/sources/http_api/user.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/http_api/user.md b/docs/sources/http_api/user.md
index 9b759330489..fa20fd3e9b3 100644
--- a/docs/sources/http_api/user.md
+++ b/docs/sources/http_api/user.md
@@ -48,16 +48,16 @@ Default value for the `perpage` parameter is `1000` and for the `page` parameter
 
 ## Search Users with Paging
 
-`GET /api/users/search?perpage=10&page=1`
+`GET /api/users/search?perpage=10&page=1&query=mygraf`
 
 **Example Request**:
 
-    GET /api/users/search?perpage=10&page=1 HTTP/1.1
+    GET /api/users/search?perpage=10&page=1&query=mygraf HTTP/1.1
     Accept: application/json
     Content-Type: application/json
     Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
-Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the user list E.g. if `totalCount` is equal to 100 users and the `perpage` parameter is set to 10 then there are 10 pages of users.
+Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the user list E.g. if `totalCount` is equal to 100 users and the `perpage` parameter is set to 10 then there are 10 pages of users. The `query` parameter is optional and it will return results where the query value is contained in one of the `name`, `login` or `email` fields. Query values with spaces need to be url encoded e.g. `query=Jane%20Doe`.
 
 **Example Response**:
 

From 54883e09d52cc1b64d7a1f3407da25752c20fe81 Mon Sep 17 00:00:00 2001
From: crmacleo <crmacleo@sfu.ca>
Date: Sun, 26 Mar 2017 17:27:19 -0700
Subject: [PATCH 291/301] docs: fix some spelling/grammar/wording issues

---
 docs/sources/guides/whats-new-in-v4.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/sources/guides/whats-new-in-v4.md b/docs/sources/guides/whats-new-in-v4.md
index cfd454cdc23..68a40ed7a1e 100644
--- a/docs/sources/guides/whats-new-in-v4.md
+++ b/docs/sources/guides/whats-new-in-v4.md
@@ -27,7 +27,7 @@ notifications will be sent out when the rule conditions are met.
 
 This feature has been worked on for over a year with many iterations and rewrites
 just to make sure the foundations are really solid. We are really proud to finally release it!
-Since the alerting execution is processed in the backend all data source plugins are not supported.
+Since the alerting execution is processed in the backend not all data source plugins are supported.
 Right now Graphite, Prometheus, InfluxDB and OpenTSDB are supported. Elasticsearch is being worked
 on but will be not ready for v4 release.
 
@@ -70,8 +70,8 @@ to add graph comments in the form of annotations directly from within Grafana in
 
 {{< imgbox max-width="30%" img="/img/docs/v4/alert_list_panel.png" caption="Alert List Panel" >}}
 
-This new panel allows you to show alert rules or a history of alert rule state changes. You can filter based on states your
-interested in. Very useful panel for overview style dashboards.
+This new panel allows you to show alert rules or a history of alert rule state changes. You can filter based on states you are
+interested in. This panel is very useful for overview style dashboards.
 
 <div class="clearfix"></div>
 
@@ -79,8 +79,8 @@ interested in. Very useful panel for overview style dashboards.
 
 {{< imgbox max-width="30%" img="/img/docs/v4/adhoc_filters.gif" caption="Ad-hoc filters variable" >}}
 
-This is a new and very different type of template variable. It will allow you to create new key/value filters on the fly.
-With autocomplete for both key and values. The filter condition will be automatically applied to all
+This is a new and very different type of template variable. It will allow you to create new key/value filters on the fly
+with autocomplete for both key and values. The filter condition will be automatically applied to all
 queries that use that data source. This feature opens up more exploratory dashboards. In the gif animation to the right
 you have a dashboard for Elasticsearch log data. It uses one query variable that allow you to quickly change how the data
 is grouped, and an interval variable for controlling the granularity of the time buckets. What was missing
@@ -126,15 +126,15 @@ We always try to bring some UX/UI refinements & polish in every release.
 
 {{< imgbox max-width="50%" img="/img/docs/v4/add_panel.gif" caption="Add Panel flow" >}}
 
-We spent a lot of time improving the dashboard building experience. Trying to make it both
+We spent a lot of time improving the dashboard building experience to make it both
 more efficient and easier for beginners. After many good but not great experiments
 with a `build mode` we eventually decided to just improve the green row menu and
 continue work on a `build mode` for a future release.
 
 The new row menu automatically slides out when you mouse over the edge of the row. You no longer need
-to hover over the small green icon and the click it to expand the row menu.
+to hover over the small green icon and then click it to expand the row menu.
 
-There is some minor improvements to drag and drop behaviour. Now when dragging a panel from one row
+There are some minor improvements to drag and drop behaviour. Now when dragging a panel from one row
 to another you will insert the panel and Grafana will automatically make room for it.
 When you drag a panel within a row you will simply reorder the panels.
 
@@ -150,7 +150,7 @@ We plan to further improve dashboard building in the future with a more rich gri
 {{< imgbox max-width="40%" img="/img/docs/v4/shortcuts.png" caption="Shortcuts" >}}
 
 Grafana v4 introduces a number of really powerful keyboard shortcuts. You can now focus a panel
-by hovering over it with your mouse. With a panel focused you can simple hit `e` to toggle panel
+by hovering over it with your mouse. With a panel focused you can simply hit `e` to toggle panel
 edit mode, or `v` to toggle fullscreen mode. `p r` removes the panel. `p s` opens share
 modal.
 
@@ -164,10 +164,10 @@ Some nice navigation shortcuts are:
 
 ## Upgrade & Breaking changes
 
-There are no breaking changes. Old dashboards and features should work the same. Grafana-server will automatically upgrade it's db
+There are no breaking changes. Old dashboards and features should work the same. Grafana-server will automatically upgrade its db
 schema on restart. It's advisable to do a backup of Grafana's database before updating.
 
-If your are using plugins make sure to update your plugins as some might not work perfectly v4.
+If you are using plugins make sure to update your plugins as some might not work perfectly v4.
 
 You can update plugins using grafana-cli
 

From dde8583db80855f7ca625bf70ffa7938023dc76b Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@raintank.io>
Date: Mon, 27 Mar 2017 18:04:03 -0400
Subject: [PATCH 292/301] xorm engine.SetMaxConns is a deprecated alias for
 engine.SetMaxOpenConns

---
 conf/defaults.ini                 | 1 -
 conf/sample.ini                   | 1 -
 pkg/services/sqlstore/sqlstore.go | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 9f2c9ed6de3..490c2415e68 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -74,7 +74,6 @@ password =
 url =
 
 # Max conn setting default is 0 (mean not set)
-max_conn =
 max_idle_conn =
 max_open_conn =
 
diff --git a/conf/sample.ini b/conf/sample.ini
index 3b7415e4217..3a61186f05e 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -83,7 +83,6 @@
 ;path = grafana.db
 
 # Max conn setting default is 0 (mean not set)
-;max_conn =
 ;max_idle_conn =
 ;max_open_conn =
 
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index ef22dd9b6c6..d1f555d2d7f 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -29,7 +29,6 @@ type DatabaseConfig struct {
 	ClientKeyPath                              string
 	ClientCertPath                             string
 	ServerCertName                             string
-	MaxConn                                    int
 	MaxOpenConn                                int
 	MaxIdleConn                                int
 }
@@ -157,7 +156,6 @@ func getEngine() (*xorm.Engine, error) {
 	if err != nil {
 		return nil, err
 	} else {
-		engine.SetMaxConns(DbCfg.MaxConn)
 		engine.SetMaxOpenConns(DbCfg.MaxOpenConn)
 		engine.SetMaxIdleConns(DbCfg.MaxIdleConn)
 		// engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm")))
@@ -191,7 +189,6 @@ func LoadConfig() {
 		DbCfg.Host = sec.Key("host").String()
 		DbCfg.Name = sec.Key("name").String()
 		DbCfg.User = sec.Key("user").String()
-		DbCfg.MaxConn = sec.Key("max_conn").MustInt(0)
 		DbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
 		DbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(0)
 		if len(DbCfg.Pwd) == 0 {

From e91a0781055684031895c11264eda470dd866a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20Hansl=C3=ADk?= <kukulich@kukulich.cz>
Date: Tue, 28 Mar 2017 10:05:44 +0200
Subject: [PATCH 293/301] Slack notification should contain fallback text
 (#7961)

---
 pkg/services/alerting/notifiers/slack.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
index 0dc88a926c4..a0d08ae2ba7 100644
--- a/pkg/services/alerting/notifiers/slack.go
+++ b/pkg/services/alerting/notifiers/slack.go
@@ -116,6 +116,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 	body := map[string]interface{}{
 		"attachments": []map[string]interface{}{
 			{
+				"fallback":    evalContext.GetNotificationTitle(),
 				"color":       evalContext.GetStateModel().Color,
 				"title":       evalContext.GetNotificationTitle(),
 				"title_link":  ruleUrl,

From 24d4e50343ef0fd9dc6209064637773a73724274 Mon Sep 17 00:00:00 2001
From: Dan Cech <dan@aussiedan.com>
Date: Tue, 28 Mar 2017 08:34:53 -0400
Subject: [PATCH 294/301] utf8mb4 encoding (#7959)

* use utf8mb4 character set for connections to mysql

* use utf8mb4 character set for tables, shorten varchar fields used in unique indexes

* migration type to update table character set

* update table character sets

* set charset for temp_user.status

* gofmt
---
 pkg/services/sqlstore/migrations/alert_mig.go | 17 +++++++++++++-
 .../sqlstore/migrations/annotation_mig.go     | 10 ++++++++
 .../sqlstore/migrations/apikey_mig.go         | 12 +++++++---
 .../sqlstore/migrations/dashboard_mig.go      | 15 ++++++++++--
 .../migrations/dashboard_snapshot_mig.go      | 14 ++++++++---
 .../sqlstore/migrations/datasource_mig.go     | 18 +++++++++++++--
 pkg/services/sqlstore/migrations/org_mig.go   | 17 +++++++++++++-
 .../sqlstore/migrations/playlist_mig.go       | 11 +++++++++
 .../sqlstore/migrations/plugin_setting.go     |  8 ++++++-
 .../sqlstore/migrations/preferences_mig.go    |  5 ++++
 pkg/services/sqlstore/migrations/quota_mig.go |  6 ++++-
 pkg/services/sqlstore/migrations/temp_user.go |  9 ++++++++
 pkg/services/sqlstore/migrations/user_mig.go  | 19 +++++++++++----
 pkg/services/sqlstore/migrator/dialect.go     |  7 +++++-
 pkg/services/sqlstore/migrator/migrations.go  | 14 +++++++++++
 .../sqlstore/migrator/mysql_dialect.go        | 23 ++++++++++++++++++-
 .../sqlstore/migrator/postgres_dialect.go     | 11 +++++++++
 pkg/services/sqlstore/sqlstore.go             |  2 +-
 pkg/services/sqlstore/sqlutil/sqlutil.go      |  2 +-
 19 files changed, 198 insertions(+), 22 deletions(-)

diff --git a/pkg/services/sqlstore/migrations/alert_mig.go b/pkg/services/sqlstore/migrations/alert_mig.go
index b6956be41c7..7b6558656f1 100644
--- a/pkg/services/sqlstore/migrations/alert_mig.go
+++ b/pkg/services/sqlstore/migrations/alert_mig.go
@@ -50,7 +50,7 @@ func addAlertMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "org_id", Type: DB_BigInt, Nullable: false},
-			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "settings", Type: DB_Text, Nullable: false},
 			{Name: "created", Type: DB_DateTime, Nullable: false},
@@ -67,4 +67,19 @@ func addAlertMigrations(mg *Migrator) {
 	}))
 	mg.AddMigration("add index alert_notification org_id & name", NewAddIndexMigration(alert_notification, alert_notification.Indices[0]))
 
+	mg.AddMigration("Update alert table charset", NewTableCharsetMigration("alert", []*Column{
+		{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "message", Type: DB_Text, Nullable: false},
+		{Name: "state", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "settings", Type: DB_Text, Nullable: false},
+		{Name: "severity", Type: DB_Text, Nullable: false},
+		{Name: "execution_error", Type: DB_Text, Nullable: false},
+		{Name: "eval_data", Type: DB_Text, Nullable: true},
+	}))
+
+	mg.AddMigration("Update alert_notification table charset", NewTableCharsetMigration("alert_notification", []*Column{
+		{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "settings", Type: DB_Text, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go
index a307100ad3c..4a7206f9d64 100644
--- a/pkg/services/sqlstore/migrations/annotation_mig.go
+++ b/pkg/services/sqlstore/migrations/annotation_mig.go
@@ -44,4 +44,14 @@ func addAnnotationMig(mg *Migrator) {
 	mg.AddMigration("add index annotation 2 v3", NewAddIndexMigration(table, table.Indices[2]))
 	mg.AddMigration("add index annotation 3 v3", NewAddIndexMigration(table, table.Indices[3]))
 	mg.AddMigration("add index annotation 4 v3", NewAddIndexMigration(table, table.Indices[4]))
+
+	mg.AddMigration("Update annotation table charset", NewTableCharsetMigration("annotation", []*Column{
+		{Name: "type", Type: DB_NVarchar, Length: 25, Nullable: false},
+		{Name: "title", Type: DB_Text, Nullable: false},
+		{Name: "text", Type: DB_Text, Nullable: false},
+		{Name: "metric", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "prev_state", Type: DB_NVarchar, Length: 25, Nullable: false},
+		{Name: "new_state", Type: DB_NVarchar, Length: 25, Nullable: false},
+		{Name: "data", Type: DB_Text, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/apikey_mig.go b/pkg/services/sqlstore/migrations/apikey_mig.go
index a02e759f551..928f84c4fb0 100644
--- a/pkg/services/sqlstore/migrations/apikey_mig.go
+++ b/pkg/services/sqlstore/migrations/apikey_mig.go
@@ -8,7 +8,7 @@ func addApiKeyMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "account_id", Type: DB_BigInt, Nullable: false},
-			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "key", Type: DB_Varchar, Length: 64, Nullable: false},
 			{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "created", Type: DB_DateTime, Nullable: false},
@@ -41,8 +41,8 @@ func addApiKeyMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "org_id", Type: DB_BigInt, Nullable: false},
-			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "key", Type: DB_Varchar, Length: 255, Nullable: false},
+			{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "key", Type: DB_Varchar, Length: 190, Nullable: false},
 			{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "created", Type: DB_DateTime, Nullable: false},
 			{Name: "updated", Type: DB_DateTime, Nullable: false},
@@ -72,4 +72,10 @@ func addApiKeyMigrations(mg *Migrator) {
 	}))
 
 	mg.AddMigration("Drop old table api_key_v1", NewDropTableMigration("api_key_v1"))
+
+	mg.AddMigration("Update api_key table charset", NewTableCharsetMigration("api_key", []*Column{
+		{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "key", Type: DB_Varchar, Length: 190, Nullable: false},
+		{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/dashboard_mig.go b/pkg/services/sqlstore/migrations/dashboard_mig.go
index 283501d366f..0ef2f3be54f 100644
--- a/pkg/services/sqlstore/migrations/dashboard_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_mig.go
@@ -8,7 +8,7 @@ func addDashboardMigration(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "version", Type: DB_Int, Nullable: false},
-			{Name: "slug", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "slug", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "data", Type: DB_Text, Nullable: false},
 			{Name: "account_id", Type: DB_BigInt, Nullable: false},
@@ -56,7 +56,7 @@ func addDashboardMigration(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "version", Type: DB_Int, Nullable: false},
-			{Name: "slug", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "slug", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "data", Type: DB_Text, Nullable: false},
 			{Name: "org_id", Type: DB_BigInt, Nullable: false},
@@ -125,4 +125,15 @@ func addDashboardMigration(mg *Migrator) {
 	mg.AddMigration("Add index for dashboard_id in dashboard_tag", NewAddIndexMigration(dashboardTagV1, &Index{
 		Cols: []string{"dashboard_id"}, Type: IndexType,
 	}))
+
+	mg.AddMigration("Update dashboard table charset", NewTableCharsetMigration("dashboard", []*Column{
+		{Name: "slug", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "plugin_id", Type: DB_NVarchar, Nullable: true, Length: 255},
+		{Name: "data", Type: DB_MediumText, Nullable: false},
+	}))
+
+	mg.AddMigration("Update dashboard_tag table charset", NewTableCharsetMigration("dashboard_tag", []*Column{
+		{Name: "term", Type: DB_NVarchar, Length: 50, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go
index b08cc451e55..1a72bcba929 100644
--- a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go
@@ -8,7 +8,7 @@ func addDashboardSnapshotMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "key", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "key", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "dashboard", Type: DB_Text, Nullable: false},
 			{Name: "expires", Type: DB_DateTime, Nullable: false},
 			{Name: "created", Type: DB_DateTime, Nullable: false},
@@ -28,8 +28,8 @@ func addDashboardSnapshotMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "key", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "delete_key", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "key", Type: DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "delete_key", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "org_id", Type: DB_BigInt, Nullable: false},
 			{Name: "user_id", Type: DB_BigInt, Nullable: false},
 			{Name: "external", Type: DB_Bool, Nullable: false},
@@ -54,4 +54,12 @@ func addDashboardSnapshotMigrations(mg *Migrator) {
 		Sqlite("SELECT 0 WHERE 0;").
 		Postgres("SELECT 0;").
 		Mysql("ALTER TABLE dashboard_snapshot MODIFY dashboard MEDIUMTEXT;"))
+
+	mg.AddMigration("Update dashboard_snapshot table charset", NewTableCharsetMigration("dashboard_snapshot", []*Column{
+		{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "key", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "delete_key", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "external_url", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "dashboard", Type: DB_MediumText, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/datasource_mig.go b/pkg/services/sqlstore/migrations/datasource_mig.go
index 396f80df99f..c694b5b7cfb 100644
--- a/pkg/services/sqlstore/migrations/datasource_mig.go
+++ b/pkg/services/sqlstore/migrations/datasource_mig.go
@@ -10,7 +10,7 @@ func addDataSourceMigration(mg *Migrator) {
 			{Name: "account_id", Type: DB_BigInt, Nullable: false},
 			{Name: "version", Type: DB_Int, Nullable: false},
 			{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "access", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "url", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
@@ -49,7 +49,7 @@ func addDataSourceMigration(mg *Migrator) {
 			{Name: "org_id", Type: DB_BigInt, Nullable: false},
 			{Name: "version", Type: DB_Int, Nullable: false},
 			{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "access", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "url", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
@@ -106,4 +106,18 @@ func addDataSourceMigration(mg *Migrator) {
 	mg.AddMigration("Add secure json data column", NewAddColumnMigration(tableV2, &Column{
 		Name: "secure_json_data", Type: DB_Text, Nullable: true,
 	}))
+
+	mg.AddMigration("Update data_source table charset", NewTableCharsetMigration(tableV2.Name, []*Column{
+		{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "access", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "url", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "user", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "database", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "basic_auth_user", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "basic_auth_password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "json_data", Type: DB_Text, Nullable: true},
+		{Name: "secure_json_data", Type: DB_Text, Nullable: true},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/org_mig.go b/pkg/services/sqlstore/migrations/org_mig.go
index 8e25da76b58..12e0a04256a 100644
--- a/pkg/services/sqlstore/migrations/org_mig.go
+++ b/pkg/services/sqlstore/migrations/org_mig.go
@@ -8,7 +8,7 @@ func addOrgMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "version", Type: DB_Int, Nullable: false},
-			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "address1", Type: DB_NVarchar, Length: 255, Nullable: true},
 			{Name: "address2", Type: DB_NVarchar, Length: 255, Nullable: true},
 			{Name: "city", Type: DB_NVarchar, Length: 255, Nullable: true},
@@ -68,4 +68,19 @@ func addOrgMigrations(mg *Migrator) {
 
 	mg.AddMigration("Drop old table account", NewDropTableMigration("account"))
 	mg.AddMigration("Drop old table account_user", NewDropTableMigration("account_user"))
+
+	mg.AddMigration("Update org table charset", NewTableCharsetMigration("org", []*Column{
+		{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "address1", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "address2", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "city", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "state", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "zip_code", Type: DB_NVarchar, Length: 50, Nullable: true},
+		{Name: "country", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "billing_email", Type: DB_NVarchar, Length: 255, Nullable: true},
+	}))
+
+	mg.AddMigration("Update org_user table charset", NewTableCharsetMigration("org_user", []*Column{
+		{Name: "role", Type: DB_NVarchar, Length: 20},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/playlist_mig.go b/pkg/services/sqlstore/migrations/playlist_mig.go
index 636fc091006..44ae4b6cb0e 100644
--- a/pkg/services/sqlstore/migrations/playlist_mig.go
+++ b/pkg/services/sqlstore/migrations/playlist_mig.go
@@ -32,4 +32,15 @@ func addPlaylistMigrations(mg *Migrator) {
 	}
 
 	mg.AddMigration("create playlist item table v2", NewAddTableMigration(playlistItemV2))
+
+	mg.AddMigration("Update playlist table charset", NewTableCharsetMigration("playlist", []*Column{
+		{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "interval", Type: DB_NVarchar, Length: 255, Nullable: false},
+	}))
+
+	mg.AddMigration("Update playlist_item table charset", NewTableCharsetMigration("playlist_item", []*Column{
+		{Name: "type", Type: DB_NVarchar, Length: 255, Nullable: false},
+		{Name: "value", Type: DB_Text, Nullable: false},
+		{Name: "title", Type: DB_Text, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/plugin_setting.go b/pkg/services/sqlstore/migrations/plugin_setting.go
index 0700ab67d2f..66a984b56d4 100644
--- a/pkg/services/sqlstore/migrations/plugin_setting.go
+++ b/pkg/services/sqlstore/migrations/plugin_setting.go
@@ -9,7 +9,7 @@ func addAppSettingsMigration(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "org_id", Type: DB_BigInt, Nullable: true},
-			{Name: "plugin_id", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "plugin_id", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "enabled", Type: DB_Bool, Nullable: false},
 			{Name: "pinned", Type: DB_Bool, Nullable: false},
 			{Name: "json_data", Type: DB_Text, Nullable: true},
@@ -32,4 +32,10 @@ func addAppSettingsMigration(mg *Migrator) {
 		Name: "plugin_version", Type: DB_NVarchar, Nullable: true, Length: 50,
 	}))
 
+	mg.AddMigration("Update plugin_setting table charset", NewTableCharsetMigration("plugin_setting", []*Column{
+		{Name: "plugin_id", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "json_data", Type: DB_Text, Nullable: true},
+		{Name: "secure_json_data", Type: DB_Text, Nullable: true},
+		{Name: "plugin_version", Type: DB_NVarchar, Nullable: true, Length: 50},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/preferences_mig.go b/pkg/services/sqlstore/migrations/preferences_mig.go
index 67a8169a7a8..b3822fe5239 100644
--- a/pkg/services/sqlstore/migrations/preferences_mig.go
+++ b/pkg/services/sqlstore/migrations/preferences_mig.go
@@ -29,4 +29,9 @@ func addPreferencesMigrations(mg *Migrator) {
 
 	// create table
 	mg.AddMigration("create preferences table v3", NewAddTableMigration(preferencesV2))
+
+	mg.AddMigration("Update preferences table charset", NewTableCharsetMigration("preferences", []*Column{
+		{Name: "timezone", Type: DB_NVarchar, Length: 50, Nullable: false},
+		{Name: "theme", Type: DB_NVarchar, Length: 20, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/quota_mig.go b/pkg/services/sqlstore/migrations/quota_mig.go
index d877bb4c3c1..34f0da662a9 100644
--- a/pkg/services/sqlstore/migrations/quota_mig.go
+++ b/pkg/services/sqlstore/migrations/quota_mig.go
@@ -12,7 +12,7 @@ func addQuotaMigration(mg *Migrator) {
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "org_id", Type: DB_BigInt, Nullable: true},
 			{Name: "user_id", Type: DB_BigInt, Nullable: true},
-			{Name: "target", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "target", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "limit", Type: DB_BigInt, Nullable: false},
 			{Name: "created", Type: DB_DateTime, Nullable: false},
 			{Name: "updated", Type: DB_DateTime, Nullable: false},
@@ -25,4 +25,8 @@ func addQuotaMigration(mg *Migrator) {
 
 	//-------  indexes ------------------
 	addTableIndicesMigrations(mg, "v1", quotaV1)
+
+	mg.AddMigration("Update quota table charset", NewTableCharsetMigration("quota", []*Column{
+		{Name: "target", Type: DB_NVarchar, Length: 190, Nullable: false},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/temp_user.go b/pkg/services/sqlstore/migrations/temp_user.go
index 3cae5d82472..5592ab7e4ad 100644
--- a/pkg/services/sqlstore/migrations/temp_user.go
+++ b/pkg/services/sqlstore/migrations/temp_user.go
@@ -35,4 +35,13 @@ func addTempUserMigrations(mg *Migrator) {
 	// create table
 	mg.AddMigration("create temp user table v1-7", NewAddTableMigration(tempUserV1))
 	addTableIndicesMigrations(mg, "v1-7", tempUserV1)
+
+	mg.AddMigration("Update temp_user table charset", NewTableCharsetMigration("temp_user", []*Column{
+		{Name: "email", Type: DB_NVarchar, Length: 255},
+		{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "role", Type: DB_NVarchar, Length: 20, Nullable: true},
+		{Name: "code", Type: DB_NVarchar, Length: 255},
+		{Name: "status", Type: DB_Varchar, Length: 20},
+		{Name: "remote_addr", Type: DB_Varchar, Length: 255, Nullable: true},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrations/user_mig.go b/pkg/services/sqlstore/migrations/user_mig.go
index 67446f64d1a..a12c4987792 100644
--- a/pkg/services/sqlstore/migrations/user_mig.go
+++ b/pkg/services/sqlstore/migrations/user_mig.go
@@ -8,8 +8,8 @@ func addUserMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "version", Type: DB_Int, Nullable: false},
-			{Name: "login", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "email", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "login", Type: DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "email", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
 			{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
 			{Name: "salt", Type: DB_NVarchar, Length: 50, Nullable: true},
@@ -47,8 +47,8 @@ func addUserMigrations(mg *Migrator) {
 		Columns: []*Column{
 			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "version", Type: DB_Int, Nullable: false},
-			{Name: "login", Type: DB_NVarchar, Length: 255, Nullable: false},
-			{Name: "email", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "login", Type: DB_NVarchar, Length: 190, Nullable: false},
+			{Name: "email", Type: DB_NVarchar, Length: 190, Nullable: false},
 			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
 			{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
 			{Name: "salt", Type: DB_NVarchar, Length: 50, Nullable: true},
@@ -92,4 +92,15 @@ func addUserMigrations(mg *Migrator) {
 	mg.AddMigration("Add column help_flags1 to user table", NewAddColumnMigration(userV2, &Column{
 		Name: "help_flags1", Type: DB_BigInt, Nullable: false, Default: "0",
 	}))
+
+	mg.AddMigration("Update user table charset", NewTableCharsetMigration("user", []*Column{
+		{Name: "login", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "email", Type: DB_NVarchar, Length: 190, Nullable: false},
+		{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "password", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "salt", Type: DB_NVarchar, Length: 50, Nullable: true},
+		{Name: "rands", Type: DB_NVarchar, Length: 50, Nullable: true},
+		{Name: "company", Type: DB_NVarchar, Length: 255, Nullable: true},
+		{Name: "theme", Type: DB_NVarchar, Length: 255, Nullable: true},
+	}))
 }
diff --git a/pkg/services/sqlstore/migrator/dialect.go b/pkg/services/sqlstore/migrator/dialect.go
index 4473b560428..651405921d9 100644
--- a/pkg/services/sqlstore/migrator/dialect.go
+++ b/pkg/services/sqlstore/migrator/dialect.go
@@ -29,6 +29,7 @@ type Dialect interface {
 
 	TableCheckSql(tableName string) (string, []interface{})
 	RenameTable(oldName string, newName string) string
+	UpdateTableSql(tableName string, columns []*Column) string
 }
 
 func NewDialect(name string) Dialect {
@@ -102,7 +103,7 @@ func (b *BaseDialect) CreateTableSql(table *Table) string {
 
 	sql = sql[:len(sql)-2] + ")"
 	if b.dialect.SupportEngine() {
-		sql += " ENGINE=InnoDB DEFAULT CHARSET UTF8 "
+		sql += " ENGINE=InnoDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci"
 	}
 
 	sql += ";"
@@ -160,3 +161,7 @@ func (db *BaseDialect) DropIndexSql(tableName string, index *Index) string {
 	name = index.XName(tableName)
 	return fmt.Sprintf("DROP INDEX %v ON %s", quote(name), quote(tableName))
 }
+
+func (db *BaseDialect) UpdateTableSql(tableName string, columns []*Column) string {
+	return "-- NOT REQUIRED"
+}
diff --git a/pkg/services/sqlstore/migrator/migrations.go b/pkg/services/sqlstore/migrator/migrations.go
index 7d97abb6bb9..2fec8825fa4 100644
--- a/pkg/services/sqlstore/migrator/migrations.go
+++ b/pkg/services/sqlstore/migrator/migrations.go
@@ -200,3 +200,17 @@ func (m *CopyTableDataMigration) IfTableExists(tableName string) *CopyTableDataM
 func (m *CopyTableDataMigration) Sql(d Dialect) string {
 	return d.CopyTableData(m.sourceTable, m.targetTable, m.sourceCols, m.targetCols)
 }
+
+type TableCharsetMigration struct {
+	MigrationBase
+	tableName string
+	columns   []*Column
+}
+
+func NewTableCharsetMigration(tableName string, columns []*Column) *TableCharsetMigration {
+	return &TableCharsetMigration{tableName: tableName, columns: columns}
+}
+
+func (m *TableCharsetMigration) Sql(d Dialect) string {
+	return d.UpdateTableSql(m.tableName, m.columns)
+}
diff --git a/pkg/services/sqlstore/migrator/mysql_dialect.go b/pkg/services/sqlstore/migrator/mysql_dialect.go
index 48c2cd3ea55..1968558dbb8 100644
--- a/pkg/services/sqlstore/migrator/mysql_dialect.go
+++ b/pkg/services/sqlstore/migrator/mysql_dialect.go
@@ -1,6 +1,9 @@
 package migrator
 
-import "strconv"
+import (
+	"strconv"
+	"strings"
+)
 
 type Mysql struct {
 	BaseDialect
@@ -76,6 +79,12 @@ func (db *Mysql) SqlType(c *Column) string {
 	} else if hasLen1 {
 		res += "(" + strconv.Itoa(c.Length) + ")"
 	}
+
+	switch c.Type {
+	case DB_Char, DB_Varchar, DB_NVarchar, DB_TinyText, DB_Text, DB_MediumText, DB_LongText:
+		res += " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"
+	}
+
 	return res
 }
 
@@ -84,3 +93,15 @@ func (db *Mysql) TableCheckSql(tableName string) (string, []interface{}) {
 	sql := "SELECT `TABLE_NAME` from `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? and `TABLE_NAME`=?"
 	return sql, args
 }
+
+func (db *Mysql) UpdateTableSql(tableName string, columns []*Column) string {
+	var statements = []string{}
+
+	statements = append(statements, "DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci")
+
+	for _, col := range columns {
+		statements = append(statements, "MODIFY "+col.StringNoPk(db))
+	}
+
+	return "ALTER TABLE " + db.Quote(tableName) + " " + strings.Join(statements, ", ") + ";"
+}
diff --git a/pkg/services/sqlstore/migrator/postgres_dialect.go b/pkg/services/sqlstore/migrator/postgres_dialect.go
index 5500b9f1684..92109efdfab 100644
--- a/pkg/services/sqlstore/migrator/postgres_dialect.go
+++ b/pkg/services/sqlstore/migrator/postgres_dialect.go
@@ -3,6 +3,7 @@ package migrator
 import (
 	"fmt"
 	"strconv"
+	"strings"
 )
 
 type Postgres struct {
@@ -112,3 +113,13 @@ func (db *Postgres) DropIndexSql(tableName string, index *Index) string {
 	idxName := index.XName(tableName)
 	return fmt.Sprintf("DROP INDEX %v", quote(idxName))
 }
+
+func (db *Postgres) UpdateTableSql(tableName string, columns []*Column) string {
+	var statements = []string{}
+
+	for _, col := range columns {
+		statements = append(statements, "ALTER "+db.QuoteStr()+col.Name+db.QuoteStr()+" TYPE "+db.SqlType(col))
+	}
+
+	return "ALTER TABLE " + db.Quote(tableName) + " " + strings.Join(statements, ", ") + ";"
+}
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index d1f555d2d7f..a2106ddbffd 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -114,7 +114,7 @@ func getEngine() (*xorm.Engine, error) {
 			protocol = "unix"
 		}
 
-		cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8",
+		cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4",
 			DbCfg.User, DbCfg.Pwd, protocol, DbCfg.Host, DbCfg.Name)
 
 		if DbCfg.SslMode == "true" || DbCfg.SslMode == "skip-verify" {
diff --git a/pkg/services/sqlstore/sqlutil/sqlutil.go b/pkg/services/sqlstore/sqlutil/sqlutil.go
index 075b56c1c18..68ced55722c 100644
--- a/pkg/services/sqlstore/sqlutil/sqlutil.go
+++ b/pkg/services/sqlstore/sqlutil/sqlutil.go
@@ -12,7 +12,7 @@ type TestDB struct {
 }
 
 var TestDB_Sqlite3 = TestDB{DriverName: "sqlite3", ConnStr: ":memory:?_loc=Local"}
-var TestDB_Mysql = TestDB{DriverName: "mysql", ConnStr: "grafana:password@tcp(localhost:3306)/grafana_tests?charset=utf8"}
+var TestDB_Mysql = TestDB{DriverName: "mysql", ConnStr: "grafana:password@tcp(localhost:3306)/grafana_tests?charset=utf8mb4"}
 var TestDB_Postgres = TestDB{DriverName: "postgres", ConnStr: "user=grafanatest password=grafanatest host=localhost port=5432 dbname=grafanatest sslmode=disable"}
 
 func CleanDB(x *xorm.Engine) {

From 98554e9fbea103124beba6b0f7cfb6603e7d9909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 29 Mar 2017 08:42:10 +0200
Subject: [PATCH 295/301] docs: added config entry for ldap allow_sign_up
 option, #7972

---
 docs/sources/installation/configuration.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 50d28560672..c617fe65c4a 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -427,6 +427,11 @@ Set to `true` to enable LDAP integration (default: `false`)
 ### config_file
 Path to the LDAP specific configuration file (default: `/etc/grafana/ldap.toml`)
 
+### allow_sign_up
+
+Allow sign up should almost always be true (default) to allow new Grafana users to be created (if ldap authentication is ok). If set to
+false only pre-existing Grafana users will be able to login (if ldap authentication is ok).
+
 > For details on LDAP Configuration, go to the [LDAP Integration]({{< relref "ldap.md" >}}) page.
 
 <hr>

From ac39ed421881ec9c8f8fa9fad217b17848d7f3ff Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 29 Mar 2017 11:16:16 +0200
Subject: [PATCH 296/301] panel: fixes #7970. Description tooltip overflow.

This seems to work for the three use cases:

- Overflow on the left
- Overflow on the right
- Elements that are out of view on page load
---
 public/app/features/panel/panel_directive.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 0482abc0437..5868bfcbf54 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -156,11 +156,21 @@ module.directive('grafanaPanel', function($rootScope, $document) {
             content: function() {
               return ctrl.getInfoContent({mode: 'tooltip'});
             },
-            position: 'top center',
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             hoverOpenDelay: 100,
-            constrainToScrollParent: false,
+            remove: true,
+            tetherOptions: {
+              attachment: 'bottom left',
+              targetAttachment: 'top left',
+              constraints: [
+                {
+                  to: 'window',
+                  attachment: 'together',
+                  pin: true
+                }
+              ],
+            }
           });
         }
       }
@@ -185,6 +195,10 @@ module.directive('grafanaPanel', function($rootScope, $document) {
         if (ctrl.skippedLastRefresh) {
           ctrl.refresh();
         }
+
+        if (infoDrop) {
+          infoDrop.position();
+        }
       };
 
       $document.on('scroll', refreshOnScroll);

From 319b8d8fca29c3f54114274b23d99472606c7c61 Mon Sep 17 00:00:00 2001
From: Seuf <seuf76@gmail.com>
Date: Wed, 29 Mar 2017 11:33:28 +0200
Subject: [PATCH 297/301] Configurable signout menu activation (#7968)

---
 conf/defaults.ini                             |  3 +++
 conf/sample.ini                               |  3 +++
 docs/sources/installation/configuration.md    |  4 ++++
 pkg/api/frontendsettings.go                   | 21 ++++++++++---------
 pkg/setting/setting.go                        |  2 ++
 .../app/core/components/sidemenu/sidemenu.ts  |  2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 490c2415e68..5c12937f4f8 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -205,6 +205,9 @@ default_theme = dark
 # Set to true to disable (hide) the login form, useful if you use OAuth
 disable_login_form = false
 
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
+disable_signout_menu = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
diff --git a/conf/sample.ini b/conf/sample.ini
index 3a61186f05e..87505221790 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -192,6 +192,9 @@
 # Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
 ;disable_login_form = false
 
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
+;disable_signout_menu = false
+
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index c617fe65c4a..176f843e86b 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -267,6 +267,10 @@ options are `Admin` and `Editor` and `Read Only Editor`. e.g. :
 
 Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false.
 
+### disable_signout_menu
+
+Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false.
+
 <hr>
 
 ## [auth.anonymous]
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 328b8abbc5f..11e70dccc0d 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -133,16 +133,17 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 	}
 
 	jsonObj := map[string]interface{}{
-		"defaultDatasource": defaultDatasource,
-		"datasources":       datasources,
-		"panels":            panels,
-		"appSubUrl":         setting.AppSubUrl,
-		"allowOrgCreate":    (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
-		"authProxyEnabled":  setting.AuthProxyEnabled,
-		"ldapEnabled":       setting.LdapEnabled,
-		"alertingEnabled":   setting.AlertingEnabled,
-		"googleAnalyticsId": setting.GoogleAnalyticsId,
-		"disableLoginForm":  setting.DisableLoginForm,
+		"defaultDatasource":  defaultDatasource,
+		"datasources":        datasources,
+		"panels":             panels,
+		"appSubUrl":          setting.AppSubUrl,
+		"allowOrgCreate":     (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
+		"authProxyEnabled":   setting.AuthProxyEnabled,
+		"ldapEnabled":        setting.LdapEnabled,
+		"alertingEnabled":    setting.AlertingEnabled,
+		"googleAnalyticsId":  setting.GoogleAnalyticsId,
+		"disableLoginForm":   setting.DisableLoginForm,
+		"disableSignoutMenu": setting.DisableSignoutMenu,
 		"buildInfo": map[string]interface{}{
 			"version":       setting.BuildVersion,
 			"commit":        setting.BuildCommit,
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 99390ecc1c9..cacb4547162 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -96,6 +96,7 @@ var (
 	LoginHint          string
 	DefaultTheme       string
 	DisableLoginForm   bool
+	DisableSignoutMenu bool
 
 	// Http auth
 	AdminUser     string
@@ -528,6 +529,7 @@ func NewConfigContext(args *CommandLineArgs) error {
 	// auth
 	auth := Cfg.Section("auth")
 	DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
+	DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)
 
 	// anonymous access
 	AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index 2e8e03eca7a..a6bc170fddd 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -23,7 +23,7 @@ export class SideMenuCtrl {
     this.isSignedIn = contextSrv.isSignedIn;
     this.user = contextSrv.user;
     this.appSubUrl = config.appSubUrl;
-    this.showSignout = this.contextSrv.isSignedIn && !config['authProxyEnabled'];
+    this.showSignout = this.contextSrv.isSignedIn && !config['disableSignoutMenu'];
     this.maxShownOrgs = 10;
 
     this.mainLinks = config.bootData.mainNavLinks;

From 085c4c56b87369797940be087fed9930c885e1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 29 Mar 2017 13:44:01 +0200
Subject: [PATCH 298/301] elasticearch: added support for histogram
 aggregations, closes #3164

---
 CHANGELOG.md                                  |  1 +
 .../datasource/elasticsearch/bucket_agg.js    | 11 +++++++
 .../elasticsearch/partials/bucket_agg.html    | 11 +++++++
 .../datasource/elasticsearch/query_builder.js | 17 ++++++++++
 .../datasource/elasticsearch/query_def.js     |  1 +
 .../specs/elastic_response_specs.ts           | 33 +++++++++++++++++++
 .../specs/query_builder_specs.ts              | 17 ++++++++++
 7 files changed, 91 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5470a86fb47..82b3ba2037e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * **InfluxDB**: Small fix for the "glow" when focus the field for LIMIT and SLIMIT [#7799](https://github.com/grafana/grafana/pull/7799) thx [@thuck](https://github.com/thuck)
 * **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin)
 * **Graph**: Support auto grid min/max when using log scale [#3090](https://github.com/grafana/grafana/issues/3090), thx [@bigbenhur](https://github.com/bigbenhur)
+* **Elasticsearch**: Support histogram aggregations [#3164](https://github.com/grafana/grafana/issues/3164)
 
 ## Minor Enchancements
 
diff --git a/public/app/plugins/datasource/elasticsearch/bucket_agg.js b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
index 28f1df08251..d6d641c1655 100644
--- a/public/app/plugins/datasource/elasticsearch/bucket_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
@@ -50,6 +50,7 @@ function (angular, _, queryDef) {
 
       switch($scope.agg.type) {
         case 'date_histogram':
+        case 'histogram':
         case 'terms':  {
           delete $scope.agg.query;
           $scope.agg.field = 'select field';
@@ -132,6 +133,16 @@ function (angular, _, queryDef) {
           }
           break;
         }
+        case 'histogram': {
+          settings.interval = settings.interval || 1000;
+          settings.min_doc_count = _.defaultTo(settings.min_doc_count, 1);
+          settingsLinkText = 'Interval: ' + settings.interval;
+
+          if (settings.min_doc_count > 0) {
+            settingsLinkText += ', Min Doc Count: ' + settings.min_doc_count;
+          }
+          break;
+        }
         case 'geohash_grid': {
           // limit precision to 7
           settings.precision = Math.max(Math.min(settings.precision, 7), 1);
diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index 562f0b86e56..f1e650f6830 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -52,6 +52,17 @@
 		</div>
 	</div>
 
+	<div ng-if="agg.type === 'histogram'">
+		<div class="gf-form offset-width-7">
+			<label class="gf-form-label width-10">Interval</label>
+			<input type="number" class="gf-form-input max-width-12" ng-model="agg.settings.interval" ng-blur="onChangeInternal()">
+		</div>
+		<div class="gf-form offset-width-7">
+			<label class="gf-form-label width-10">Min Doc Count</label>
+			<input type="number" class="gf-form-input max-width-12" ng-model="agg.settings.min_doc_count" ng-blur="onChangeInternal()">
+		</div>
+	</div>
+
 	<div ng-if="agg.type === 'terms'">
 		<div class="gf-form offset-width-7">
 			<label class="gf-form-label width-10">Order</label>
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 11e8b69ddaa..808fea3cc70 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -79,6 +79,19 @@ function (queryDef) {
     return esAgg;
   };
 
+  ElasticQueryBuilder.prototype.getHistogramAgg = function(aggDef) {
+    var esAgg = {};
+    var settings = aggDef.settings || {};
+    esAgg.interval = settings.interval;
+    esAgg.field = aggDef.field;
+    esAgg.min_doc_count = settings.min_doc_count || 0;
+
+    if (settings.missing) {
+      esAgg.missing = settings.missing;
+    }
+    return esAgg;
+  };
+
   ElasticQueryBuilder.prototype.getFiltersAgg = function(aggDef) {
     var filterObj = {};
     for (var i = 0; i < aggDef.settings.filters.length; i++) {
@@ -192,6 +205,10 @@ function (queryDef) {
           esAgg["date_histogram"] = this.getDateHistogramAgg(aggDef);
           break;
         }
+        case 'histogram': {
+          esAgg["histogram"] = this.getHistogramAgg(aggDef);
+          break;
+        }
         case 'filters': {
           esAgg["filters"] = {filters: this.getFiltersAgg(aggDef)};
           break;
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.js b/public/app/plugins/datasource/elasticsearch/query_def.js
index 5afc908edba..a55e2dfd9e5 100644
--- a/public/app/plugins/datasource/elasticsearch/query_def.js
+++ b/public/app/plugins/datasource/elasticsearch/query_def.js
@@ -24,6 +24,7 @@ function (_) {
       {text: "Filters",         value: 'filters' },
       {text: "Geo Hash Grid",   value: 'geohash_grid', requiresField: true},
       {text: "Date Histogram",  value: 'date_histogram', requiresField: true},
+      {text: "Histogram",       value: 'histogram', requiresField: true},
     ],
 
     orderByOptions: [
diff --git a/public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts
index 4b87cc52c04..589e0ccbfab 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts
@@ -361,6 +361,39 @@ describe('ElasticResponse', function() {
     });
   });
 
+  describe('histogram response', function() {
+    var result;
+
+    beforeEach(function() {
+      targets = [{
+        refId: 'A',
+        metrics: [{type: 'count', id: '1'}],
+        bucketAggs: [{type: 'histogram', field: 'bytes', id: '3'}],
+      }];
+      response =  {
+        responses: [{
+          aggregations: {
+            "3": {
+              buckets: [
+                {doc_count: 1, key: 1000},
+                {doc_count: 3, key: 2000},
+                {doc_count: 2, key: 1000},
+              ]
+            }
+          }
+        }]
+      };
+
+      result = new ElasticResponse(targets, response).getTimeSeries();
+    });
+
+    it('should return docs with byte and count', function() {
+      expect(result.data[0].datapoints.length).to.be(3);
+      expect(result.data[0].datapoints[0].Count).to.be(1);
+      expect(result.data[0].datapoints[0].bytes).to.be(1000);
+    });
+  });
+
   describe('with two filters agg', function() {
     var result;
 
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
index e60cde7a163..18645ad498d 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
@@ -249,6 +249,23 @@ describe('ElasticQueryBuilder', function() {
     expect(firstLevel.aggs["2"].derivative.buckets_path).to.be("3");
   });
 
+  it('with histogram', function() {
+    var query = builder.build({
+      metrics: [
+        {id: '1', type: 'count' },
+      ],
+      bucketAggs: [
+        {type: 'histogram', field: 'bytes', id: '3', settings: {interval: 10, min_doc_count: 2, missing: 5}}
+      ],
+    });
+
+    var firstLevel = query.aggs["3"];
+    expect(firstLevel.histogram.field).to.be('bytes');
+    expect(firstLevel.histogram.interval).to.be(10);
+    expect(firstLevel.histogram.min_doc_count).to.be(2);
+    expect(firstLevel.histogram.missing).to.be(5);
+  });
+
   it('with adhoc filters', function() {
     var query = builder.build({
       metrics: [{type: 'Count', id: '0'}],

From 5702c574528689627b4891e9e8f1be8e22b96bf9 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 29 Mar 2017 16:01:27 +0200
Subject: [PATCH 299/301] panel: remove unneeded options for tooltip

---
 public/app/features/panel/panel_directive.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 5868bfcbf54..63fdba693cb 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -159,7 +159,6 @@ module.directive('grafanaPanel', function($rootScope, $document) {
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             hoverOpenDelay: 100,
-            remove: true,
             tetherOptions: {
               attachment: 'bottom left',
               targetAttachment: 'top left',
@@ -195,10 +194,6 @@ module.directive('grafanaPanel', function($rootScope, $document) {
         if (ctrl.skippedLastRefresh) {
           ctrl.refresh();
         }
-
-        if (infoDrop) {
-          infoDrop.position();
-        }
       };
 
       $document.on('scroll', refreshOnScroll);

From 3b235612fd98bfd50e38f5f44a9364132272f2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 29 Mar 2017 16:03:15 +0200
Subject: [PATCH 300/301] elasticsearch: improve validation and error message
 when adding/testing elasticsearch ds, #7836

---
 .../datasource/elasticsearch/datasource.js    | 20 ++++++++++++++-----
 .../datasource/elasticsearch/query_builder.js |  4 +++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 4377d634982..08f42f2cf50 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -168,12 +168,22 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
     };
 
     this.testDatasource = function() {
-      timeSrv.setTime({ from: 'now-1m', to: 'now' });
-      return this._get('/_stats').then(function() {
-        return { status: "success", message: "Data source is working", title: "Success" };
-      }, function(err) {
+      timeSrv.setTime({ from: 'now-1m', to: 'now' }, true);
+      // validate that the index exist and has date field
+      return this.getFields({type: 'date'}).then(function(dateFields) {
+        var timeField = _.find(dateFields, {text: this.timeField});
+        if (!timeField) {
+          return { status: "error", message: "No date field named " + this.timeField + ' found', title: "Error" };
+        }
+        return { status: "success", message: "Index OK. Time field name OK.", title: "Success" };
+      }.bind(this), function(err) {
+        console.log(err);
         if (err.data && err.data.error) {
-          return { status: "error", message: angular.toJson(err.data.error), title: "Error" };
+          var message = angular.toJson(err.data.error);
+          if (err.data.error.reason) {
+            message = err.data.error.reason;
+          }
+          return { status: "error", message: message, title: "Error" };
         } else {
           return { status: "error", message: err.status, title: "Error" };
         }
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 808fea3cc70..fbbd4f7e929 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -280,10 +280,12 @@ function (queryDef) {
         }
       });
     }
+
     var size = 500;
-    if(queryDef.size){
+    if (queryDef.size) {
       size = queryDef.size;
     }
+
     query.aggs =  {
       "1": {
         "terms": {

From 91c184d3e0818c45a892eb867209b1f136bb67cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 29 Mar 2017 16:33:44 +0200
Subject: [PATCH 301/301] elasticseach: fixed broken unit test

---
 .../plugins/datasource/elasticsearch/specs/datasource_specs.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
index c38358c2764..944aeae1bc4 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
@@ -42,7 +42,7 @@ describe('ElasticDatasource', function() {
       ctx.$rootScope.$apply();
 
       var today = moment.utc().format("YYYY.MM.DD");
-      expect(requestOptions.url).to.be("http://es.com/asd-" + today + '/_stats');
+      expect(requestOptions.url).to.be("http://es.com/asd-" + today + '/_mapping');
     });
   });