Merge branch 'develop'

src/components/config.html

@@ -1,13 +1 @@
-<h3 class="page-heading">Zabbix App Config</h3>
-
-<div class="gf-form-group">
-  <div class="gf-form-inline">
-    <div class="gf-form">
-      <span class="gf-form-label">json Data property</span>
-      <input type="text" class="gf-form-input" ng-model="ctrl.appModel.jsonData.customText" >
-    </div>
-    <div class="gf-form">
-      <editor-checkbox text="Custom value" model="ctrl.appModel.jsonData.customCheckbox"></editor-checkbox>
-    </div>
-  </div>
-</div>
+<h3 class="page-heading">Zabbix Plugin Config</h3>

src/datasource-zabbix/plugin.json

@@ -1,7 +1,7 @@
 {
   "type": "datasource",
   "name": "Zabbix",
-  "id": "zabbix-datasource",
+  "id": "alexanderzobnin-zabbix-datasource",
 
   "metrics": true,
   "annotations": true,
@@ -9,7 +9,7 @@
   "info": {
     "author": {
       "name": "Alexander Zobnin",
-      "url": "http://grafana-zabbix.org"
+      "url": "https://github.com/alexanderzobnin/grafana-zabbix"
     }
   }
 }

src/panel-triggers/plugin.json

@@ -1,12 +1,12 @@
 {
   "type": "panel",
   "name": "Zabbix Triggers",
-  "id": "zabbix-triggers-panel",
+  "id": "alexanderzobnin-zabbix-triggers-panel",
 
   "info": {
     "author": {
       "name": "Alexander Zobnin",
-      "url": "http://grafana-zabbix.org"
+      "url": "https://github.com/alexanderzobnin/grafana-zabbix"
     }
   }
 }

src/plugin.json

@@ -1,7 +1,7 @@
 {
   "type": "app",
-  "name": "Zabbix App",
-  "id": "zabbix-app",
+  "name": "Zabbix",
+  "id": "alexanderzobnin-zabbix-app",
 
   "css": {
     "dark":  "css/dark.css",
@@ -12,14 +12,14 @@
     "description": "Zabbix plugin for Grafana",
     "author": {
       "name": "Alexander Zobnin",
-      "url": "http://grafana-zabbix.org"
+      "url": "https://github.com/alexanderzobnin/grafana-zabbix"
     },
     "keywords": ["zabbix"],
     "links": [
       {"name": "Project site", "url": "https://github.com/alexanderzobnin/grafana-zabbix"},
       {"name": "License & Terms", "url": "https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE.md"}
     ],
-    "version": "1.0.0-beta1",
+    "version": "3.0.0-beta1",
     "updated": "2016-03-31"
   },