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

iss #16 Add auto selection between history and trends.

Browse Source
This commit is contained in:
alexanderzobnin
2015-06-18 13:26:39 +03:00
parent c58aae7f10
commit a7e322bfeb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zabbix/datasource.js
View File

@@ -44,6 +44,7 @@ function (angular, _, kbn) {
// get from & to in seconds // get from & to in seconds
var from = Math.ceil(kbn.parseDate(options.range.from).getTime() / 1000); var from = Math.ceil(kbn.parseDate(options.range.from).getTime() / 1000);
var to = Math.ceil(kbn.parseDate(options.range.to).getTime() / 1000); var to = Math.ceil(kbn.parseDate(options.range.to).getTime() / 1000);
var getTrendsFrom = Math.ceil(kbn.parseDate('now-7d').getTime() / 1000);
// Create request for each target // Create request for each target
var promises = _.map(options.targets, function(target) { var promises = _.map(options.targets, function(target) {
@@ -93,8 +94,14 @@ function (angular, _, kbn) {
return []; return [];
} else { } else {
items = _.flatten(items); items = _.flatten(items);
return self.getTrends(items, from, to)
.then(_.partial(self.handleTrendResponse, items)); if (from > getTrendsFrom) {
return self.performTimeSeriesQuery(items, from, to)
.then(_.partial(self.handleHistoryResponse, items));
} else {
return self.getTrends(items, from, to)
.then(_.partial(self.handleTrendResponse, items));
}
} }
}); });
}, this); }, this);