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

feat(prometheus): added special regex escape for prometheus, fixes #4234

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-03 10:49:30 +01:00
parent e7ef79e0d3
commit 8ed8bfb8bc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -39,13 +39,22 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
return backendSrv.datasourceRequest(options); return backendSrv.datasourceRequest(options);
}; };
function regexEscape(value) {
return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\\\$&');
}
function interpolateQueryExpr(value, variable, defaultFormatFn) { function interpolateQueryExpr(value, variable, defaultFormatFn) {
// if no multi or include all do not regexEscape // if no multi or include all do not regexEscape
if (!variable.multi && !variable.includeAll) { if (!variable.multi && !variable.includeAll) {
return value; return value;
} }
return defaultFormatFn(value, 'regex', variable); if (typeof value === 'string') {
return regexEscape(value);
}
var escapedValues = _.map(value, regexEscape);
return escapedValues.join('|');
}; };
// Called once per panel (graph) // Called once per panel (graph)