fix(templating): fixed detection of nested template variables, fixes #5103

public/app/features/templating/templateSrv.js

@@ -97,8 +97,11 @@ function (angular, _) {
       if (!str) {
       if (!str) {
         return false;
         return false;
       }
       }
-      var match = this._regex.exec(str);
-      return match && (match[1] === variableName || match[2] === variableName);
+
+      variableName = regexEscape(variableName);
+      var findVarRegex = new RegExp('\\$(' + variableName + ')[\\W|$]|\\[\\[(' + variableName + ')\\]\\]', 'g');
+      var match = findVarRegex.exec(str);
+      return match !== null;
     };
     };
 
 
     this.highlightVariablesAsHtml = function(str) {
     this.highlightVariablesAsHtml = function(str) {

public/test/specs/templateSrv-specs.js

@@ -200,6 +200,11 @@ define([
         expect(contains).to.be(true);
         expect(contains).to.be(true);
       });
       });
 
 
+      it('should find it when part of segment', function() {
+        var contains = _templateSrv.containsVariable('metrics.$env.$group-*', 'group');
+        expect(contains).to.be(true);
+      });
+
     });
     });
 
 
     describe('updateTemplateData with simple value', function() {
     describe('updateTemplateData with simple value', function() {