From fb30e70e2b857bc43bb599b3f23fbfd48bfaf975 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 2 Jul 2015 20:51:26 +0300 Subject: [PATCH 1/2] Change default value for trends parameter to false. --- zabbix/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zabbix/plugin.json b/zabbix/plugin.json index 5d10ced..0ff34a5 100644 --- a/zabbix/plugin.json +++ b/zabbix/plugin.json @@ -16,7 +16,7 @@ "username": "guest", "password": "", - "trends": true, + "trends": false, "trendsFrom": "7d", "limitmetrics": 50, From e8079bf4aa7fea069d38c730bc5eb4809050045f Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 6 Jul 2015 18:38:41 +0300 Subject: [PATCH 2/2] Fixed #46 - wrong metric names when using templated variables and "All" value with "glob" format. --- zabbix/datasource.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zabbix/datasource.js b/zabbix/datasource.js index 57489d2..89df0ec 100644 --- a/zabbix/datasource.js +++ b/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)