From a7e322bfebda5c3bb7f2648994a4a2e442b50054 Mon Sep 17 00:00:00 2001 From: alexanderzobnin Date: Thu, 18 Jun 2015 13:26:39 +0300 Subject: [PATCH] iss #16 Add auto selection between history and trends. --- zabbix/datasource.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/zabbix/datasource.js b/zabbix/datasource.js index 62212d9..f03fc51 100644 --- a/zabbix/datasource.js +++ b/zabbix/datasource.js @@ -44,6 +44,7 @@ function (angular, _, kbn) { // get from & to in seconds var from = Math.ceil(kbn.parseDate(options.range.from).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 var promises = _.map(options.targets, function(target) { @@ -93,8 +94,14 @@ function (angular, _, kbn) { return []; } else { 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);