Merge branch 'release-2.0.0' into develop

zabbix/datasource.js

@@ -124,7 +124,9 @@ function (angular, _, kbn) {
               return [];
             } else {
               items = _.flatten(items);
-              var alias = target.item.name === 'All' ? undefined : templateSrv.replace(target.alias);
+
+              // Use alias only for single metric, otherwise use item names
+              var alias = items.length > 1 ? undefined : templateSrv.replace(target.alias);
 
               if ((from < useTrendsFrom) && self.trends) {
                 return zabbix.getTrends(items, from, to)

zabbix/plugin.json

@@ -16,7 +16,7 @@
   "username": "guest",
   "password": "",
 
-  "trends": true,
+  "trends": false,
   "trendsFrom": "7d",
 
   "limitmetrics": 50,