Merge pull request #1042 from taosdata/feature/grafana_plugin

Feature/grafana plugin

documentation/webdocs/markdowndocs/Connections with other Tools-ch.md

@@ -58,7 +58,7 @@ TDengine的Grafana插件在安装包的/usr/local/taos/connector/grafana目录
 
 ![img](../assets/add_datasource3.jpg)
 
-* HostTDengine：集群的中任意一台服务器的IP地址与TDengine RESTful接口的端口号(6020)，默认http://localhost:6020。
+* Host： TDengine 集群的中任意一台服务器的 IP 地址与 TDengine RESTful 接口的端口号(6020)，默认 http://localhost:6020。
 * User：TDengine 用户名。
 * Password：TDengine 用户密码。
 
@@ -83,7 +83,7 @@ TDengine的Grafana插件在安装包的/usr/local/taos/connector/grafana目录
 ![img](../assets/create_dashboard2.jpg)
 
 > 关于如何使用Grafana创建相应的监测界面以及更多有关使用Grafana的信息，请参考Grafana官方的[文档](https://grafana.com/docs/)。
-> 
+
 #### 导入 Dashboard
 
 在 Grafana 插件目录 /usr/local/taos/connector/grafana/tdengine/dashboard/ 下提供了一个 `tdengine-grafana.json` 可导入的 dashboard。

src/connector/grafana/tdengine/dist/datasource.js

@@ -71,7 +71,7 @@ var GenericDatasource = exports.GenericDatasource = function () {
       var targets = _lodash2.default.map(options.targets, function (target) {
         return {
           refId: target.refId,
-          alias: target.alias || "",
+          alias: _this.generateAlias(options, target),
           sql: _this.generateSql(options, target)
         };
       });
@@ -112,6 +112,13 @@ var GenericDatasource = exports.GenericDatasource = function () {
 
       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',
     value: function generateSql(options, target) {

src/connector/grafana/tdengine/src/datasource.js

@@ -49,7 +49,7 @@ export class GenericDatasource {
     var targets = _.map(options.targets, target => {
       return {
         refId: target.refId,
-        alias: target.alias || "",
+        alias: this.generateAlias(options, target),
         sql: this.generateSql(options, target)
       };
     });
@@ -89,6 +89,12 @@ export class GenericDatasource {
     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) {
     var sql = target.sql;
     if (sql == null || sql == ""){