Merge branch 'master' into ab-debian

* master:
  set up-delay on web alarms; fixes #1832
  fail2ban_plugin: parse both conf_path and conf_dir/; regex update

diff --git a/conf.d/health.d/web_log.conf b/conf.d/health.d/web_log.conf
index fdcdeaa16e5bb48d29a9a72a0a436d9428043935..c668959f51b4bed77ba40e8a491bafdd003b747d 100644 (file)
--- a/conf.d/health.d/web_log.conf
+++ b/conf.d/health.d/web_log.conf
@@ -42,7 +42,7 @@ families: *
    every: 10s
     warn: ($1m_requests > 120) ? ($this < (($status >= $WARNING ) ? ( 95 ) : ( 85 )) ) : ( 0 )
     crit: ($1m_requests > 120) ? ($this < (($status == $CRITICAL) ? ( 85 ) : ( 75 )) ) : ( 0 )
-   delay: down 15m multiplier 1.5 max 1h
+   delay: up 2m down 15m multiplier 1.5 max 1h
     info: the ratio of successful HTTP responses (1xx, 2xx, 304) over the last minute
       to: webmaster
 
@@ -55,7 +55,7 @@ families: *
    every: 10s
     warn: ($1m_requests > 120) ? ($this > (($status >= $WARNING ) ? (  1 ) : ( 20 )) ) : ( 0 )
     crit: ($1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 20 ) : ( 30 )) ) : ( 0 )
-   delay: down 15m multiplier 1.5 max 1h
+   delay: up 2m down 15m multiplier 1.5 max 1h
     info: the ratio of HTTP redirects (3xx except 304) over the last minute
       to: webmaster
 
@@ -68,7 +68,7 @@ families: *
    every: 10s
     warn: ($1m_requests > 120) ? ($this > (($status >= $WARNING)  ? ( 10 ) : ( 30 )) ) : ( 0 )
     crit: ($1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 30 ) : ( 50 )) ) : ( 0 )
-   delay: down 15m multiplier 1.5 max 1h
+   delay: up 2m down 15m multiplier 1.5 max 1h
     info: the ratio of HTTP bad requests (4xx) over the last minute
       to: webmaster
 
@@ -81,7 +81,7 @@ families: *
    every: 10s
     warn: ($1m_requests > 120) ? ($this > (($status >= $WARNING)  ? ( 1 ) : ( 2 )) ) : ( 0 )
     crit: ($1m_requests > 120) ? ($this > (($status == $CRITICAL) ? ( 2 ) : ( 5 )) ) : ( 0 )
-   delay: down 15m multiplier 1.5 max 1h
+   delay: up 2m down 15m multiplier 1.5 max 1h
     info: the ratio of HTTP internal server errors (5xx), over the last minute
       to: webmaster
 

diff --git a/python.d/fail2ban.chart.py b/python.d/fail2ban.chart.py
index 85ac2d43fae274f1959624d3dfa14ad91f1e2cb2..c7d24e8c15db195dd567024830646e02b54a7f6d 100644 (file)
--- a/python.d/fail2ban.chart.py
+++ b/python.d/fail2ban.chart.py
@@ -15,7 +15,7 @@ from glob import glob
 
 priority = 60000
 retries = 60
-REGEX = compile(r'\[([A-Za-z-]+)][^\[\]]*? enabled = true')
+REGEX = compile(r'\[([A-Za-z-_]+)][^\[\]]*?(?<!# )enabled = true')
 ORDER = ['jails_group']
 
 
@@ -65,14 +65,19 @@ class Service(LogService):
         if not is_accessible(self.log_path, R_OK):
             self.error('Cannot access file %s' % self.log_path)
             return False
+        jails_list = list()
 
         if self.conf_dir:
-            jails_list, error = parse_conf_dir(self.conf_dir)
-        else:
-            jails_list, error = parse_conf_path(self.conf_path)
-
-        if not jails_list:
-            self.error(error)
+            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)
 
         # If for some reason parse failed we still can START with default jails_list.
         self.jails_list = list(set(jails_list) - set(self.exclude)) or ['ssh']