From 6670e6cd29c0051e00aed24009eb38d38780150d Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 9 Mar 2016 16:10:46 +0100
Subject: [PATCH 01/20] feat(cli): allow redirect for plugin-repo.json

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

diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index c23c716b62f..1ffc60abf4c 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -12,7 +12,7 @@ import (
 var IoHelper m.IoUtil = IoUtilImp{}
 
 func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
-	res, _ := goreq.Request{Uri: repoUrl}.Do()
+	res, _ := goreq.Request{Uri: repoUrl, MaxRedirects: 3}.Do()
 
 	var resp m.PluginRepo
 	err := res.Body.FromJsonTo(&resp)

From d6ecf74db497787ea6b946e5ef89d408c5e6a19a Mon Sep 17 00:00:00 2001
From: Paul Mestemaker <PaulMest@users.noreply.github.com>
Date: Wed, 9 Mar 2016 11:25:42 -0800
Subject: [PATCH 02/20] Update ldap.md

Added clearer language on which versions offer LDAP support.
---
 docs/sources/installation/ldap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/installation/ldap.md b/docs/sources/installation/ldap.md
index 82309ec0f19..a5311fb4fa5 100644
--- a/docs/sources/installation/ldap.md
+++ b/docs/sources/installation/ldap.md
@@ -6,7 +6,7 @@ page_keywords: grafana, ldap, configuration, documentation, integration
 
 # LDAP Integration
 
-Grafana 2.1 ships with a strong LDAP integration feature. The LDAP integration in Grafana allows your
+Grafana (2.1 and newer) ships with a strong LDAP integration feature. The LDAP integration in Grafana allows your
 Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP
 group memberships and Grafana Organization user roles.
 

From df2a23d1a7063d7739b949a99001b442604ffc39 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Thu, 10 Mar 2016 13:14:24 +0900
Subject: [PATCH 03/20] fix to use variable.refresh flag

---
 public/app/features/templating/templateValuesSrv.js | 2 +-
 public/dashboards/template_vars.json                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index 4ccbefefdef..ce26a35be9b 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -74,7 +74,7 @@ function (angular, _, kbn) {
         if (urlValue !== void 0) {
           return self.setVariableFromUrl(variable, urlValue).then(lock.resolve);
         }
-        else if (variable.refresh === 'On Dashboard Load' || variable.refresh === 'On Time Change and Dashboard Load') {
+        else if (variable.refresh === 1 || variable.refresh === 2) {
           return self.updateOptions(variable).then(function() {
             if (_.isEmpty(variable.current) && variable.options.length) {
               console.log("setting current for %s", variable.name);
diff --git a/public/dashboards/template_vars.json b/public/dashboards/template_vars.json
index 53dd5e3cfbf..8ca81fbdff5 100644
--- a/public/dashboards/template_vars.json
+++ b/public/dashboards/template_vars.json
@@ -258,6 +258,6 @@
   "annotations": {
     "enable": false
   },
-  "refresh": "Never",
+  "refresh": 0,
   "version": 6
 }

From 8afd56575c0c69d9294fc1d25ae05ca1ca8b496f Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Thu, 10 Mar 2016 00:48:38 -0800
Subject: [PATCH 04/20] Moved api in correct group

---
 pkg/api/api.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0915bbd678d..4ef580a368e 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -171,10 +171,7 @@ func Register(r *macaron.Macaron) {
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
 			r.Delete("/:id", DeleteDataSource)
 			r.Get("/:id", wrap(GetDataSourceById))
-		}, reqOrgAdmin)
-
-		r.Group("/datasources/name/:name", func() {
-			r.Get("/", wrap(GetDataSourceByName))
+      r.Get("/name/:name", wrap(GetDataSourceByName))
 		}, reqOrgAdmin)
 
 		r.Get("/frontend/settings/", GetFrontendSettings)

From 4fbff991860ce0c7412091f5638ad986cdadf2d5 Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Thu, 10 Mar 2016 01:31:10 -0800
Subject: [PATCH 05/20] Implemented GetDataSourceIdByName API

---
 docs/sources/http_api/data_source.md | 22 +++++++++++++++++++++-
 pkg/api/api.go                       |  4 +++-
 pkg/api/datasources.go               | 19 +++++++++++++++++++
 pkg/api/dtos/models.go               |  4 ++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md
index f60c9cd7000..2a3c20e9af8 100644
--- a/docs/sources/http_api/data_source.md
+++ b/docs/sources/http_api/data_source.md
@@ -74,7 +74,7 @@ page_keywords: grafana, admin, http, api, documentation, datasource
       "jsonData":null
     }
 
-## Get a single data sources by Name
+## Get a single data source by Name
 
 `GET /api/datasources/name/:name`
 
@@ -107,6 +107,26 @@ page_keywords: grafana, admin, http, api, documentation, datasource
       "jsonData":null
     }
 
+## Get data source Id by Name
+
+`GET /api/datasources/id/:name`
+
+**Example Request**:
+
+    GET /api/datasources/id/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
+
+    {
+      "id":1
+    }
+
 ## Create data source
 
 `POST /api/datasources`
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 4ef580a368e..793703153e1 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -171,9 +171,11 @@ func Register(r *macaron.Macaron) {
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
 			r.Delete("/:id", DeleteDataSource)
 			r.Get("/:id", wrap(GetDataSourceById))
-      r.Get("/name/:name", wrap(GetDataSourceByName))
+			r.Get("/name/:name", wrap(GetDataSourceByName))
 		}, reqOrgAdmin)
 
+		r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn)
+
 		r.Get("/frontend/settings/", GetFrontendSettings)
 		r.Any("/datasources/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest)
 		r.Any("/datasources/proxy/:id", reqSignedIn, ProxyDataSourceRequest)
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index a156d10f098..0982d73e88e 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -116,6 +116,25 @@ func GetDataSourceByName(c *middleware.Context) Response {
 	return Json(200, &dtos)
 }
 
+// Get /api/datasources/id/:name
+func GetDataSourceIdByName(c *middleware.Context) Response {
+	query := m.GetDataSourceByNameQuery{Name: c.Params(":name"), OrgId: c.OrgId}
+
+	if err := bus.Dispatch(&query); err != nil {
+		if err == m.ErrDataSourceNotFound {
+			return ApiError(404, "Data source not found", nil)
+		}
+		return ApiError(500, "Failed to query datasources", err)
+	}
+
+	ds := query.Result
+	dtos := dtos.AnyId{
+		Id: ds.Id,
+	}
+
+	return Json(200, &dtos)
+}
+
 func convertModelToDtos(ds m.DataSource) dtos.DataSource {
 	return dtos.DataSource{
 		Id:                ds.Id,
diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index b810701233e..36e51fdc28a 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -10,6 +10,10 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+type AnyId struct {
+	Id int64 `json:"id"`
+}
+
 type LoginCommand struct {
 	User     string `json:"user" binding:"Required"`
 	Password string `json:"password" binding:"Required"`

From 0b6fee138a292ee25db6dea7371529ce2019e2db Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Mar 2016 14:48:28 +0100
Subject: [PATCH 06/20] docs(configuration): add redis as session storage

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

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index b652abcabb6..cdc24dc7c59 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -159,19 +159,19 @@ The database user's password (not applicable for `sqlite3`).
 For Postgres, use either `disable`, `require` or `verify-full`.
 For MySQL, use either `true`, `false`, or `skip-verify`.
 
-### ca_cert_path 
+### ca_cert_path
 
 (MySQL only) The path to the CA certificate to use. On many linux systems, certs can be found in `/etc/ssl/certs`.
 
-### client_key_path 
+### client_key_path
 
 (MySQL only) The path to the client key. Only if server requires client authentication.
 
-### client_cert_path 
+### client_cert_path
 
 (MySQL only) The path to the client cert. Only if server requires client authentication.
 
-### server_cert_name 
+### server_cert_name
 
 (MySQL only) The common name field of the certificate used by the `mysql` server. Not necessary if `ssl_mode` is set to `skip-verify`.
 
@@ -373,7 +373,7 @@ Set to `true` to enable auto sign up of users who do not exist in Grafana DB. De
 
 ### provider
 
-Valid values are `memory`, `file`, `mysql`, `postgres`, `memcache`. Default is `file`.
+Valid values are `memory`, `file`, `mysql`, `postgres`, `memcache` or `redis`. Default is `file`.
 
 ### provider_config
 
@@ -384,6 +384,7 @@ session provider you have configured.
 - **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
 - **memcache:** ex:  127.0.0.1:11211
+- **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,db=grafana`
 
 If you use MySQL or Postgres as the session store you need to create the
 session table manually.
@@ -415,10 +416,10 @@ How long sessions lasts in seconds. Defaults to `86400` (24 hours).
 
 ### reporting_enabled
 
-When enabled Grafana will send anonymous usage statistics to 
+When enabled Grafana will send anonymous usage statistics to
 `stats.grafana.org`. No IP addresses are being tracked, only simple counters to
 track running instances, versions, dashboard & error counts. It is very helpful
-to us, so please leave this enabled. Counters are sent every 24 hours. Default 
+to us, so please leave this enabled. Counters are sent every 24 hours. Default
 value is `true`.
 
 ### google_analytics_ua_id

From 43073da7eb11444ae751ce34528117db4ccbc916 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Mar 2016 16:02:10 +0100
Subject: [PATCH 07/20] feat(renderer): add timeout for the renderer api

closes #4325
---
 pkg/api/render.go                   | 1 +
 pkg/components/renderer/renderer.go | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/api/render.go b/pkg/api/render.go
index 728128acaab..9ed0c5ee6d7 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -31,6 +31,7 @@ func RenderToPng(c *middleware.Context) {
 		Width:     queryReader.Get("width", "800"),
 		Height:    queryReader.Get("height", "400"),
 		SessionId: c.Session.ID(),
+		Timeout:   queryReader.Get("timeout", "15"),
 	}
 
 	renderOpts.Url = setting.ToAbsUrl(renderOpts.Url)
diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go
index d72ceca9c3d..f81da43c295 100644
--- a/pkg/components/renderer/renderer.go
+++ b/pkg/components/renderer/renderer.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
+	"strconv"
 )
 
 type RenderOpts struct {
@@ -18,6 +19,7 @@ type RenderOpts struct {
 	Width     string
 	Height    string
 	SessionId string
+	Timeout   string
 }
 
 func RenderToPng(params *RenderOpts) (string, error) {
@@ -60,8 +62,13 @@ func RenderToPng(params *RenderOpts) (string, error) {
 		close(done)
 	}()
 
+	timeout, err := strconv.Atoi(params.Timeout)
+	if err != nil {
+		timeout = 15
+	}
+
 	select {
-	case <-time.After(15 * time.Second):
+	case <-time.After(time.Duration(timeout) * time.Second):
 		if err := cmd.Process.Kill(); err != nil {
 			log.Error(4, "failed to kill: %v", err)
 		}

From fee0745e983a25140b127b6ca32c45fdf88bdda2 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Mar 2016 14:43:21 +0100
Subject: [PATCH 08/20] feat(cli): support for asking grafana net about plugins

---
 .../grafana-cli/commands/install_command.go    | 18 ++++++++++--------
 pkg/cmd/grafana-cli/commands/ls_command.go     |  4 ++--
 .../grafana-cli/commands/ls_command_test.go    |  6 +++---
 pkg/cmd/grafana-cli/main.go                    |  2 +-
 pkg/cmd/grafana-cli/services/services.go       |  3 ++-
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index c58ed12668f..49e7d781389 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"bytes"
 	"errors"
+	"fmt"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
@@ -64,30 +65,31 @@ func InstallPlugin(pluginName, version string, c CommandLine) error {
 		return err
 	}
 
-	url := v.Url
-	commit := v.Commit
-
 	if version == "" {
 		version = v.Version
 	}
 
-	downloadURL := url + "/archive/" + commit + ".zip"
+	downloadURL := fmt.Sprintf("%s/%s/versions/%s/download",
+		c.GlobalString("repo"),
+		pluginName,
+		version)
 
 	log.Infof("installing %v @ %v\n", plugin.Id, version)
 	log.Infof("from url: %v\n", downloadURL)
-	log.Infof("on commit: %v\n", commit)
 	log.Infof("into: %v\n", pluginFolder)
 
 	err = downloadFile(plugin.Id, pluginFolder, downloadURL)
-	if err == nil {
-		log.Infof("Installed %v successfully ✔\n", plugin.Id)
+	if err != nil {
+		return err
 	}
 
+	log.Infof("Installed %v successfully ✔\n", plugin.Id)
+
 	res, _ := s.ReadPlugin(pluginFolder, pluginName)
 
 	for _, v := range res.Dependency.Plugins {
 		InstallPlugin(v.Id, version, c)
-		log.Infof("Installed Dependency: %v ✔\n", v.Id)
+		log.Infof("Installed dependency: %v ✔\n", v.Id)
 	}
 
 	return err
diff --git a/pkg/cmd/grafana-cli/commands/ls_command.go b/pkg/cmd/grafana-cli/commands/ls_command.go
index 5a90df89d8a..05dd57bfd2a 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command.go
@@ -10,7 +10,7 @@ import (
 
 var ls_getPlugins func(path string) []m.InstalledPlugin = s.GetLocalPlugins
 
-var validateLsCommmand = func(pluginDir string) error {
+var validateLsCommand = func(pluginDir string) error {
 	if pluginDir == "" {
 		return errors.New("missing path flag")
 	}
@@ -31,7 +31,7 @@ var validateLsCommmand = func(pluginDir string) error {
 
 func lsCommand(c CommandLine) error {
 	pluginDir := c.GlobalString("path")
-	if err := validateLsCommmand(pluginDir); err != nil {
+	if err := validateLsCommand(pluginDir); err != nil {
 		return err
 	}
 
diff --git a/pkg/cmd/grafana-cli/commands/ls_command_test.go b/pkg/cmd/grafana-cli/commands/ls_command_test.go
index fa49375234d..650c6270bf0 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command_test.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command_test.go
@@ -9,10 +9,10 @@ import (
 )
 
 func TestMissingPath(t *testing.T) {
-	var org = validateLsCommmand
+	var org = validateLsCommand
 
 	Convey("ls command", t, func() {
-		validateLsCommmand = org
+		validateLsCommand = org
 
 		Convey("Missing path", func() {
 			commandLine := &commandstest.FakeCommandLine{
@@ -61,7 +61,7 @@ func TestMissingPath(t *testing.T) {
 				},
 			}
 
-			validateLsCommmand = func(pluginDir string) error {
+			validateLsCommand = func(pluginDir string) error {
 				return errors.New("dummie error")
 			}
 
diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
index 12bebd46898..4e74578c604 100644
--- a/pkg/cmd/grafana-cli/main.go
+++ b/pkg/cmd/grafana-cli/main.go
@@ -41,7 +41,7 @@ func main() {
 		cli.StringFlag{
 			Name:  "repo",
 			Usage: "url to the plugin repository",
-			Value: "https://raw.githubusercontent.com/grafana/grafana-plugin-repository/master/repo.json",
+			Value: "",
 		},
 		cli.BoolFlag{
 			Name:  "debug, d",
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index 1ffc60abf4c..fc77570b77c 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -12,7 +12,8 @@ import (
 var IoHelper m.IoUtil = IoUtilImp{}
 
 func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
-	res, _ := goreq.Request{Uri: repoUrl, MaxRedirects: 3}.Do()
+
+	res, _ := goreq.Request{Uri: repoUrl + "/repo", MaxRedirects: 3}.Do()
 
 	var resp m.PluginRepo
 	err := res.Body.FromJsonTo(&resp)

From c09d506245f0d2a6572289b61280ea0c4d959075 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Mar 2016 16:38:16 +0100
Subject: [PATCH 09/20] feat(navigation): hide new and import for viewers

closes #4326
---
 pkg/api/index.go | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index 7cd2842b050..691c50f04f4 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -48,18 +48,23 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		data.User.LightTheme = true
 	}
 
+	dashboardChildNavs := []*dtos.NavLink{
+		{Text: "Home", Url: setting.AppSubUrl + "/"},
+		{Text: "Playlists", Url: setting.AppSubUrl + "/playlists"},
+		{Text: "Snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots"},
+	}
+
+	if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
+		dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Divider: true})
+		dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "New", Url: setting.AppSubUrl + "/dashboard/new"})
+		dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Url: setting.AppSubUrl + "/import/dashboard"})
+	}
+
 	data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
-		Text: "Dashboards",
-		Icon: "icon-gf icon-gf-dashboard",
-		Url:  setting.AppSubUrl + "/",
-		Children: []*dtos.NavLink{
-			{Text: "Home", Url: setting.AppSubUrl + "/"},
-			{Text: "Playlists", Url: setting.AppSubUrl + "/playlists"},
-			{Text: "Snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots"},
-			{Divider: true},
-			{Text: "New", Url: setting.AppSubUrl + "/dashboard/new"},
-			{Text: "Import", Url: setting.AppSubUrl + "/import/dashboard"},
-		},
+		Text:     "Dashboards",
+		Icon:     "icon-gf icon-gf-dashboard",
+		Url:      setting.AppSubUrl + "/",
+		Children: dashboardChildNavs,
 	})
 
 	if c.OrgRole == m.ROLE_ADMIN {

From 788aafff3cbbf635227cb1326c7c034c48ac5842 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 10 Mar 2016 17:16:01 +0100
Subject: [PATCH 10/20] feat(cli): disable dependecy downloads until needed

---
 pkg/cmd/grafana-cli/commands/install_command.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index 49e7d781389..4dfbfd80e31 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -85,13 +85,13 @@ func InstallPlugin(pluginName, version string, c CommandLine) error {
 
 	log.Infof("Installed %v successfully ✔\n", plugin.Id)
 
+	/* Enable once we need support for downloading depedencies
 	res, _ := s.ReadPlugin(pluginFolder, pluginName)
-
 	for _, v := range res.Dependency.Plugins {
 		InstallPlugin(v.Id, version, c)
 		log.Infof("Installed dependency: %v ✔\n", v.Id)
 	}
-
+	*/
 	return err
 }
 

From 8c6890c95fa4a824d5ace0cddc7783b8b2a4f688 Mon Sep 17 00:00:00 2001
From: Tom Dyas <tdyas@foursquare.com>
Date: Thu, 10 Mar 2016 17:46:59 -0500
Subject: [PATCH 11/20] remove extra comma in nginx-app's package.json

otherwise grunt fails due to a syntax error in package.json
---
 examples/nginx-app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/nginx-app/package.json b/examples/nginx-app/package.json
index 32c070f96b0..91c53734ec8 100644
--- a/examples/nginx-app/package.json
+++ b/examples/nginx-app/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0",
     "babel-preset-es2015": "^6.5.0",
-    "lodash": "~4.0.0",
+    "lodash": "~4.0.0"
   },
   "homepage": "https://github.com/raintank/kentik-app-poc#readme"
 }

From 2c5abed2f1bc3a9a2c9c81c58fe9c4ed3a810eff Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 11 Mar 2016 12:11:01 +0900
Subject: [PATCH 12/20] (cloudwatch) add metrics/dimensions of AWS/Events and
 AWS/Logs

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

diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
index a4e97cdb347..54ab565bede 100644
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -55,8 +55,10 @@ func init() {
 			"S3BytesWritten", "S3BytesRead", "HDFSUtilization", "HDFSBytesRead", "HDFSBytesWritten", "MissingBlocks", "CorruptBlocks", "TotalLoad", "MemoryTotalMB", "MemoryReservedMB", "MemoryAvailableMB", "MemoryAllocatedMB", "PendingDeletionBlocks", "UnderReplicatedBlocks", "DfsPendingReplicationBlocks", "CapacityRemainingGB",
 			"HbaseBackupFailed", "MostRecentBackupDuration", "TimeSinceLastSuccessfulBackup"},
 		"AWS/ES":       {"ClusterStatus.green", "ClusterStatus.yellow", "ClusterStatus.red", "Nodes", "SearchableDocuments", "DeletedDocuments", "CPUUtilization", "FreeStorageSpace", "JVMMemoryPressure", "AutomatedSnapshotFailure", "MasterCPUUtilization", "MasterFreeStorageSpace", "MasterJVMMemoryPressure", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "DiskQueueLength", "ReadIOPS", "WriteIOPS"},
+		"AWS/Events":   {"Invocations", "FailedInvocations", "TriggeredRules", "MatchedEvents", "ThrottledRules"},
 		"AWS/Kinesis":  {"PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "IncomingBytes", "IncomingRecords", "GetRecords.Bytes", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Success"},
 		"AWS/Lambda":   {"Invocations", "Errors", "Duration", "Throttles"},
+		"AWS/Logs":     {"IncomingBytes", "IncomingLogEvents", "ForwardedBytes", "ForwardedLogEvents", "DeliveryErrors", "DeliveryThrottling"},
 		"AWS/ML":       {"PredictCount", "PredictFailureCount"},
 		"AWS/OpsWorks": {"cpu_idle", "cpu_nice", "cpu_system", "cpu_user", "cpu_waitio", "load_1", "load_5", "load_15", "memory_buffers", "memory_cached", "memory_free", "memory_swap", "memory_total", "memory_used", "procs"},
 		"AWS/Redshift": {"CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "ReadIOPS", "ReadLatency", "ReadThroughput", "WriteIOPS", "WriteLatency", "WriteThroughput"},
@@ -85,8 +87,10 @@ func init() {
 		"AWS/ELB":              {"LoadBalancerName", "AvailabilityZone"},
 		"AWS/ElasticMapReduce": {"ClusterId", "JobFlowId", "JobId"},
 		"AWS/ES":               {},
+		"AWS/Events":           {"RuleName"},
 		"AWS/Kinesis":          {"StreamName"},
 		"AWS/Lambda":           {"FunctionName"},
+		"AWS/Logs":             {"LogGroupName", "DestinationType", "FilterName"},
 		"AWS/ML":               {"MLModelId", "RequestMode"},
 		"AWS/OpsWorks":         {"StackId", "LayerId", "InstanceId"},
 		"AWS/Redshift":         {"NodeID", "ClusterIdentifier"},

From 336c1b7b6e17292d033181cfa0d51e633ed705b1 Mon Sep 17 00:00:00 2001
From: simnv <simonov@gmail.com>
Date: Fri, 11 Mar 2016 08:30:56 +0500
Subject: [PATCH 13/20] Fix groupby selection

Default groupby selection for influxdb is escaped not like a regex, but as a glob. It works fine with one value in variable, but when you select multiple values, query is incorrect:
> SHOW TAG KEYS FROM "os.disk.fs.space_total" WHERE "host" =~ /{host-1,host-2}$/
---
 public/app/plugins/datasource/influxdb/datasource.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 84c7a83394c..1136c9709bd 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -104,7 +104,7 @@ export function InfluxDatasource(instanceSettings, $q, backendSrv, templateSrv)
   this.metricFindQuery = function (query) {
     var interpolated;
     try {
-      interpolated = templateSrv.replace(query);
+      interpolated = templateSrv.replace(query, null, 'regex');
     } catch (err) {
       return $q.reject(err);
     }

From b72cf90ed43b29f36f79a38fd5be5bc7da6fc32f Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 11 Mar 2016 08:39:05 +0100
Subject: [PATCH 14/20] example(panel): rename to match new convetion

---
 .../css/styles.css                                                | 0
 .../{panel-boilerplate-es5 => boilerplate-es5-panel}/module.js    | 0
 .../{panel-boilerplate-es5 => boilerplate-es5-panel}/panel.html   | 0
 .../{panel-boilerplate-es5 => boilerplate-es5-panel}/plugin.json  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename examples/{panel-boilerplate-es5 => boilerplate-es5-panel}/css/styles.css (100%)
 rename examples/{panel-boilerplate-es5 => boilerplate-es5-panel}/module.js (100%)
 rename examples/{panel-boilerplate-es5 => boilerplate-es5-panel}/panel.html (100%)
 rename examples/{panel-boilerplate-es5 => boilerplate-es5-panel}/plugin.json (100%)

diff --git a/examples/panel-boilerplate-es5/css/styles.css b/examples/boilerplate-es5-panel/css/styles.css
similarity index 100%
rename from examples/panel-boilerplate-es5/css/styles.css
rename to examples/boilerplate-es5-panel/css/styles.css
diff --git a/examples/panel-boilerplate-es5/module.js b/examples/boilerplate-es5-panel/module.js
similarity index 100%
rename from examples/panel-boilerplate-es5/module.js
rename to examples/boilerplate-es5-panel/module.js
diff --git a/examples/panel-boilerplate-es5/panel.html b/examples/boilerplate-es5-panel/panel.html
similarity index 100%
rename from examples/panel-boilerplate-es5/panel.html
rename to examples/boilerplate-es5-panel/panel.html
diff --git a/examples/panel-boilerplate-es5/plugin.json b/examples/boilerplate-es5-panel/plugin.json
similarity index 100%
rename from examples/panel-boilerplate-es5/plugin.json
rename to examples/boilerplate-es5-panel/plugin.json

From 0052e9d13623961b4abe3a7c18fa88030b9427d8 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 11 Mar 2016 14:58:29 +0900
Subject: [PATCH 15/20] (cloudwatch) add ec2_instance_attribute() query

---
 .../datasource/cloudwatch/datasource.js       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 06c723e416a..5d093640b1e 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -143,7 +143,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
       return this.awsRequest({
         region: region,
         action: 'DescribeInstances',
-        parameters: { filter: filters, instanceIds: instanceIds }
+        parameters: { filters: filters, instanceIds: instanceIds }
       });
     };
 
@@ -205,6 +205,28 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
         });
       }
 
+      var ec2InstanceAttributeQuery = query.match(/^ec2_instance_attribute\(([^,]+?),\s?([^,]+?),\s?([^)]+)\)/);
+      if (ec2InstanceAttributeQuery) {
+        region = templateSrv.replace(ec2InstanceAttributeQuery[1]);
+        var filterJson = JSON.parse(templateSrv.replace(ec2InstanceAttributeQuery[3]));
+        var filter = _.map(filterJson, function(f) {
+          return {
+            Name: f.slice(0, f.indexOf('=')),
+            Values: f.slice(f.indexOf('=') + 1).split(',')
+          };
+        });
+        var targetAttributeName = templateSrv.replace(ec2InstanceAttributeQuery[2]);
+
+        return this.performEC2DescribeInstances(region, filter, null).then(function(result) {
+          var attributes = _.chain(result.Reservations)
+          .map(function(reservations) {
+            return _.pluck(reservations.Instances, targetAttributeName);
+          })
+          .flatten().value();
+          return transformSuggestData(attributes);
+        });
+      }
+
       return $q.when([]);
     };
 

From a16c799da931319f24178ed06f9932b999575544 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 11 Mar 2016 08:52:14 +0100
Subject: [PATCH 16/20] fix(examples): update link in readme

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

diff --git a/examples/README.md b/examples/README.md
index 2e8a46f2aa3..04a544be399 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,3 +1,3 @@
 ## Example plugin implementations
 
-[datasource-plugin-genericdatsource](https://github.com/grafana/datasource-plugin-genericdatasource/tree/3.0)
\ No newline at end of file
+[simple-json-datasource](https://github.com/grafana/simple-json-datasource)
\ No newline at end of file

From 25f08ddd39661b571d767a8ecae07f13cd6eca1d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 11 Mar 2016 16:59:06 +0900
Subject: [PATCH 17/20] (cloudwatch) change parameter form of
 ec2_instance_attribute()

---
 public/app/plugins/datasource/cloudwatch/datasource.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 5d093640b1e..cdaeebb83b8 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -205,14 +205,14 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
         });
       }
 
-      var ec2InstanceAttributeQuery = query.match(/^ec2_instance_attribute\(([^,]+?),\s?([^,]+?),\s?([^)]+)\)/);
+      var ec2InstanceAttributeQuery = query.match(/^ec2_instance_attribute\(([^,]+?),\s?([^,]+?),\s?(.+?)\)/);
       if (ec2InstanceAttributeQuery) {
         region = templateSrv.replace(ec2InstanceAttributeQuery[1]);
         var filterJson = JSON.parse(templateSrv.replace(ec2InstanceAttributeQuery[3]));
-        var filter = _.map(filterJson, function(f) {
+        var filter = _.map(filterJson, function(values, name) {
           return {
-            Name: f.slice(0, f.indexOf('=')),
-            Values: f.slice(f.indexOf('=') + 1).split(',')
+            Name: name,
+            Values: values
           };
         });
         var targetAttributeName = templateSrv.replace(ec2InstanceAttributeQuery[2]);

From b989e2ce37fdaa9b14f142e6c61b309123f6aa0a Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 11 Mar 2016 17:04:42 +0900
Subject: [PATCH 18/20] minor fix

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

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index cdaeebb83b8..704cbd41e72 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -209,7 +209,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
       if (ec2InstanceAttributeQuery) {
         region = templateSrv.replace(ec2InstanceAttributeQuery[1]);
         var filterJson = JSON.parse(templateSrv.replace(ec2InstanceAttributeQuery[3]));
-        var filter = _.map(filterJson, function(values, name) {
+        var filters = _.map(filterJson, function(values, name) {
           return {
             Name: name,
             Values: values
@@ -217,7 +217,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
         });
         var targetAttributeName = templateSrv.replace(ec2InstanceAttributeQuery[2]);
 
-        return this.performEC2DescribeInstances(region, filter, null).then(function(result) {
+        return this.performEC2DescribeInstances(region, filters, null).then(function(result) {
           var attributes = _.chain(result.Reservations)
           .map(function(reservations) {
             return _.pluck(reservations.Instances, targetAttributeName);

From 4f52bc138fed3f2b378cb98452b389040c4a5e2e Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 11 Mar 2016 10:06:44 +0100
Subject: [PATCH 19/20] docs(examples): move app example into new repo

---
 examples/README.md                            |   3 +-
 examples/nginx-app/.gitignore                 |   7 ---
 examples/nginx-app/.jscs.json                 |  13 -----
 examples/nginx-app/.jshintrc                  |  36 ------------
 examples/nginx-app/Gruntfile.js               |  54 ------------------
 examples/nginx-app/package.json               |  37 ------------
 examples/nginx-app/plugin.json                |  50 ----------------
 examples/nginx-app/readme.md                  |   7 ---
 examples/nginx-app/src/components/config.html |   3 -
 examples/nginx-app/src/components/config.js   |   6 --
 examples/nginx-app/src/components/logs.html   |   3 -
 examples/nginx-app/src/components/logs.js     |   6 --
 examples/nginx-app/src/components/stream.html |   3 -
 examples/nginx-app/src/components/stream.js   |   6 --
 examples/nginx-app/src/css/dark.css           |   0
 examples/nginx-app/src/css/light.css          |   0
 .../nginx-app/src/dashboards/dashboard.js     |  17 ------
 .../dashboards/nginx_connection_stats.json    |   0
 .../nginx-app/src/datasource/datasource.js    |  12 ----
 examples/nginx-app/src/datasource/module.js   |   5 --
 examples/nginx-app/src/datasource/plugin.json |   5 --
 examples/nginx-app/src/img/logo_large.png     | Bin 14460 -> 0 bytes
 examples/nginx-app/src/img/logo_small.png     | Bin 6430 -> 0 bytes
 examples/nginx-app/src/module.js              |   9 ---
 examples/nginx-app/src/panel/module.js        |  15 -----
 examples/nginx-app/src/panel/plugin.json      |   5 --
 26 files changed, 2 insertions(+), 300 deletions(-)
 delete mode 100644 examples/nginx-app/.gitignore
 delete mode 100644 examples/nginx-app/.jscs.json
 delete mode 100644 examples/nginx-app/.jshintrc
 delete mode 100644 examples/nginx-app/Gruntfile.js
 delete mode 100644 examples/nginx-app/package.json
 delete mode 100644 examples/nginx-app/plugin.json
 delete mode 100644 examples/nginx-app/readme.md
 delete mode 100644 examples/nginx-app/src/components/config.html
 delete mode 100644 examples/nginx-app/src/components/config.js
 delete mode 100644 examples/nginx-app/src/components/logs.html
 delete mode 100644 examples/nginx-app/src/components/logs.js
 delete mode 100644 examples/nginx-app/src/components/stream.html
 delete mode 100644 examples/nginx-app/src/components/stream.js
 delete mode 100644 examples/nginx-app/src/css/dark.css
 delete mode 100644 examples/nginx-app/src/css/light.css
 delete mode 100644 examples/nginx-app/src/dashboards/dashboard.js
 delete mode 100644 examples/nginx-app/src/dashboards/nginx_connection_stats.json
 delete mode 100644 examples/nginx-app/src/datasource/datasource.js
 delete mode 100644 examples/nginx-app/src/datasource/module.js
 delete mode 100644 examples/nginx-app/src/datasource/plugin.json
 delete mode 100644 examples/nginx-app/src/img/logo_large.png
 delete mode 100644 examples/nginx-app/src/img/logo_small.png
 delete mode 100644 examples/nginx-app/src/module.js
 delete mode 100644 examples/nginx-app/src/panel/module.js
 delete mode 100644 examples/nginx-app/src/panel/plugin.json

diff --git a/examples/README.md b/examples/README.md
index 04a544be399..64341a7fdbc 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,3 +1,4 @@
 ## Example plugin implementations
 
-[simple-json-datasource](https://github.com/grafana/simple-json-datasource)
\ No newline at end of file
+datasource:[simple-json-datasource](https://github.com/grafana/simple-json-datasource)
+app:  [example-app](https://github.com/grafana/example-app)
\ No newline at end of file
diff --git a/examples/nginx-app/.gitignore b/examples/nginx-app/.gitignore
deleted file mode 100644
index 8c2c350441b..00000000000
--- a/examples/nginx-app/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.DS_Store
-
-node_modules
-tmp/*
-npm-debug.log
-dist/*
-
diff --git a/examples/nginx-app/.jscs.json b/examples/nginx-app/.jscs.json
deleted file mode 100644
index dcf694dcc63..00000000000
--- a/examples/nginx-app/.jscs.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "disallowImplicitTypeConversion": ["string"],
-    "disallowKeywords": ["with"],
-    "disallowMultipleLineBreaks": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpacesInsideParentheses": true,
-    "validateIndentation": 2
-}
\ No newline at end of file
diff --git a/examples/nginx-app/.jshintrc b/examples/nginx-app/.jshintrc
deleted file mode 100644
index 3725af83afc..00000000000
--- a/examples/nginx-app/.jshintrc
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "browser": true,
-  "esnext": true,
-
-  "bitwise":false,
-  "curly": true,
-  "eqnull": true,
-  "devel": true,
-  "eqeqeq": true,
-  "forin": false,
-  "immed": true,
-  "supernew": true,
-  "expr": true,
-  "indent": 2,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "noempty": true,
-  "undef": true,
-  "boss": true,
-  "trailing": true,
-  "laxbreak": true,
-  "laxcomma": true,
-  "sub": true,
-  "unused": true,
-  "maxdepth": 6,
-  "maxlen": 140,
-
-  "globals": {
-    "System": true,
-    "define": true,
-    "require": true,
-    "Chromath": false,
-    "setImmediate": true
-  }
-}
diff --git a/examples/nginx-app/Gruntfile.js b/examples/nginx-app/Gruntfile.js
deleted file mode 100644
index b88d857cde3..00000000000
--- a/examples/nginx-app/Gruntfile.js
+++ /dev/null
@@ -1,54 +0,0 @@
-module.exports = function(grunt) {
-
-  require('load-grunt-tasks')(grunt);
-
-  grunt.loadNpmTasks('grunt-execute');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-
-  grunt.initConfig({
-
-    clean: ["dist"],
-
-    copy: {
-      src_to_dist: {
-        cwd: 'src',
-        expand: true,
-        src: ['**/*', '!**/*.js', '!**/*.scss'],
-        dest: 'dist'
-      },
-      pluginDef: {
-        expand: true,
-        src: ['plugin.json', 'readme.md'],
-        dest: 'dist',
-      }
-    },
-
-    watch: {
-      rebuild_all: {
-        files: ['src/**/*', 'plugin.json', 'readme.md'],
-        tasks: ['default'],
-        options: {spawn: false}
-      },
-    },
-
-    babel: {
-      options: {
-        sourceMap: true,
-        presets:  ["es2015"],
-        plugins: ['transform-es2015-modules-systemjs', "transform-es2015-for-of"],
-      },
-      dist: {
-        files: [{
-          cwd: 'src',
-          expand: true,
-          src: ['**/*.js'],
-          dest: 'dist',
-          ext:'.js'
-        }]
-      },
-    },
-
-  });
-
-  grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:pluginDef', 'babel']);
-};
diff --git a/examples/nginx-app/package.json b/examples/nginx-app/package.json
deleted file mode 100644
index 91c53734ec8..00000000000
--- a/examples/nginx-app/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "kentik-app",
-  "private": true,
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/raintank/kentik-app-poc.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/raintank/kentik-app-poc/issues"
-  },
-  "devDependencies": {
-    "grunt": "~0.4.5",
-    "babel": "~6.5.1",
-    "grunt-babel": "~6.0.0",
-    "grunt-contrib-copy": "~0.8.2",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-contrib-uglify": "~0.11.0",
-    "grunt-systemjs-builder": "^0.2.5",
-    "load-grunt-tasks": "~3.2.0",
-    "grunt-execute": "~0.2.2",
-    "grunt-contrib-clean": "~0.6.0"
-  },
-  "dependencies": {
-    "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0",
-    "babel-preset-es2015": "^6.5.0",
-    "lodash": "~4.0.0"
-  },
-  "homepage": "https://github.com/raintank/kentik-app-poc#readme"
-}
diff --git a/examples/nginx-app/plugin.json b/examples/nginx-app/plugin.json
deleted file mode 100644
index 65f01ad62fc..00000000000
--- a/examples/nginx-app/plugin.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "type": "app",
-  "name": "Nginx",
-  "id": "nginx-app",
-
-  "staticRoot": ".",
-
-  "pages": [
-    { "name": "Live stream", "component": "StreamPageCtrl", "role": "Editor"},
-    { "name": "Log view", "component": "LogsPageCtrl", "role": "Viewer"}
-  ],
-
-  "css": {
-    "dark":  "css/dark.css",
-    "light":  "css/light.css"
-  },
-
-  "info": {
-    "description": "Official Grafana Nginx App & Dashboard bundle",
-    "author": {
-      "name": "Nginx Inc.",
-      "url": "http://nginx.com"
-    },
-    "keywords": ["nginx"],
-    "logos": {
-      "small": "img/logo_small.png",
-      "large": "img/logo_large.png"
-    },
-    "links": [
-      {"name": "Project site", "url": "http://project.com"},
-      {"name": "License & Terms", "url": "http://license.com"}
-    ],
-    "version": "1.0.0",
-    "updated": "2015-02-10"
-  },
-
-  "includes": [
-    {"type": "dashboard", "name": "Nginx Connection stats", "path": "dashboards/nginx_connection_stats.json"},
-    {"type": "panel", "name": "Nginx Panel"},
-    {"type": "datasource", "name": "Nginx Datasource"}
-  ],
-
-  "dependencies": {
-    "grafanaVersion": "3.x.x",
-    "plugins": [
-      {"type": "datasource", "id": "graphite", "name": "Graphite", "version": "1.0.0"},
-      {"type": "panel", "id": "graph", "name": "Graph", "version": "1.0.0"}
-    ]
-  }
-}
diff --git a/examples/nginx-app/readme.md b/examples/nginx-app/readme.md
deleted file mode 100644
index c267cfbb1fc..00000000000
--- a/examples/nginx-app/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Overview
-
-This application is an example app.
-
-### Awesome
-
-Even though it does not have any features it is still pretty awesome.
diff --git a/examples/nginx-app/src/components/config.html b/examples/nginx-app/src/components/config.html
deleted file mode 100644
index c531ec36d76..00000000000
--- a/examples/nginx-app/src/components/config.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>
-	Nginx config!
-</h3>
diff --git a/examples/nginx-app/src/components/config.js b/examples/nginx-app/src/components/config.js
deleted file mode 100644
index bb8f007b9bc..00000000000
--- a/examples/nginx-app/src/components/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export class NginxAppConfigCtrl {
-}
-NginxAppConfigCtrl.templateUrl = 'components/config.html';
-
-
diff --git a/examples/nginx-app/src/components/logs.html b/examples/nginx-app/src/components/logs.html
deleted file mode 100644
index ca215772bf5..00000000000
--- a/examples/nginx-app/src/components/logs.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>
-	Logs page!
-</h3>
diff --git a/examples/nginx-app/src/components/logs.js b/examples/nginx-app/src/components/logs.js
deleted file mode 100644
index 5b67290381b..00000000000
--- a/examples/nginx-app/src/components/logs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export class LogsPageCtrl {
-}
-LogsPageCtrl.templateUrl = 'components/logs.html';
-
-
diff --git a/examples/nginx-app/src/components/stream.html b/examples/nginx-app/src/components/stream.html
deleted file mode 100644
index ad70ca4df50..00000000000
--- a/examples/nginx-app/src/components/stream.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>
-	Stream page!
-</h3>
diff --git a/examples/nginx-app/src/components/stream.js b/examples/nginx-app/src/components/stream.js
deleted file mode 100644
index 8684b36c64d..00000000000
--- a/examples/nginx-app/src/components/stream.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export class StreamPageCtrl {
-}
-StreamPageCtrl.templateUrl = 'components/stream.html';
-
-
diff --git a/examples/nginx-app/src/css/dark.css b/examples/nginx-app/src/css/dark.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/nginx-app/src/css/light.css b/examples/nginx-app/src/css/light.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/nginx-app/src/dashboards/dashboard.js b/examples/nginx-app/src/dashboards/dashboard.js
deleted file mode 100644
index 794e2c5217b..00000000000
--- a/examples/nginx-app/src/dashboards/dashboard.js
+++ /dev/null
@@ -1,17 +0,0 @@
-require([
-], function () {
-
-  function Dashboard() {
-
-    this.getInputs = function() {
-
-    };
-
-    this.buildDashboard = function() {
-
-    };
-  }
-
-  return Dashboard;
-});
-
diff --git a/examples/nginx-app/src/dashboards/nginx_connection_stats.json b/examples/nginx-app/src/dashboards/nginx_connection_stats.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/nginx-app/src/datasource/datasource.js b/examples/nginx-app/src/datasource/datasource.js
deleted file mode 100644
index 7f4ed363707..00000000000
--- a/examples/nginx-app/src/datasource/datasource.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default class NginxDatasource {
-
-  constructor() {}
-
-  query(options) {
-    return [];
-  }
-
-  testDatasource() {
-    return false;
-  }
-}
diff --git a/examples/nginx-app/src/datasource/module.js b/examples/nginx-app/src/datasource/module.js
deleted file mode 100644
index a3473e59889..00000000000
--- a/examples/nginx-app/src/datasource/module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import {Datasource} from  './datasource';
-
-export {
-  Datasource
-};
\ No newline at end of file
diff --git a/examples/nginx-app/src/datasource/plugin.json b/examples/nginx-app/src/datasource/plugin.json
deleted file mode 100644
index ffce9492418..00000000000
--- a/examples/nginx-app/src/datasource/plugin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "type": "datasource",
-  "name": "Nginx Datasource",
-  "id": "nginx-datasource"
-}
diff --git a/examples/nginx-app/src/img/logo_large.png b/examples/nginx-app/src/img/logo_large.png
deleted file mode 100644
index c28955960e4d842f8d47496e9382e7ceadae2100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14460
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
TE(&}n2vU?&eO@MG67+un{$ko6

diff --git a/examples/nginx-app/src/img/logo_small.png b/examples/nginx-app/src/img/logo_small.png
deleted file mode 100644
index a6040f66f3da060c679acd661cf8b1f53eb6720d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6430
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

diff --git a/examples/nginx-app/src/module.js b/examples/nginx-app/src/module.js
deleted file mode 100644
index b5aeecc6ccf..00000000000
--- a/examples/nginx-app/src/module.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import {LogsPageCtrl} from './components/logs';
-import {StreamPageCtrl} from './components/stream';
-import {NginxAppConfigCtrl} from './components/config';
-
-export {
-  NginxAppConfigCtrl as ConfigCtrl,
-  StreamPageCtrl,
-  LogsPageCtrl
-};
diff --git a/examples/nginx-app/src/panel/module.js b/examples/nginx-app/src/panel/module.js
deleted file mode 100644
index 899586da81b..00000000000
--- a/examples/nginx-app/src/panel/module.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {PanelCtrl} from  'app/plugins/sdk';
-
-class NginxPanelCtrl extends PanelCtrl {
-
-  constructor($scope, $injector) {
-    super($scope, $injector);
-  }
-
-}
-NginxPanelCtrl.template = '<h2>nginx!</h2>';
-
-export {
-  NginxPanelCtrl as PanelCtrl
-};
-
diff --git a/examples/nginx-app/src/panel/plugin.json b/examples/nginx-app/src/panel/plugin.json
deleted file mode 100644
index f3548c987f3..00000000000
--- a/examples/nginx-app/src/panel/plugin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "type": "panel",
-  "name": "Nginx Panel",
-  "id": "nginx-panel"
-}

From 01788e86e5b63e0508924e788ea1ef9866b790db Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 11 Mar 2016 18:14:29 +0900
Subject: [PATCH 20/20] (cloudwatch) add document for new query

---
 docs/sources/datasources/cloudwatch.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/sources/datasources/cloudwatch.md b/docs/sources/datasources/cloudwatch.md
index 4d9d8b38c1c..351b08eb2aa 100644
--- a/docs/sources/datasources/cloudwatch.md
+++ b/docs/sources/datasources/cloudwatch.md
@@ -64,9 +64,19 @@ Name | Description
 `metrics(namespace)` | Returns a list of metrics in the namespace.
 `dimension_keys(namespace)` | Returns a list of dimension keys in the namespace.
 `dimension_values(region, namespace, metric, dimension_key)` | Returns a list of dimension values matching the specified `region`, `namespace`, `metric` and `dimension_key`.
+`ebs_volume_ids(region, instance_id)` | Returns a list of volume id matching the specified `region`, `instance_id`.
+`ec2_instance_attribute(region, attribute_name, filters)` | Returns a list of attribute matching the specified `region`, `attribute_name`, `filters`.
 
 For details about the metrics CloudWatch provides, please refer to the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html).
 
+The `ec2_instance_attribute` query take `filters` in JSON format.  
+You can specify [pre-defined filters of ec2:DescribeInstances](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html).  
+Specify like `{ filter_name1: [ filter_value1 ], filter_name2: [ filter_value2 ] }`
+
+Example `ec2_instance_attribute()` query
+
+    ec2_instance_attribute(us-east-1, InstanceId, { "tag:Environment": [ "production" ] })
+
 ![](/img/v2/cloudwatch_templating.png)
 
 ## Cost