Some refactoring.
This commit is contained in:
@@ -35,6 +35,7 @@ function (angular, _, kbn) {
|
|||||||
// get from & to in seconds
|
// get from & to in seconds
|
||||||
var from = kbn.parseDate(options.range.from).getTime();
|
var from = kbn.parseDate(options.range.from).getTime();
|
||||||
var to = kbn.parseDate(options.range.to).getTime();
|
var to = kbn.parseDate(options.range.to).getTime();
|
||||||
|
|
||||||
// Need for find target alias
|
// Need for find target alias
|
||||||
var targets = options.targets;
|
var targets = options.targets;
|
||||||
|
|
||||||
@@ -46,7 +47,6 @@ function (angular, _, kbn) {
|
|||||||
// Extract zabbix api item objects from targets
|
// Extract zabbix api item objects from targets
|
||||||
var target_items = _.map(options.targets, 'item');
|
var target_items = _.map(options.targets, 'item');
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// No valid targets, return the empty dataset
|
// No valid targets, return the empty dataset
|
||||||
var d = $q.defer();
|
var d = $q.defer();
|
||||||
d.resolve({ data: [] });
|
d.resolve({ data: [] });
|
||||||
@@ -56,11 +56,7 @@ function (angular, _, kbn) {
|
|||||||
from = Math.ceil(from/1000);
|
from = Math.ceil(from/1000);
|
||||||
to = Math.ceil(to/1000);
|
to = Math.ceil(to/1000);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return this.performTimeSeriesQuery(target_items, from, to).then(function (response) {
|
return this.performTimeSeriesQuery(target_items, from, to).then(function (response) {
|
||||||
|
|
||||||
console.log(response);
|
|
||||||
/**
|
/**
|
||||||
* Response should be in the format:
|
* Response should be in the format:
|
||||||
* data: [
|
* data: [
|
||||||
@@ -165,26 +161,27 @@ function (angular, _, kbn) {
|
|||||||
var item_ids = items.map(function (item, index, array) {
|
var item_ids = items.map(function (item, index, array) {
|
||||||
return item.itemid;
|
return item.itemid;
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO: if different value types passed?
|
// TODO: if different value types passed?
|
||||||
// Perform multiple api request.
|
// Perform multiple api request.
|
||||||
var hystory_type = items[0].value_type;
|
var history_type = items[0].value_type;
|
||||||
|
|
||||||
var data = {
|
var data = {
|
||||||
jsonrpc: '2.0',
|
jsonrpc: '2.0',
|
||||||
method: 'history.get',
|
method: 'history.get',
|
||||||
params: {
|
params: {
|
||||||
output: 'extend',
|
output: 'extend',
|
||||||
history: hystory_type,
|
history: history_type,
|
||||||
itemids: item_ids,
|
itemids: item_ids,
|
||||||
sortfield: 'clock',
|
sortfield: 'clock',
|
||||||
sortorder: 'ASC',
|
sortorder: 'ASC',
|
||||||
limit: this.limitmetrics,
|
limit: this.limitmetrics,
|
||||||
time_from: start,
|
time_from: start,
|
||||||
},
|
},
|
||||||
auth: this.auth,
|
auth: this.auth,
|
||||||
id: 1
|
id: 1
|
||||||
};
|
};
|
||||||
|
|
||||||
// Relative queries (e.g. last hour) don't include an end time
|
// Relative queries (e.g. last hour) don't include an end time
|
||||||
if (end) {
|
if (end) {
|
||||||
data.params.time_till = end;
|
data.params.time_till = end;
|
||||||
|
|||||||
Reference in New Issue
Block a user