Some refactoring.

This commit is contained in:
Alexander Zobnin
2015-05-08 22:13:52 +03:00
parent 594d74bf3e
commit 4b44329230

View File

@@ -35,6 +35,7 @@ function (angular, _, kbn) {
// get from & to in seconds
var from = kbn.parseDate(options.range.from).getTime();
var to = kbn.parseDate(options.range.to).getTime();
// Need for find target alias
var targets = options.targets;
@@ -46,7 +47,6 @@ function (angular, _, kbn) {
// Extract zabbix api item objects from targets
var target_items = _.map(options.targets, 'item');
} else {
// No valid targets, return the empty dataset
var d = $q.defer();
d.resolve({ data: [] });
@@ -56,11 +56,7 @@ function (angular, _, kbn) {
from = Math.ceil(from/1000);
to = Math.ceil(to/1000);
return this.performTimeSeriesQuery(target_items, from, to).then(function (response) {
console.log(response);
/**
* Response should be in the format:
* data: [
@@ -165,16 +161,17 @@ function (angular, _, kbn) {
var item_ids = items.map(function (item, index, array) {
return item.itemid;
});
// TODO: if different value types passed?
// Perform multiple api request.
var hystory_type = items[0].value_type;
var history_type = items[0].value_type;
var data = {
jsonrpc: '2.0',
method: 'history.get',
params: {
output: 'extend',
history: hystory_type,
history: history_type,
itemids: item_ids,
sortfield: 'clock',
sortorder: 'ASC',