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

Fixed building request for text metrics.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-04-12 14:29:12 +03:00
parent 4ddfc4becf
commit e210150c82
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/datasource-zabbix/datasource.js
View File

@@ -207,7 +207,7 @@ export class ZabbixAPIDatasource {
// Query text data // Query text data
else if (target.mode === 2) { else if (target.mode === 2) {
return self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter) return self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter, 'text')
.then(function(items) { .then(function(items) {
var deferred = self.q.defer(); var deferred = self.q.defer();
if (items.length) { if (items.length) {

16
src/datasource-zabbix/queryProcessor.service.js
View File

@@ -14,13 +14,13 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
/** /**
* Build query in asynchronous manner * Build query in asynchronous manner
*/ */
build(groupFilter, hostFilter, appFilter, itemFilter) { build(groupFilter, hostFilter, appFilter, itemFilter, itemtype) {
var self = this; var self = this;
if (this.cache._initialized) { if (this.cache._initialized) {
return this.$q.when(self.buildFromCache(groupFilter, hostFilter, appFilter, itemFilter)); return this.$q.when(self.buildFromCache(groupFilter, hostFilter, appFilter, itemFilter, itemtype));
} else { } else {
return this.cache.refresh().then(function() { return this.cache.refresh().then(function() {
return self.buildFromCache(groupFilter, hostFilter, appFilter, itemFilter); return self.buildFromCache(groupFilter, hostFilter, appFilter, itemFilter, itemtype);
}); });
} }
} }
@@ -64,8 +64,8 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
/** /**
* Build query - convert target filters to array of Zabbix items * Build query - convert target filters to array of Zabbix items
*/ */
buildFromCache(groupFilter, hostFilter, appFilter, itemFilter, showDisabledItems) { buildFromCache(groupFilter, hostFilter, appFilter, itemFilter, itemtype, showDisabledItems) {
return this.getItems(groupFilter, hostFilter, appFilter, showDisabledItems) return this.getItems(groupFilter, hostFilter, appFilter, itemtype, showDisabledItems)
.then(items => { .then(items => {
return getByFilter(items, itemFilter); return getByFilter(items, itemFilter);
}); });
@@ -108,7 +108,7 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
}); });
} }
getItems(groupFilter, hostFilter, appFilter, showDisabledItems) { getItems(groupFilter, hostFilter, appFilter, itemtype, showDisabledItems) {
var self = this; var self = this;
return this.getHosts(groupFilter) return this.getHosts(groupFilter)
.then(hosts => { .then(hosts => {
@@ -133,7 +133,7 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
.then(apps => { .then(apps => {
if (apps.appFilterEmpty) { if (apps.appFilterEmpty) {
return self.cache return self.cache
.getItems(apps.hostids, undefined) .getItems(apps.hostids, undefined, itemtype)
.then(items => { .then(items => {
if (showDisabledItems) { if (showDisabledItems) {
items = _.filter(items, {'status': '0'}); items = _.filter(items, {'status': '0'});
@@ -143,7 +143,7 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
} else { } else {
var appids = _.map(apps, 'applicationid'); var appids = _.map(apps, 'applicationid');
return self.cache return self.cache
.getItems(undefined, appids) .getItems(undefined, appids, itemtype)
.then(items => { .then(items => {
if (showDisabledItems) { if (showDisabledItems) {
items = _.filter(items, {'status': '0'}); items = _.filter(items, {'status': '0'});

4
src/datasource-zabbix/zabbixCache.service.js
View File

@@ -102,9 +102,9 @@ angular.module('grafana.services').factory('ZabbixCachingProxy', function($q, $i
}); });
} }
getItems(hostids, appids) { getItems(hostids, appids, itemtype) {
var self = this; var self = this;
return this.getItemsOnce(hostids, appids) return this.getItemsOnce(hostids, appids, itemtype)
.then(items => { .then(items => {
self._items = _.union(self._items, items); self._items = _.union(self._items, items);
return items; return items;