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

Add "trends" option to activate trend api support.

Browse Source
This commit is contained in:
alexanderzobnin
2015-06-18 17:40:50 +03:00
parent bcde137718
commit 7bc5778697
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zabbix/datasource.js
View File

@@ -26,6 +26,7 @@ function (angular, _, kbn) {
this.password = datasource.meta.password; this.password = datasource.meta.password;
// Use trends instead history since specified time // Use trends instead history since specified time
this.trends = datasource.meta.trends;
this.trendsFrom = datasource.meta.trendsFrom || '7d'; this.trendsFrom = datasource.meta.trendsFrom || '7d';
// Limit metrics per panel for templated request // Limit metrics per panel for templated request
@@ -98,12 +99,12 @@ function (angular, _, kbn) {
} else { } else {
items = _.flatten(items); items = _.flatten(items);
if (from > useTrendsFrom) { if ((from < useTrendsFrom) && self.trends) {
return self.performTimeSeriesQuery(items, from, to)
.then(_.partial(self.handleHistoryResponse, items));
} else {
return self.getTrends(items, from, to) return self.getTrends(items, from, to)
.then(_.partial(self.handleTrendResponse, items)); .then(_.partial(self.handleTrendResponse, items));
} else {
return self.performTimeSeriesQuery(items, from, to)
.then(_.partial(self.handleHistoryResponse, items));
} }
} }
}); });

2
zabbix/plugin.json
View File

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