custom patterns, more tolerant to empty values.

Author: SandStormHoldings

rma/application.py

@@ -13,6 +13,26 @@
 from collections import defaultdict
 from redis.exceptions import ResponseError
 
+def ptransform(nm):
+    if nm.startswith('celery-task-meta'):
+        spl = nm.split('-')
+        rt = '-'.join(spl[0:3])+':'+'-'.join(spl[3:])
+    elif nm.startswith('qo_cli.aff_aggregations.aggregate_aff_aname_aname'):
+        spl = nm.split('-')
+        rt = '-'.join(spl[0:1])+':'+'-'.join(spl[1:])
+    elif nm.endswith('_trigger_queue_user_job'):
+        spl = nm.split('_')
+        rt = '_'.join(spl[1:])+':'+'_'.join(spl[0:1])
+    elif nm.endswith('.reply.celery.pidbox'):
+        spl = nm.split('.')
+        rt = '.'.join(spl[1:])+':'+spl[0]
+    elif nm.endswith('_user_queue_user_job'):
+        spl = nm.split('_')
+        rt = '_'.join(spl[1:])+':'+spl[0]
+    else:
+        rt = nm
+    return rt
+
 
 def connect_to_redis(host, port, db=0, password=None):
     """
@@ -152,14 +172,15 @@ def do_ram(self, res):
                     total_keys = sum(len(values) for key, values in aggregate_patterns.items())
                     ret += (rule.analyze(keys=aggregate_patterns, total=total_keys))
 
+
         return ret
 
     def get_pattern_aggregated_data(self, data):
-        split_patterns = self.splitter.split((obj["name"] for obj in data))
+        split_patterns = self.splitter.split((ptransform(obj["name"]) for obj in data))
         self.logger.debug(split_patterns)
 
         aggregate_patterns = {item: [] for item in split_patterns}
         for pattern in split_patterns:
-            aggregate_patterns[pattern] = list(filter(lambda obj: fnmatch.fnmatch(obj["name"], pattern), data))
+            aggregate_patterns[pattern] = list(filter(lambda obj: fnmatch.fnmatch(ptransform(obj["name"]), pattern), data))
 
         return aggregate_patterns

rma/rule/Hash.py

@@ -40,10 +40,25 @@ def __init__(self, info, redis):
             raise Exception('Panic', 'Unknown encoding %s in %s' % (self.encoding, key_name))
 
         self.valueUsedBytes = sum(m)
-        self.fieldMin = min(args2)
-        self.fieldMax = max(args3)
-        self.valueMin = min(m2)
-        self.valueMax = max(m3)
+
+        try:
+            self.fieldMin = min(args2)
+        except ValueError:
+            self.fieldMin = None
+            pass
+        try:
+            self.fieldMax = max(args3)
+        except ValueError:
+            self.fieldMax = None
+            pass
+        try:
+            self.valueMin = min(m2)
+        except ValueError:
+            self.valueMin = None
+        try:
+            self.valueMax = max(m3)
+        except ValueError:
+            self.valueMax = None
 
 
 class HashAggregator(object):