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

Merge branch 'cache-service' into grafana-3.0

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-31 21:33:30 +03:00
parent d27d50527c f696760c32
commit c10f10e811
6 changed files with 452 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/datasource-zabbix/datasource.js
View File

@@ -19,7 +19,7 @@ function (angular, _, dateMath, utils, metricFunctions) {
/** @ngInject */
function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv, zabbixHelperSrv,
ZabbixAPI, ZabbixCache, QueryProcessor, DataProcessingService) {
ZabbixAPI, ZabbixCachingProxy, QueryProcessor, DataProcessingService) {
// General data source settings
this.name = instanceSettings.name;
@@ -39,7 +39,7 @@ function (angular, _, dateMath, utils, metricFunctions) {
this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials);
// Initialize cache service
this.zabbixCache = new ZabbixCache(this.zabbixAPI);
this.zabbixCache = new ZabbixCachingProxy(this.zabbixAPI);
// Initialize query builder
this.queryProcessor = new QueryProcessor(this.zabbixCache);
@@ -140,7 +140,7 @@ function (angular, _, dateMath, utils, metricFunctions) {
} else {
// Use history
getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
getHistory = self.zabbixCache.getHistory(items, from, to).then(function(history) {
return self.queryProcessor.handleHistory(history, addHostName);
});
}
@@ -277,8 +277,6 @@ function (angular, _, dateMath, utils, metricFunctions) {
* of metrics in "{metric1,metcic2,...,metricN}" format.
*/
this.metricFindQuery = function (query) {
var metrics;
// Split query. Query structure:
// group.host.app.item
var parts = [];
@@ -296,31 +294,36 @@ function (angular, _, dateMath, utils, metricFunctions) {
// Get items
if (parts.length === 4) {
var items = this.queryProcessor.filterItems(template.host, template.app, true);
metrics = _.map(items, formatMetric);
//var items = this.queryProcessor.filterItems(template.host, template.app, true);
return this.queryProcessor.filterItems(template.host, template.app, true)
.then(function(items) {
return _.map(items, formatMetric);
});
}
// Get applications
else if (parts.length === 3) {
var apps = this.queryProcessor.filterApplications(template.host);
metrics = _.map(apps, formatMetric);
return this.queryProcessor.filterApplications(template.host)
.then(function(apps) {
return _.map(apps, formatMetric);
});
}
// Get hosts
else if (parts.length === 2) {
var hosts = this.queryProcessor.filterHosts(template.group);
metrics = _.map(hosts, formatMetric);
return this.queryProcessor.filterHosts(template.group)
.then(function(hosts) {
return _.map(hosts, formatMetric);
});
}
// Get groups
else if (parts.length === 1) {
metrics = _.map(this.zabbixCache.getGroups(template.group), formatMetric);
return this.zabbixCache.getGroups(template.group).then(function(groups) {
return _.map(groups, formatMetric);
});
}
// Return empty object for invalid request
else {
var d = $q.defer();
d.resolve([]);
return d.promise;
return $q.when([]);
}
return $q.when(metrics);
};
function formatMetric(metricObj) {