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

iss #36 - Some refactoring.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-07-11 17:53:00 +03:00
parent a671b84696
commit d716c266ba
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zabbix/datasource.js
View File

@@ -92,8 +92,7 @@ function (angular, _, kbn) {
if (target.hostFilter && _.every(items, _.identity.hosts)) { if (target.hostFilter && _.every(items, _.identity.hosts)) {
// Use templated variables in filter // Use templated variables in filter
var pattern = templateSrv.replace(target.hostFilter); var host_pattern = new RegExp(templateSrv.replace(target.hostFilter));
var host_pattern = new RegExp(pattern);
items = _.filter(items, function (item) { items = _.filter(items, function (item) {
return _.some(item.hosts, function (host) { return _.some(item.hosts, function (host) {
return host_pattern.test(host.name); return host_pattern.test(host.name);
@@ -108,8 +107,7 @@ function (angular, _, kbn) {
if (target.itemFilter) { if (target.itemFilter) {
// Use templated variables in filter // Use templated variables in filter
var pattern = templateSrv.replace(target.itemFilter); var item_pattern = new RegExp(templateSrv.replace(target.itemFilter));
var item_pattern = new RegExp(pattern);
return _.filter(items, function (item) { return _.filter(items, function (item) {
return item_pattern.test(zabbixHelperSrv.expandItemName(item)); return item_pattern.test(zabbixHelperSrv.expandItemName(item));
}); });