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(prometheus): fixed templating issue with prometheus for when using variable with non regex operator, #2918

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-01 21:35:55 +01:00
parent df67d57bca
commit 0da4168836
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,11 @@ function (angular, _) {
return value.replace(/([\!\*\+\-\=<>\s\&\|\(\)\[\]\{\}\^\~\?\:\\/"])/g, "\\$1");
}
this.formatValue = function(value, format) {
this.formatValue = function(value, format, variable) {
if (typeof format === 'function') {
return format(value, variable, this.formatValue);
}
switch(format) {
case "regex": {
if (typeof value === 'string') {
@ -121,21 +125,21 @@ function (angular, _) {
this._regex.lastIndex = 0;
return target.replace(this._regex, function(match, g1, g2) {
if (scopedVars) {
value = scopedVars[g1 || g2];
if (value) {
return self.formatValue(value.value);
}
}
variable = self._index[g1 || g2];
if (!variable) {
return match;
}
if (scopedVars) {
value = scopedVars[g1 || g2];
if (value) {
return self.formatValue(value.value, format, variable);
}
}
systemValue = self._grafanaVariables[variable.current.value];
if (systemValue) {
return self.formatValue(systemValue);
return self.formatValue(systemValue, format, variable);
}
value = variable.current.value;
@ -143,7 +147,7 @@ function (angular, _) {
value = self.getAllValue(variable);
}
var res = self.formatValue(value, format);
var res = self.formatValue(value, format, variable);
return res;
});
};

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

@ -39,6 +39,15 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
return backendSrv.datasourceRequest(options);
};
function interpolateQueryExpr(value, variable, defaultFormatFn) {
// if no multi or include all do not regexEscape
if (!variable.multi && !variable.includeAll) {
return value;
}
return defaultFormatFn(value, 'regex', variable);
};
// Called once per panel (graph)
this.query = function(options) {
var start = getPrometheusTime(options.range.from, false);
@ -52,7 +61,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
}
var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars, 'regex');
query.expr = templateSrv.replace(target.expr, options.scopedVars, interpolateQueryExpr);
var interval = target.interval || options.interval;
var intervalFactor = target.intervalFactor || 1;