From 92c60253901e0883c30df25d4c9b3719b42e7f23 Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Tue, 8 Mar 2016 07:39:41 -0800
Subject: [PATCH 1/3] Minor nav fix

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

diff --git a/public/app/features/plugins/partials/edit.html b/public/app/features/plugins/partials/edit.html
index 14e75cea15f..9f40c5179b6 100644
--- a/public/app/features/plugins/partials/edit.html
+++ b/public/app/features/plugins/partials/edit.html
@@ -1,5 +1,5 @@
 <navbar title="Plugins" title-url="plugins" icon="icon-gf icon-gf-apps">
-<a href="plugins" class="navbar-page-btn">
+<a href="plugins/{{ctrl.model.pluginId}}/edit" class="navbar-page-btn">
   {{ctrl.model.name}}
 </a>
 </navbar>

From 2c396d4922a42260f81018b44f03377a0e98b130 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 8 Mar 2016 21:50:02 +0100
Subject: [PATCH 2/3] example(plugin.json): align example app with latests
 version

---
 examples/nginx-app/plugin.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/nginx-app/plugin.json b/examples/nginx-app/plugin.json
index 2cd4a9486d4..0c252186b4e 100644
--- a/examples/nginx-app/plugin.json
+++ b/examples/nginx-app/plugin.json
@@ -34,13 +34,10 @@
     "updated": "2015-02-10"
   },
 
-  "includes": {
-    "dashboards": [],
-    "plugins": [
+  "includes": [
       {"type": "panel", "name": "Nginx Panel"},
       {"type": "datasource", "name": "Nginx Datasource"}
-    ]
-  },
+  ],
 
   "dependencies": {
     "grafanaVersion": "3.x.x",

From 59a02ce76a98adc2ddef573dc6dc9442f7081ec1 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 8 Mar 2016 22:13:40 +0100
Subject: [PATCH 3/3] example(plugin.json): add example dashboard file

---
 examples/nginx-app/plugin.json                               | 5 +++--
 .../nginx-app/src/dashboards/nginx_connection_stats.json     | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 examples/nginx-app/src/dashboards/nginx_connection_stats.json

diff --git a/examples/nginx-app/plugin.json b/examples/nginx-app/plugin.json
index 0c252186b4e..65f01ad62fc 100644
--- a/examples/nginx-app/plugin.json
+++ b/examples/nginx-app/plugin.json
@@ -35,8 +35,9 @@
   },
 
   "includes": [
-      {"type": "panel", "name": "Nginx Panel"},
-      {"type": "datasource", "name": "Nginx Datasource"}
+    {"type": "dashboard", "name": "Nginx Connection stats", "path": "dashboards/nginx_connection_stats.json"},
+    {"type": "panel", "name": "Nginx Panel"},
+    {"type": "datasource", "name": "Nginx Datasource"}
   ],
 
   "dependencies": {
diff --git a/examples/nginx-app/src/dashboards/nginx_connection_stats.json b/examples/nginx-app/src/dashboards/nginx_connection_stats.json
new file mode 100644
index 00000000000..e69de29bb2d