fix: default log collector parameters

config.yaml

@@ -11,8 +11,5 @@ log_files:
     filter:
         default:
             include: '(.)*'
-            exclude: 'atop-|atop_'
+            exclude: '[-_]\d{8}$|atop[-_]|\.gz$'
-        by_node_id:
+
-             0:
-                 include: '(.)*'
-                 exclude: '^/var/log/remote/|^/var/log/docker\-logs/remote/'

timmy/conf.py

@@ -21,12 +21,8 @@ class Conf(object):
     archives = '/tmp/timmy/archives'
     cmds_archive = ''
     log_files = {}
-    log_files['filter'] = {'default': {'include': "(.)*", 'exclude': None}}
+    log_files['filter'] = {'default': {'include': "(.)*", 'exclude': '[-_]\d{8}$|atop[-_]|\.gz$'}}
     log_files['path'] = '/var/log/'
-    log_files['filter'] = {'by_node_id':
-                               {0:
-                                   {'include': "(.)*",
-                                    'exclude': '^/var/log/remote/|^/var/log/docker\-logs/remote/'}}}
 
     def __init__(self, **entries):
         self.__dict__.update(entries)

timmy/nodes.py

@@ -538,6 +538,8 @@ class Nodes(object):
         for node in self.nodes.values():
             for f in node.flogs:
                 lsize += node.flogs[f]
+            for fl in sorted(node.flogs.items(), key=lambda x: x[1]):
+                logging.debug(fl)
         logging.info('Full log size on nodes(with fuel): %s bytes' % lsize)
         self.alogsize = lsize / 1024