From 5fbab038e8bfeb7a7a56aebed1c61a264b0ad59d Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 19 Oct 2016 13:14:42 +0200
Subject: [PATCH] fix(opentsdb): can always return false

---
 public/app/plugins/datasource/opentsdb/datasource.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index eb2f88f8067..d5034ce271f 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -103,24 +103,23 @@ function (angular, _, dateMath) {
     };
 
     this.targetContainsTemplate = function(target) {
-      // Checking for template variables in filters
-      if (target.filters.length > 0) {
+      if (target.filters && target.filters.length > 0) {
         for (var i = 0; i < target.filters.length; i++) {
           if (templateSrv.variableExists(target.filters[i].filter)) {
             return true;
           }
         }
       }
-      // Checking for template variables in tags
-      else if (Object.keys(target.tags).length > 0) {
+
+      if (target.tags && Object.keys(target.tags).length > 0) {
         for (var tagKey in target.tags) {
           if (templateSrv.variableExists(target.tags[tagKey])) {
             return true;
           }
         }
-      } else {
-        return false;
       }
+
+      return false;
     };
 
     this.performTimeSeriesQuery = function(queries, start, end) {