From 262c341bdc7f9e6a6697ae7feb8b13c6269cfc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 9 Apr 2016 13:09:03 -0400 Subject: [PATCH] fix(influxdb): fixed annotation queries containting template variables, fixes #4602 --- CHANGELOG.md | 1 + public/app/plugins/datasource/influxdb/datasource.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1db5ad21057..941245a83f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ * **Graph Panel**: Fixed legend option max not updating, fixes [#4601](https://github.com/grafana/grafana/issues/4601) * **Graph Panel**: Fixed issue where newly added graph panels shared same axes config, fixes [#4582](https://github.com/grafana/grafana/issues/4582) * **Graph Panel**: Fixed issue with axis labels overlapping Y-axis, fixes [#4626](https://github.com/grafana/grafana/issues/4626) +* **InfluxDB**: Fixed issue with templating query containing template variable, fixes [#4602](https://github.com/grafana/grafana/issues/4602) # 3.0.0-beta2 (2016-04-04) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index f63716e5dd6..4037e963bcb 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -107,7 +107,7 @@ export default class InfluxDatasource { var timeFilter = this.getTimeFilter({rangeRaw: options.rangeRaw}); var query = options.annotation.query.replace('$timeFilter', timeFilter); - query = this.templateSrv.replace(query); + query = this.templateSrv.replace(query, null, 'regex'); return this._seriesQuery(query).then(data => { if (!data || !data.results || !data.results[0]) {