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

Merge branch 'master' into alert_prometheus

Browse Source
This commit is contained in:
bergquist
2016-09-22 19:27:24 +02:00
parent b856d7e193 a49c21df3a
commit d711c0ed35
329 changed files with 5738 additions and 13256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
return backendSrv.datasourceRequest(options);
};
function regexEscape(value) {
function prometheusSpecialRegexEscape(value) {
return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\\\$&');
}
@@ -51,10 +51,10 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
}
if (typeof value === 'string') {
return regexEscape(value);
return prometheusSpecialRegexEscape(value);
}
var escapedValues = _.map(value, regexEscape);
var escapedValues = _.map(value, prometheusSpecialRegexEscape);
return escapedValues.join('|');
};