Merge pull request prometheus#932 from paystee/fix-label-matching

Fix label matching in routing tree editor

Author: Conor Broderick

static/routing-tree.js

@@ -115,7 +115,10 @@ function matchLabels(matchers, labelSet) {
 
 // Compare single matcher to labelSet
 function matchLabel(matcher, labelSet) {
-  var v = labelSet[matcher.name];
+  var v = "";
+  if (matcher.name in labelSet) {
+    v = labelSet[matcher.name];
+  }
 
   if (matcher.isRegex) {
     return matcher.value.test(v)
@@ -156,7 +159,7 @@ function massage(root) {
     for (var key in root.match_re) {
       var o = {};
       o.isRegex = true;
-      o.value = new RegExp(root.match_re[key]);
+      o.value = new RegExp("^(?:" + root.match_re[key] + ")$");
       o.name = key;
       matchers.push(o);
     }