fix variable interpolation

2018-03-03 22:11:51 +01:00
parent fd518846b1
commit 7104e6f9f8
2 changed files with 4 additions and 1 deletions
@@ -239,6 +239,9 @@ export default class PostgresQuery {

    query += ' ORDER BY time';

+    if (interpolate) {
+      query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
+    }
    return query;
  }

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