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

torkelo · torkelo · commit a567939f78e7 · 2015-09-28T11:28:08.000+02:00
diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js
@@ -44,7 +44,10 @@ function (angular, _) {
             return '(' + value.join('|') + ')';
           }
           case "lucene": {
-            return '(' + value.join(' OR ') + ')';
+            var quotedValues = _.map(value, function(val) {
+              return '\\\"' + val + '\\\"';
+            });
+            return '(' + quotedValues.join(' OR ') + ')';
           }
           case "pipe": {
             return value.join('|');
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
@@ -262,7 +262,10 @@ function (angular, _, kbn) {
           break;
         }
         case 'lucene': {
-          allValue = '(' + _.pluck(variable.options, 'text').join(' OR ') + ')';
+          var quotedValues = _.map(variable.options, function(val) {
+            return '\\\"' + val.text + '\\\"';
+          });
+          allValue = '(' + quotedValues.join(' OR ') + ')';
           break;
         }
         case 'regex values': {
diff --git a/public/test/specs/templateSrv-specs.js b/public/test/specs/templateSrv-specs.js
@@ -68,7 +68,7 @@ define([
             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() {
diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js
@@ -321,7 +321,7 @@ define([
       });
 
       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\\\")');
       });
     });
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,10 @@ function (angular, _) {`
`44`	`44`	`return '(' + value.join('\|') + ')';`
`45`	`45`	`}`
`46`	`46`	`case "lucene": {`
`47`		`- return '(' + value.join(' OR ') + ')';`
	`47`	`+ var quotedValues = _.map(value, function(val) {`
	`48`	`+ return '\\\"' + val + '\\\"';`
	`49`	`+ });`
	`50`	`+ return '(' + quotedValues.join(' OR ') + ')';`
`48`	`51`	`}`
`49`	`52`	`case "pipe": {`
`50`	`53`	`return value.join('\|');`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,10 @@ function (angular, _, kbn) {`
`262`	`262`	`break;`
`263`	`263`	`}`
`264`	`264`	`case 'lucene': {`
`265`		`- allValue = '(' + _.pluck(variable.options, 'text').join(' OR ') + ')';`
	`265`	`+ var quotedValues = _.map(variable.options, function(val) {`
	`266`	`+ return '\\\"' + val.text + '\\\"';`
	`267`	`+ });`
	`268`	`+ allValue = '(' + quotedValues.join(' OR ') + ')';`
`266`	`269`	`break;`
`267`	`270`	`}`
`268`	`271`	`case 'regex values': {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ define([`
`68`	`68`	`value: ['test','test2'],`
`69`	`69`	`}`
`70`	`70`	`});`
`71`		`- expect(result).to.be('(test OR test2)');`
	`71`	`+ expect(result).to.be('(\\\"test\\\" OR \\\"test2\\\")');`
`72`	`72`	`});`
`73`	`73`
`74`	`74`	`it('multi value and regex format should render regex string', function() {`