Merge pull request #1840 from ktsaou/master

set up-delay on web alarms;

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