Преглед изворни кода

fix variable interpolation

Sven Klemm пре 7 година
родитељ
комит
7104e6f9f8

+ 3 - 0
public/app/plugins/datasource/postgres/postgres_query.ts

@@ -239,6 +239,9 @@ export default class PostgresQuery {
 
 
     query += ' ORDER BY time';
     query += ' ORDER BY time';
 
 
+    if (interpolate) {
+      query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
+    }
     return query;
     return query;
   }
   }
 
 

+ 1 - 1
public/app/plugins/datasource/postgres/query_ctrl.ts

@@ -207,7 +207,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
           segments.unshift(
           segments.unshift(
             this.uiSegmentSrv.newSegment({
             this.uiSegmentSrv.newSegment({
               type: 'template',
               type: 'template',
-              value: '/^$' + variable.name + '$/',
+              value: '$' + variable.name,
               expandable: true,
               expandable: true,
             })
             })
           );
           );