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

Revert "prometheus nested query support"

Browse Source
This commit is contained in:
Carl Bergquist 2017-11-30 15:06:02 +01:00 committed by GitHub
parent 98f0305e68
commit af5ced0e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,6 @@ export class PrometheusDatasource {
// Only replace vars in expression after having (possibly) updated interval vars // Only replace vars in expression after having (possibly) updated interval vars
query.expr = this.templateSrv.replace(target.expr, scopedVars, this.interpolateQueryExpr); query.expr = this.templateSrv.replace(target.expr, scopedVars, this.interpolateQueryExpr);
query.expr = this.replaceNestedQuery(query.expr, options);
query.requestId = options.panelId + target.refId; query.requestId = options.panelId + target.refId;
return query; return query;
} }
@ -272,13 +271,6 @@ export class PrometheusDatasource {
}); });
} }
replaceNestedQuery(query, options) {
return query.replace(/\#([A-Z])/g, (match, g1) => {
let replaceTarget = options.targets.find((t) => { return t.refId === g1; });
return replaceTarget ? replaceTarget.expr : match;
});
}
transformMetricData(md, options, start, end, step) { transformMetricData(md, options, start, end, step) {
var dps = [], var dps = [],
metricLabel = null; metricLabel = null;

15
public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
View File

@ -590,19 +590,4 @@ describe('PrometheusDatasource', function() {
expect(query.scopedVars.__interval_ms.value).to.be(5 * 1000); expect(query.scopedVars.__interval_ms.value).to.be(5 * 1000);
}); });
}); });
describe('The nested query', function() {
it('should generate correct query', function() {
let query = 'sum(rate(#A[1m]))';
let options = {
targets: [
{
refId: 'A',
expr: 'http_requests_total'
}
]
};
let result = ctx.ds.replaceNestedQuery(query, options);
expect(result).to.be('sum(rate(http_requests_total[1m]))');
});
});
}); });