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

support metric trees of varying depth, never send '.select metric' to graphite

Browse Source
This commit is contained in:
Dan Cech 2017-12-10 10:46:31 -05:00
parent 8dcfa18761
commit 525ae4fdf5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ export default class GraphiteQuery {
updateModelTarget(targets) {
// render query
if (!this.target.textEditor) {
var metricPath = this.getSegmentPathUpTo(this.segments.length);
var metricPath = this.getSegmentPathUpTo(this.segments.length).replace(/\.select metric$/, '');
this.target.target = _.reduce(this.functions, wrapFunction, metricPath);
}

5
public/app/plugins/datasource/graphite/query_ctrl.ts
View File

@ -219,10 +219,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
this.updateModelTarget();
if (this.queryModel.target !== oldTarget) {
var lastSegment = this.segments.length > 0 ? this.segments[this.segments.length - 1] : {};
if (lastSegment.value !== 'select metric') {
this.panelCtrl.refresh();
}
this.panelCtrl.refresh();
}
}