xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add template variable support for query alias

This commit is contained in:
xieyinglin 2019-12-23 14:49:54 +08:00
parent 8beea96f29
commit 5b7f679618
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/connector/grafana/tdengine/dist/datasource.js vendored
View File

@ -71,7 +71,7 @@ var GenericDatasource = exports.GenericDatasource = function () {
var targets = _lodash2.default.map(options.targets, function (target) { var targets = _lodash2.default.map(options.targets, function (target) {
return { return {
refId: target.refId, refId: target.refId,
alias: target.alias || "", alias: _this.generateAlias(options, target),
sql: _this.generateSql(options, target) sql: _this.generateSql(options, target)
}; };
}); });
@ -112,6 +112,13 @@ var GenericDatasource = exports.GenericDatasource = function () {
return "Basic " + this.encode(defaultUser + ":" + defaultPassword); return "Basic " + this.encode(defaultUser + ":" + defaultPassword);
} }
}, {
key: 'generateAlias',
value: function generateAlias(options, target) {
var alias = target.alias || "";
alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');
return alias;
}
}, { }, {
key: 'generateSql', key: 'generateSql',
value: function generateSql(options, target) { value: function generateSql(options, target) {

2
src/connector/grafana/tdengine/dist/datasource.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
src/connector/grafana/tdengine/src/datasource.js
View File

@ -49,7 +49,7 @@ export class GenericDatasource {
var targets = _.map(options.targets, target => { var targets = _.map(options.targets, target => {
return { return {
refId: target.refId, refId: target.refId,
alias: target.alias || "", alias: this.generateAlias(options, target),
sql: this.generateSql(options, target) sql: this.generateSql(options, target)
}; };
}); });
@ -89,6 +89,12 @@ export class GenericDatasource {
return "Basic " + this.encode(defaultUser + ":" + defaultPassword); return "Basic " + this.encode(defaultUser + ":" + defaultPassword);
} }
generateAlias(options, target){
var alias = target.alias || "";
alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');
return alias;
}
generateSql(options, target) { generateSql(options, target) {
var sql = target.sql; var sql = target.sql;
if (sql == null || sql == ""){ if (sql == null || sql == ""){