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

Fix #8 and #10 issues. Remove timeseries reduce (not working properly).

Browse Source
This commit is contained in:
Alexander Zobnin
2015-05-14 23:50:36 +03:00
parent efa6d756be
commit 330d90053f
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zabbix/datasource.js
View File

@@ -39,14 +39,14 @@ function (angular, _, kbn) {
// Need for find target alias // Need for find target alias
var targets = options.targets; var targets = options.targets;
// TODO: remove undefined targets from request // Remove undefined and hidden targets
// Check that all targets defined var displayedTargets = _.filter(targets, function (target) {
var targetsDefined = options.targets.every(function (target, index, array) { return (!target.hide && target.item);
return target.item;
}); });
if (targetsDefined) {
if (displayedTargets.length) {
// 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(displayedTargets, '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();
@@ -75,13 +75,15 @@ function (angular, _, kbn) {
// Index returned datapoints by item/metric id // Index returned datapoints by item/metric id
var indexed_result = _.groupBy(response, 'itemid'); var indexed_result = _.groupBy(response, 'itemid');
// TODO: realize correct timeseries reduce
/*
// Reduce timeseries to the same size for stacking and tooltip work properly // Reduce timeseries to the same size for stacking and tooltip work properly
var min_length = _.min(_.map(indexed_result, function (history) { var min_length = _.min(_.map(indexed_result, function (history) {
return history.length; return history.length;
})); }));
_.each(indexed_result, function (item) { _.each(indexed_result, function (item) {
item.splice(0, item.length - min_length); item.splice(0, item.length - min_length);
}); });*/
// Sort result as the same as targets for display // Sort result as the same as targets for display
// stacked timeseries in proper order // stacked timeseries in proper order
@@ -120,7 +122,7 @@ function (angular, _, kbn) {
// Request data from Zabbix API // Request data from Zabbix API
ZabbixAPIDatasource.prototype.doZabbixAPIRequest = function(request_data) { ZabbixAPIDatasource.prototype.performZabbixAPIRequest = function(request_data) {
var options = { var options = {
method: 'POST', method: 'POST',
headers: { headers: {
@@ -192,7 +194,7 @@ function (angular, _, kbn) {
data.params.time_till = end; data.params.time_till = end;
} }
apiRequests.push(self.doZabbixAPIRequest(data)); apiRequests.push(self.performZabbixAPIRequest(data));
}); });
return this.handleMultipleRequest(apiRequests); return this.handleMultipleRequest(apiRequests);
@@ -265,7 +267,7 @@ function (angular, _, kbn) {
id: 1 id: 1
}; };
return this.doZabbixAPIRequest(data); return this.performZabbixAPIRequest(data);
}; };
@@ -285,7 +287,7 @@ function (angular, _, kbn) {
data.params.groupids = groupid; data.params.groupids = groupid;
} }
return this.doZabbixAPIRequest(data); return this.performZabbixAPIRequest(data);
}; };
@@ -303,7 +305,7 @@ function (angular, _, kbn) {
id: 1 id: 1
}; };
return this.doZabbixAPIRequest(data); return this.performZabbixAPIRequest(data);
}; };
@@ -329,7 +331,7 @@ function (angular, _, kbn) {
data.params.applicationids = applicationid; data.params.applicationids = applicationid;
} }
return this.doZabbixAPIRequest(data); return this.performZabbixAPIRequest(data);
}; };