瀏覽代碼

interpolate variables in tags & values during autocomplete

Dan Cech 8 年之前
父節點
當前提交
60ba6ee6a2
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      public/app/plugins/datasource/graphite/datasource.ts

+ 4 - 4
public/app/plugins/datasource/graphite/datasource.ts

@@ -286,7 +286,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
 
     let httpOptions: any = {
       method: 'GET',
-      url: '/tags/' + tag,
+      url: '/tags/' + templateSrv.replace(tag),
       // for cancellations
       requestId: options.requestId,
     };
@@ -317,7 +317,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
       method: 'GET',
       url: '/tags/autoComplete/tags',
       params: {
-        expr: expressions,
+        expr: _.map(expressions, expression => templateSrv.replace(expression)),
       },
       // for cancellations
       requestId: options.requestId,
@@ -352,8 +352,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
       method: 'GET',
       url: '/tags/autoComplete/values',
       params: {
-        expr: expressions,
-        tag: tag,
+        expr: _.map(expressions, expression => templateSrv.replace(expression)),
+        tag: templateSrv.replace(tag),
       },
       // for cancellations
       requestId: options.requestId,