Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release-2.0.0' into develop

Browse Source
This commit is contained in:
Alexander Zobnin
2015-07-06 19:55:46 +03:00
parent 0d431f523d e8079bf4aa
commit 69f0d6d45a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zabbix/datasource.js
View File

@@ -124,7 +124,9 @@ function (angular, _, kbn) {
return []; return [];
} else { } else {
items = _.flatten(items); 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) { if ((from < useTrendsFrom) && self.trends) {
return zabbix.getTrends(items, from, to) return zabbix.getTrends(items, from, to)

2
zabbix/plugin.json
View File

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