From 36a1ab48c52d4a33464870ccbb40da098c8244a4 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 5 Jul 2017 01:15:42 +0200
Subject: [PATCH 1/5] packaging: updates for v4.4.0

---
 README.md                                |  1 +
 docs/sources/guides/whats-new-in-v4-4.md | 50 ++++++++++++++++++++++++
 docs/sources/installation/debian.md      |  6 +--
 docs/sources/installation/rpm.md         | 10 ++---
 docs/sources/installation/windows.md     |  2 +-
 packaging/publish/publish_both.sh        |  2 +-
 6 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 docs/sources/guides/whats-new-in-v4-4.md

diff --git a/README.md b/README.md
index 9d2aabebbf3..41f777d5dec 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [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/)
 - [What's New in Grafana 4.3](http://docs.grafana.org/guides/whats-new-in-v4-3/)
+- [What's New in Grafana 4.4](http://docs.grafana.org/guides/whats-new-in-v4-4/)
 
 ## Features
 
diff --git a/docs/sources/guides/whats-new-in-v4-4.md b/docs/sources/guides/whats-new-in-v4-4.md
new file mode 100644
index 00000000000..c091a1f7ef1
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v4-4.md
@@ -0,0 +1,50 @@
++++
+title = "What's New in Grafana v4.4"
+description = "Feature & improvement highlights for Grafana v4.4"
+keywords = ["grafana", "new", "documentation", "4.4.0"]
+type = "docs"
+[menu.docs]
+name = "Version 4.4"
+identifier = "v4.4"
+parent = "whatsnew"
+weight = -2
++++
+
+## What's New in Grafana v4.4
+
+Grafana v4.4 is now [available for download](https://grafana.com/grafana/download/4.4.0).
+
+**Highlights**:
+
+- Dashboard History - version control for dashboards.
+
+## New Features
+
+**Dashboard History**: View dashboard version history, compare any two versions (summary & json diffs), restore to old version. This big feature
+was contributed by **Walmart Labs**. Big thanks to them for this massive contribution!
+Initial feature request: [#4638](https://github.com/grafana/grafana/issues/4638)
+Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
+
+## Enhancements
+* **Elasticsearch**: Added filter aggregation label [#8420](https://github.com/grafana/grafana/pull/8420), thx [@tianzk](github.com/tianzk)
+* **Sensu**: Added option for source and handler [#8405](https://github.com/grafana/grafana/pull/8405), thx [@joemiller](github.com/joemiller)
+* **CSV**: Configurable csv export datetime format [#8058](https://github.com/grafana/grafana/issues/8058), thx [@cederigo](github.com/cederigo)
+* **Table Panel**: Column style that preserves formatting/indentation (like pre tag) [#6617](https://github.com/grafana/grafana/issues/6617)
+* **DingDing**: Add DingDing Alert Notifier [#8473](https://github.com/grafana/grafana/pull/8473) thx [@jiamliang](https://github.com/jiamliang)
+
+## Minor Enhancements
+
+* **Elasticsearch**: Add option for result set size in raw_document [#3426](https://github.com/grafana/grafana/issues/3426) [#8527](https://github.com/grafana/grafana/pull/8527), thx [@mk-dhia](github.com/mk-dhia)
+
+## Bug Fixes
+
+* **Graph**: Bug fix for negative values in histogram mode [#8628](https://github.com/grafana/grafana/issues/8628)
+
+## Download
+
+Head to the [v4.4 download page](https://grafana.com/grafana/download) for download links & instructions.
+
+## Thanks
+
+A big thanks to all the Grafana users who contribute by submitting PRs, bug reports, helping out on our [community site](https://community.grafana.com/) and providing feedback!
+
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 5fde442afbf..fb21f76b599 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -15,7 +15,7 @@ weight = 1
 
 Description | Download
 ------------ | -------------
-Stable for Debian-based Linux | [grafana_4.3.1_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.3.1_amd64.deb)
+Stable for Debian-based Linux | [grafana_4.4.0_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.4.0_amd64.deb)
 
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
 installation.
@@ -23,9 +23,9 @@ installation.
 ## Install Stable
 
 ```bash
-wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.3.1_amd64.deb
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.4.0_amd64.deb
 sudo apt-get install -y adduser libfontconfig
-sudo dpkg -i grafana_4.3.1_amd64.deb
+sudo dpkg -i grafana_4.4.0_amd64.deb
 ```
 
 <!--
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 579e04472dc..184f4d281f2 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -15,7 +15,7 @@ weight = 2
 
 Description | Download
 ------------ | -------------
-Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.3.1 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.3.1-1.x86_64.rpm)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.4.0 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.4.0-1.x86_64.rpm)
 
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
 installation.
@@ -24,19 +24,19 @@ installation.
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.3.1-1.x86_64.rpm
+    $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.4.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.3.1-1.x86_64.rpm
+    $ wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.4.0-1.x86_64.rpm
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-4.3.1-1.x86_64.rpm
+    $ sudo rpm -Uvh grafana-4.4.0-1.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-4.3.1-1.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-4.4.0-1.x86_64.rpm
 
 ## Install via YUM Repository
 
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index dac8c560d4a..37d1474a8ed 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.3.1.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.3.1.windows-x64.zip)
+Latest stable package for Windows | [grafana.4.4.0.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.4.0.windows-x64.zip)
 
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
 installation.
diff --git a/packaging/publish/publish_both.sh b/packaging/publish/publish_both.sh
index 07a64046482..8fd48038ace 100755
--- a/packaging/publish/publish_both.sh
+++ b/packaging/publish/publish_both.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-version=4.3.1
+version=4.4.0
 
 wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${version}_amd64.deb
 

From 16cda723d31a91ee3d3ccb824c095b07e45e7931 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 5 Jul 2017 09:01:43 +0200
Subject: [PATCH 2/5] migrations: dashboard version migration handles nulls

If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783.
---
 pkg/services/sqlstore/migrations/dashboard_version_mig.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/migrations/dashboard_version_mig.go b/pkg/services/sqlstore/migrations/dashboard_version_mig.go
index fee69b9ef4c..063514c5816 100644
--- a/pkg/services/sqlstore/migrations/dashboard_version_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_version_mig.go
@@ -50,7 +50,7 @@ SELECT
 	dashboard.version,
 	dashboard.version,
 	dashboard.updated,
-	dashboard.updated_by,
+	COALESCE(dashboard.updated_by, -1),
 	'',
 	dashboard.data
 FROM dashboard;`

From 9341412acc53dc5b274a703baa11f7c40fa49e43 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 5 Jul 2017 09:15:04 +0200
Subject: [PATCH 3/5] release: v4.4.1

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

diff --git a/package.json b/package.json
index 6b410f041fb..cef722ca56e 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

From e5b499a958d705ba22b6e67182149f6929de159c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 6 Jul 2017 09:36:57 +0200
Subject: [PATCH 4/5] fix: Text area css issue prevented scrolling, fixes #8797

---
 public/sass/components/_gf-form.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 92b66ec54ca..e70b88c96cd 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -117,6 +117,11 @@ $gf-form-margin: 0.25rem;
   overflow: hidden;
   text-overflow: ellipsis;
 
+  // text areas should be scrollable
+  @at-root textarea#{&} {
+    overflow: auto;
+  }
+
   // Unstyle the caret on `<select>`s in IE10+.
   &::-ms-expand {
     background-color: transparent;

From cff1c37064a2f0cf3e0d2ad8fa99f89e4b933c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 5 Jul 2017 21:43:47 +0200
Subject: [PATCH 5/5] fix: InfluxDB direct access with normal inflxudb
 credentials was not sent correctly, fixes #8789

---
 public/app/plugins/datasource/influxdb/datasource.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 09a9505bb49..dc9b83223fa 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -213,8 +213,8 @@ export default class InfluxDatasource {
     var params: any = {};
 
     if (self.username) {
-      params.username =  self.username;
-      params.password =  self.password;
+      params.u =  self.username;
+      params.p =  self.password;
     }
 
     if (self.database) {