openstack
/
monasca-grafana-datasource
Code Issues Proposed changes

Fix templated query expansion 

The regex method of doing replace all doesn't work when the string
uses reserved characters.

Change-Id: Ib484b8bc0ab159a12e5b80303f9d7f6084169c94
This commit is contained in:
Ryan Bak 2016-10-10 11:33:35 -06:00
parent 8423bf714e
commit 1381a694b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
datasource.js
View File

@ -191,7 +191,7 @@ function (angular, _, moment, sdk, dateMath, kbn) {
var var_options = to_replace.substring(1, to_replace.length - 1);
var_options = var_options.split(',');
for (var i = 0; i < var_options.length; i++) {
var new_query = query.replace(new RegExp(to_replace, 'g'), var_options[i]);
var new_query = query.split(to_replace).join(var_options[i]);
expandedQueries = expandedQueries.concat(this.expandTemplatedQueries(new_query));
}
return expandedQueries;