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

Resolved #27 - add item regex filter to query editor.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-19 19:31:22 +03:00
parent 7bc5778697
commit 7ba301e71e
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zabbix/datasource.js
View File

@@ -82,7 +82,16 @@ function (angular, _, kbn) {
return this.itemFindQuery(groups, hosts, apps)
.then(function (items) {
if (itemnames == 'All') {
return items;
// Filter items by regex
if (target.itemFilter) {
var item_pattern = new RegExp(target.itemFilter);
return _.filter(items, function (item) {
return item_pattern.test(expandItemName(item));
});
} else {
return items;
}
} else {
// Filtering items
@@ -99,7 +108,7 @@ function (angular, _, kbn) {
} else {
items = _.flatten(items);
if ((from < useTrendsFrom) && self.trends) {
if ((from < useTrendsFrom) && self.trends) {
return self.getTrends(items, from, to)
.then(_.partial(self.handleTrendResponse, items));
} else {
@@ -288,7 +297,7 @@ function (angular, _, kbn) {
// Handle auth errors
if (response.data.error.data == "Session terminated, re-login, please." ||
response.data.error.data == "Not authorised." ||
response.data.error.data == "Not authorised." ||
response.data.error.data == "Not authorized") {
return self.performZabbixAPILogin().then(function (response) {
self.auth = response;