IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Closes #54, template/filter can now use "All", when all is not a wildcard but the specific metric segments specified in the filter query.

Browse Source
This commit is contained in:
Torkel Odegaard 2014-02-11 20:58:51 +01:00
parent e574314472
commit a35ed05bc3
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/panels/filtering/module.js
View File

@ -41,8 +41,19 @@ function (angular, app, _) {
filter.options = _.map(results, function(node) { filter.options = _.map(results, function(node) {
return { text: node.text, value: node.text }; return { text: node.text, value: node.text };
}); });
if (filter.includeAll) { if (filter.includeAll) {
filter.options.unshift({text: 'All', value: '*'}); if(endsWithWildcard(filter.query)) {
filter.options.unshift({text: 'All', value: '*'});
}
else {
var allExpr = '{';
_.each(filter.options, function(option) {
allExpr += option.text + ',';
});
allExpr = allExpr.substring(0, allExpr.length - 1) + '}';
filter.options.unshift({text: 'All', value: allExpr});
}
} }
filterSrv.filterOptionSelected(filter, filter.options[0]); filterSrv.filterOptionSelected(filter, filter.options[0]);
@ -66,5 +77,13 @@ function (angular, app, _) {
$rootScope.$broadcast('render'); $rootScope.$broadcast('render');
}; };
function endsWithWildcard(query) {
if (query.length === 0) {
return false;
}
return query[query.length - 1] === '*';
}
}); });
}); });