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

Fixed text metric query.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-02-01 15:42:50 +03:00
parent 5ead2950b8
commit 2b91f417f4
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,12 +193,9 @@ function (angular, _, dateMath, utils, metricFunctions) {
else if (target.mode === 2) { else if (target.mode === 2) {
// Find items by item names and perform queries // Find items by item names and perform queries
return this.zabbixAPI.itemFindQuery(groups, hosts, apps, "text") return self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter)
.then(function (items) { .then(function(items) {
items = _.filter(items, function (item) { return self.zabbixCache.getHistory(items, from, to).then(function(history) {
return _.contains(itemnames, zabbixHelperSrv.expandItemName(item));
});
return self.zabbixAPI.getHistory(items, from, to).then(function(history) {
return { return {
target: target.item.name, target: target.item.name,
datapoints: _.map(history, function (p) { datapoints: _.map(history, function (p) {