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

Handle history response in query builder.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-23 22:12:03 +03:00
parent 6b71f42c48
commit fa220cc45a
4 changed files with 233 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
plugins/datasource-zabbix/zabbixAPI.js
View File

@@ -118,12 +118,14 @@ function (angular, _) {
/**
* Perform history query from Zabbix API
*
* @param {Array} items Array of Zabbix item objects
* @param {Number} start Time in seconds
* @param {Number} end Time in seconds
* @return {Array} Array of Zabbix history objects
* @param {Array} items Array of Zabbix item objects
* @param {Number} time_from Time in seconds
* @param {Number} time_till Time in seconds
* @return {Array} Array of Zabbix history objects
*/
p.getHistory = function(items, start, end) {
p.getHistory = function(items, time_from, time_till) {
var self = this;
// Group items by value type
var grouped_items = _.groupBy(items, 'value_type');
@@ -136,30 +138,30 @@ function (angular, _) {
itemids: itemids,
sortfield: 'clock',
sortorder: 'ASC',
time_from: start
time_from: time_from
};
// Relative queries (e.g. last hour) don't include an end time
if (end) {
params.time_till = end;
if (time_till) {
params.time_till = time_till;
}
return this.request('history.get', params);
}, this)).then(function (results) {
return _.flatten(results);
});
return self.request('history.get', params);
})).then(_.flatten);
};
/**
* Perform trends query from Zabbix API
* Use trends api extension from ZBXNEXT-1193 patch.
*
* @param {Array} items Array of Zabbix item objects
* @param {Number} start Time in seconds
* @param {Number} end Time in seconds
* @return {Array} Array of Zabbix trend objects
* @param {Array} items Array of Zabbix item objects
* @param {Number} time_from Time in seconds
* @param {Number} time_till Time in seconds
* @return {Array} Array of Zabbix trend objects
*/
p.getTrends = function(items, start, end) {
p.getTrends = function(items, time_from, time_till) {
var self = this;
// Group items by value type
var grouped_items = _.groupBy(items, 'value_type');
@@ -172,18 +174,16 @@ function (angular, _) {
itemids: itemids,
sortfield: 'clock',
sortorder: 'ASC',
time_from: start
time_from: time_from
};
// Relative queries (e.g. last hour) don't include an end time
if (end) {
params.time_till = end;
if (time_till) {
params.time_till = time_till;
}
return this.request('trend.get', params);
}, this)).then(function (results) {
return _.flatten(results);
});
return self.request('trend.get', params);
})).then(_.flatten);
};
p.getITService = function(/* optional */ serviceids) {