From f28af4f36967f90c95f463437c5ef926de0667b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 7 Apr 2015 21:47:06 +0200
Subject: [PATCH] OpenTSDB: another improvement to OpenTSDB query -> query
 result matching

---
 public/app/plugins/datasource/opentsdb/datasource.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index ddd441b6c3d..936500be0f0 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -180,11 +180,13 @@ function (angular, _, kbn) {
     }
 
     function mapMetricsToTargets(metrics, targets) {
+      var interpolatedTagValue;
       return _.map(metrics, function(metricData) {
         return _.findIndex(targets, function(target) {
           return target.metric === metricData.metric &&
             _.all(target.tags, function(tagV, tagK) {
-            return metricData.tags[tagK] === tagV || tagV === "*";
+            interpolatedTagValue = templateSrv.replace(tagV);
+            return metricData.tags[tagK] === interpolatedTagValue || interpolatedTagValue === "*";
           });
         });
       });