New upstream version 1.6.0+dfsgupstream/1.6.0+dfsg

1 files changed, 69 insertions, 28 deletions

diff --git a/python.d/fail2ban.chart.py b/python.d/fail2ban.chart.py
index 2d80282c6..c7d24e8c1 100644
--- a/python.d/fail2ban.chart.py
+++ b/python.d/fail2ban.chart.py
@@ -4,16 +4,18 @@
 
 from base import LogService
 from re import compile
+
 try:
     from itertools import filterfalse
 except ImportError:
     from itertools import ifilterfalse as filterfalse
 from os import access as is_accessible, R_OK
+from os.path import isdir
+from glob import glob
 
 priority = 60000
 retries = 60
-regex = compile(r'([A-Za-z-]+\]) enabled = ([a-z]+)')
-
+REGEX = compile(r'\[([A-Za-z-_]+)][^\[\]]*?(?<!# )enabled = true')
 ORDER = ['jails_group']
 
 
@@ -23,22 +25,17 @@ class Service(LogService):
         self.order = ORDER
         self.log_path = self.configuration.get('log_path', '/var/log/fail2ban.log')
         self.conf_path = self.configuration.get('conf_path', '/etc/fail2ban/jail.local')
-        self.default_jails = ['ssh']
+        self.conf_dir = self.configuration.get('conf_dir', '')
         try:
             self.exclude = self.configuration['exclude'].split()
         except (KeyError, AttributeError):
             self.exclude = []
-        
 
     def _get_data(self):
         """
         Parse new log lines
         :return: dict
         """
-
-        # If _get_raw_data returns empty list (no new lines in log file) we will send to Netdata this
-        self.data = {jail: 0 for jail in self.jails_list}
-        
         try:
             raw = self._get_raw_data()
             if raw is None:
@@ -50,42 +47,86 @@ class Service(LogService):
 
         # Fail2ban logs looks like
         # 2016-12-25 12:36:04,711 fail2ban.actions[2455]: WARNING [ssh] Ban 178.156.32.231
-        self.data = dict(
+        data = dict(
             zip(
                 self.jails_list,
                 [len(list(filterfalse(lambda line: (jail + '] Ban') not in line, raw))) for jail in self.jails_list]
             ))
 
+        for jail in data:
+            self.data[jail] += data[jail]
+
         return self.data
 
     def check(self):
-            
+
         # Check "log_path" is accessible.
         # If NOT STOP plugin
         if not is_accessible(self.log_path, R_OK):
-            self.error('Cannot access file %s' % (self.log_path))
+            self.error('Cannot access file %s' % self.log_path)
             return False
+        jails_list = list()
+
+        if self.conf_dir:
+            dir_jails, error = parse_conf_dir(self.conf_dir)
+            jails_list.extend(dir_jails)
+            if not dir_jails:
+                self.error(error)
+
+        if self.conf_path:
+            path_jails, error = parse_conf_path(self.conf_path)
+            jails_list.extend(path_jails)
+            if not path_jails:
+                self.error(error)
 
-        # Check "conf_path" is accessible.
-        # If "conf_path" is accesible try to parse it to find enabled jails
-        if is_accessible(self.conf_path, R_OK):
-            with open(self.conf_path, 'rt') as jails_conf:
-                jails_list = regex.findall(' '.join(jails_conf.read().split()))
-            self.jails_list = [jail[:-1] for jail, status in jails_list if status == 'true']
-        else:
-            self.jails_list = []
-            self.error('Cannot access jail.local file %s.' % (self.conf_path))
-        
         # If for some reason parse failed we still can START with default jails_list.
-        self.jails_list = [jail for jail in self.jails_list if jail not in self.exclude]\
-                                              if self.jails_list else self.default_jails
+        self.jails_list = list(set(jails_list) - set(self.exclude)) or ['ssh']
+        self.data = dict([(jail, 0) for jail in self.jails_list])
         self.create_dimensions()
-        self.info('Plugin succefully started. Jails: %s' % (self.jails_list))
+        self.info('Plugin successfully started. Jails: %s' % self.jails_list)
         return True
 
     def create_dimensions(self):
-        self.definitions = {'jails_group':
-                                {'options':
-                                     [None, "Jails ban statistics", "bans/s", 'Jails', 'jail.ban', 'line'], 'lines': []}}
+        self.definitions = {
+            'jails_group': {'options': [None, "Jails ban statistics", "bans/s", 'jails', 'jail.ban', 'line'],
+                            'lines': []}}
         for jail in self.jails_list:
-            self.definitions['jails_group']['lines'].append([jail, jail, 'absolute'])
+            self.definitions['jails_group']['lines'].append([jail, jail, 'incremental'])
+
+
+def parse_conf_dir(conf_dir):
+    if not isdir(conf_dir):
+        return list(), '%s is not a directory' % conf_dir
+
+    jail_local = list(filter(lambda local: is_accessible(local, R_OK), glob(conf_dir + '/*.local')))
+    jail_conf = list(filter(lambda conf: is_accessible(conf, R_OK), glob(conf_dir + '/*.conf')))
+
+    if not (jail_local or jail_conf):
+        return list(), '%s is empty or not readable' % conf_dir
+
+    # According "man jail.conf" files could be *.local AND *.conf
+    # *.conf files parsed first. Changes in *.local overrides configuration in *.conf
+    if jail_conf:
+        jail_local.extend([conf for conf in jail_conf if conf[:-5] not in [local[:-6] for local in jail_local]])
+    jails_list = list()
+    for conf in jail_local:
+        with open(conf, 'rt') as f:
+            raw_data = f.read()
+
+        data = ' '.join(raw_data.split())
+        jails_list.extend(REGEX.findall(data))
+    jails_list = list(set(jails_list))
+
+    return jails_list, 'can\'t locate any jails in %s. Default jail is [\'ssh\']' % conf_dir
+
+
+def parse_conf_path(conf_path):
+    if not is_accessible(conf_path, R_OK):
+        return list(), '%s is not readable' % conf_path
+
+    with open(conf_path, 'rt') as jails_conf:
+        raw_data = jails_conf.read()
+
+    data = raw_data.split()
+    jails_list = REGEX.findall(' '.join(data))
+    return jails_list, 'can\'t locate any jails in %s. Default jail is  [\'ssh\']' % conf_path