Commit 5599bdf1 by Torkel Ödegaard

Merge branch 'master' of github.com:grafana/grafana

parents de415360 30d32199
...@@ -34,13 +34,11 @@ ...@@ -34,13 +34,11 @@
"updated": "2015-02-10" "updated": "2015-02-10"
}, },
"includes": { "includes": [
"dashboards": [], {"type": "dashboard", "name": "Nginx Connection stats", "path": "dashboards/nginx_connection_stats.json"},
"plugins": [ {"type": "panel", "name": "Nginx Panel"},
{"type": "panel", "name": "Nginx Panel"}, {"type": "datasource", "name": "Nginx Datasource"}
{"type": "datasource", "name": "Nginx Datasource"} ],
]
},
"dependencies": { "dependencies": {
"grafanaVersion": "3.x.x", "grafanaVersion": "3.x.x",
......
<navbar title="Plugins" title-url="plugins" icon="icon-gf icon-gf-apps"> <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}} {{ctrl.model.name}}
</a> </a>
</navbar> </navbar>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment