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

fix(elasticsearch): quote variable value in lucene variable mulit format, fixes #2828

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-09-28 11:28:08 +02:00
parent b80dc92ca5
commit a567939f78
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/templating/templateSrv.js
View File

@ -44,7 +44,10 @@ function (angular, _) {
return '(' + value.join('|') + ')'; return '(' + value.join('|') + ')';
} }
case "lucene": { case "lucene": {
return '(' + value.join(' OR ') + ')'; var quotedValues = _.map(value, function(val) {
return '\\\"' + val + '\\\"';
});
return '(' + quotedValues.join(' OR ') + ')';
} }
case "pipe": { case "pipe": {
return value.join('|'); return value.join('|');

5
public/app/features/templating/templateValuesSrv.js
View File

@ -262,7 +262,10 @@ function (angular, _, kbn) {
break; break;
} }
case 'lucene': { case 'lucene': {
allValue = '(' + _.pluck(variable.options, 'text').join(' OR ') + ')'; var quotedValues = _.map(variable.options, function(val) {
return '\\\"' + val.text + '\\\"';
});
allValue = '(' + quotedValues.join(' OR ') + ')';
break; break;
} }
case 'regex values': { case 'regex values': {

2
public/test/specs/templateSrv-specs.js
View File

@ -68,7 +68,7 @@ define([
value: ['test','test2'], value: ['test','test2'],
} }
}); });
expect(result).to.be('(test OR test2)'); expect(result).to.be('(\\\"test\\\" OR \\\"test2\\\")');
}); });
it('multi value and regex format should render regex string', function() { it('multi value and regex format should render regex string', function() {

2
public/test/specs/templateValuesSrv-specs.js
View File

@ -321,7 +321,7 @@ define([
}); });
it('should add lucene glob', function() { it('should add lucene glob', function() {
expect(scenario.variable.options[0].value).to.be('(backend1 OR backend2)'); expect(scenario.variable.options[0].value).to.be('(\\\"backend1\\\" OR \\\"backend2\\\")');
}); });
}); });