Merge pull request #872 from hessu/aggregator-less-greedy

Fix #871: Adjust aggregator-rules input_pattern match greediness

Author: piotr1212

lib/carbon/aggregator/rules.py

@@ -128,7 +128,7 @@ def build_regex(self):
         pre = input_part[:i]
         post = input_part[j + 2:]
         field_name = input_part[i + 2:j]
-        regex_part = '%s(?P<%s>.+)%s' % (pre, field_name, post)
+        regex_part = '%s(?P<%s>.+?)%s' % (pre, field_name, post)
 
       else:
         i = input_part.find('<')
@@ -137,7 +137,7 @@ def build_regex(self):
           pre = input_part[:i]
           post = input_part[j + 1:]
           field_name = input_part[i + 1:j]
-          regex_part = '%s(?P<%s>[^.]+)%s' % (pre, field_name, post)
+          regex_part = '%s(?P<%s>[^.]+?)%s' % (pre, field_name, post)
         elif input_part == '*':
           regex_part = '[^.]+'
         else: