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

improve handling of query references

Browse Source
This commit is contained in:
Dan Cech
2017-12-09 16:27:05 -05:00
parent 4fcf79a3a6
commit 3a1700cbee
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/plugins/datasource/graphite/graphite_query.ts
View File

@@ -91,27 +91,25 @@ export default class GraphiteQuery {
this.functions.push(innerFunc);
break;
case 'series-ref':
this.addFunctionParameter(func, astNode.value, index, this.segments.length > 0);
if (this.segments.length > 0) {
this.addFunctionParameter(func, astNode.value, index, true);
} else {
this.segments.push(astNode);
}
break;
case 'bool':
case 'string':
case 'number':
if ((index-1) >= func.def.params.length) {
throw { message: 'invalid number of parameters to method ' + func.def.name };
}
var shiftBack = this.isShiftParamsBack(func);
this.addFunctionParameter(func, astNode.value, index, shiftBack);
break;
break;
case 'metric':
if (this.segments.length > 0) {
if (astNode.segments.length !== 1) {
throw { message: 'Multiple metric params not supported, use text editor.' };
this.addFunctionParameter(func, _.join(_.map(astNode.segments, 'value'), '.'), index, true);
} else {
this.segments = astNode.segments;
}
this.addFunctionParameter(func, astNode.segments[0].value, index, true);
break;
}
this.segments = astNode.segments;
}
}
@@ -149,6 +147,9 @@ export default class GraphiteQuery {
if (shiftBack) {
index = Math.max(index - 1, 0);
}
if (index > func.def.params.length) {
throw { message: 'too many parameters for function ' + func.def.name };
}
func.params[index] = value;
}