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

Merge branch 'develop-1.9' into develop

Browse Source 
Conflicts:
	.gitignore
	zabbix/datasource.js
	zabbix/partials/query.editor.html
	zabbix/queryCtrl.js
This commit is contained in:
Alexander Zobnin
2015-05-16 18:29:54 +03:00
parent 69d781e698 2b2f997933
commit b9ee409dc4
3 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
zabbix/datasource.js
View File

@@ -39,14 +39,14 @@ function (angular, _, kbn) {
// Need for find target alias
var targets = options.targets;
// TODO: remove undefined targets from request
// Check that all targets defined
var targetsDefined = options.targets.every(function (target, index, array) {
return target.item;
// Remove undefined and hidden targets
var displayedTargets = _.filter(targets, function (target) {
return (!target.hide && target.item);
});
if (targetsDefined) {
if (displayedTargets.length) {
// Extract zabbix api item objects from targets
var target_items = _.map(options.targets, 'item');
var target_items = _.map(displayedTargets, 'item');
} else {
// No valid targets, return the empty dataset
var d = $q.defer();
@@ -75,13 +75,15 @@ function (angular, _, kbn) {
// Index returned datapoints by item/metric id
var indexed_result = _.groupBy(response, 'itemid');
// TODO: realize correct timeseries reduce
/*
// Reduce timeseries to the same size for stacking and tooltip work properly
var min_length = _.min(_.map(indexed_result, function (history) {
return history.length;
}));
_.each(indexed_result, function (item) {
item.splice(0, item.length - min_length);
});
});*/
// Sort result as the same as targets for display
// stacked timeseries in proper order
@@ -120,7 +122,7 @@ function (angular, _, kbn) {
// Request data from Zabbix API
ZabbixAPIDatasource.prototype.doZabbixAPIRequest = function(request_data) {
ZabbixAPIDatasource.prototype.performZabbixAPIRequest = function(request_data) {
var options = {
method: 'POST',
headers: {
@@ -180,7 +182,7 @@ function (angular, _, kbn) {
itemids: item_ids,
sortfield: 'clock',
sortorder: 'ASC',
limit: self.limitMetrics,
limit: self.limitmetrics,
time_from: start,
},
auth: self.auth,
@@ -192,7 +194,7 @@ function (angular, _, kbn) {
data.params.time_till = end;
}
apiRequests.push(self.doZabbixAPIRequest(data));
apiRequests.push(self.performZabbixAPIRequest(data));
});
return this.handleMultipleRequest(apiRequests);
@@ -265,7 +267,7 @@ function (angular, _, kbn) {
id: 1
};
return this.doZabbixAPIRequest(data);
return this.performZabbixAPIRequest(data);
};
@@ -285,7 +287,7 @@ function (angular, _, kbn) {
data.params.groupids = groupid;
}
return this.doZabbixAPIRequest(data);
return this.performZabbixAPIRequest(data);
};
@@ -303,7 +305,7 @@ function (angular, _, kbn) {
id: 1
};
return this.doZabbixAPIRequest(data);
return this.performZabbixAPIRequest(data);
};
@@ -329,7 +331,7 @@ function (angular, _, kbn) {
data.params.applicationids = applicationid;
}
return this.doZabbixAPIRequest(data);
return this.performZabbixAPIRequest(data);
};
@@ -349,7 +351,7 @@ function (angular, _, kbn) {
params: {
output: ['triggerid', 'description'],
itemids: annotation.aids.split(','), // TODO: validate / pull automatically from dashboard.
limit: self.limitMetrics,
limit: self.limitmetrics,
},
auth: self.auth,
id: 1
@@ -372,7 +374,7 @@ function (angular, _, kbn) {
time_from: from,
time_till: to,
objectids: _.keys(obs),
limit: self.limitMetrics,
limit: self.limitmetrics,
},
auth: self.auth,
id: 1