Merge branch 'develop'

src/datasource-zabbix/partials/config.html

@@ -23,8 +23,7 @@
     <input class="gf-form-input max-width-21"
            type="password"
            ng-model='ctrl.current.jsonData.password'
-           placeholder="password"
+           placeholder="password">
-           required>
     </input>
   </div>
 

src/datasource-zabbix/zabbixAPI.service.js

@@ -155,6 +155,7 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) {
           'state'
         ],
         sortfield: 'name',
+        webitems: true
       };
       if (hostids) {
         params.hostids = hostids;

src/panel-triggers/editor.js

@@ -61,7 +61,7 @@ class TriggerPanelEditorCtrl{
 
     // Get zabbix data sources
     var datasources = _.filter(this.datasourceSrv.getMetricSources(), datasource => {
-      return datasource.meta.id === 'zabbix-datasource';
+      return datasource.meta.id === 'alexanderzobnin-zabbix-datasource';
     });
     this.datasources = _.map(datasources, 'name');
 
@@ -150,7 +150,7 @@ class TriggerPanelEditorCtrl{
     this.popoverSrv.show({
       element: el,
       placement: 'top',
-      templateUrl:  'public/plugins/zabbix-app/panel-triggers/trigger.colorpicker.html',
+      templateUrl:  'public/plugins/alexanderzobnin-zabbix-app/panel-triggers/trigger.colorpicker.html',
       scope: popoverScope
     });
   }
@@ -167,7 +167,7 @@ class TriggerPanelEditorCtrl{
     this.popoverSrv.show({
       element: el,
       placement: 'top',
-      templateUrl:  'public/plugins/zabbix-app/panel-triggers/trigger.colorpicker.html',
+      templateUrl:  'public/plugins/alexanderzobnin-zabbix-app/panel-triggers/trigger.colorpicker.html',
       scope: popoverScope
     });
   }
@@ -192,7 +192,7 @@ export function triggerPanelEditor() {
   return {
     restrict: 'E',
     scope: true,
-    templateUrl: 'public/plugins/zabbix-app/panel-triggers/editor.html',
+    templateUrl: 'public/plugins/alexanderzobnin-zabbix-app/panel-triggers/editor.html',
     controller: TriggerPanelEditorCtrl,
   };
 }

src/plugin.json

@@ -12,15 +12,20 @@
     "description": "Zabbix plugin for Grafana",
     "author": {
       "name": "Alexander Zobnin",
-      "url": "https://github.com/alexanderzobnin/grafana-zabbix"
+      "url": "https://github.com/alexanderzobnin"
     },
     "keywords": ["zabbix"],
+    "logos": {
+      "small": "/img/zabbix_logo_200.png",
+      "large": "/img/zabbix_logo_400.png"
+    },
     "links": [
-      {"name": "Project site", "url": "https://github.com/alexanderzobnin/grafana-zabbix"},
+      {"name": "GitHub", "url": "https://github.com/alexanderzobnin/grafana-zabbix"},
-      {"name": "License & Terms", "url": "https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE.md"}
+      {"name": "Docs", "url": "http://docs.grafana-zabbix.org"},
+      {"name": "License", "url": "https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE.md"}
     ],
-    "version": "3.0.0-beta2",
+    "version": "3.0.0-beta3",
-    "updated": "2016-04-04"
+    "updated": "2016-04-06"
   },
 
   "includes": [