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

Able to use both time and range for trends config, #364

Browse Source
This commit is contained in:
Alexander Zobnin
2017-04-18 12:09:25 +03:00
parent e83a1bcfe0
commit e241a5f990
6 changed files with 137 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/datasource-zabbix/datasource.js
View File

@@ -31,6 +31,7 @@ class ZabbixAPIDatasource {
// Use trends instead history since specified time
this.trends = instanceSettings.jsonData.trends;
this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d';
this.trendsRange = instanceSettings.jsonData.trendsRange || '4d';
// Set cache update interval
var ttl = instanceSettings.jsonData.cacheTTL || '1h';
@@ -61,7 +62,13 @@ class ZabbixAPIDatasource {
let timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
let useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
let useTrends = (timeFrom <= useTrendsFrom) && this.trends;
let useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
let useTrends = this.trends && (
(timeFrom <= useTrendsFrom) ||
(timeTo - timeFrom >= useTrendsRange)
);
console.log(useTrends);
// Get alerts for current panel
if (this.alertingEnabled) {