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

Merge branch 'develop' into release-2.0.0

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

10
zabbix/datasource.js
View File

@@ -90,7 +90,10 @@ function (angular, _, kbn) {
// Filter hosts by regex // Filter hosts by regex
if (target.host.visible_name === 'All') { if (target.host.visible_name === 'All') {
if (target.hostFilter && _.every(items, _.identity.hosts)) { if (target.hostFilter && _.every(items, _.identity.hosts)) {
var host_pattern = new RegExp(target.hostFilter);
// Use templated variables in filter
var pattern = 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);
@@ -103,7 +106,10 @@ function (angular, _, kbn) {
// Filter items by regex // Filter items by regex
if (target.itemFilter) { if (target.itemFilter) {
var item_pattern = new RegExp(target.itemFilter);
// Use templated variables in filter
var pattern = 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));
}); });