Tidy up filter.d/monit.conf, make regex more complete.

Add ChangeLog / THANKS entry.
Add test cases.
pull/697/head
Jason Martin 2014-04-19 12:58:03 -07:00
parent 7d112430ca
commit 72bfd14330
4 changed files with 10 additions and 11 deletions

View File

@ -21,6 +21,7 @@ ver. 0.9.1 (2014/xx/xx) - better, faster, stronger
* Nginx filter to support missing server_name. Closes gh-676
- New features:
- Added monit filter thanks Jason H Martin.
- Enhancements

1
THANKS
View File

@ -48,6 +48,7 @@ Ivo Truxa
John Thoe
Jacques Lav!gnotte
Ioan Indreias
Jason H Martin
Jonathan Kamens
Jonathan Lanning
Jonathan Underwood

View File

@ -2,17 +2,8 @@
#
#
[INCLUDES]
# Read common prefixes. If any customizations available -- read them from
# common.local
before = common.conf
[Definition]
# Samples:
# [PDT Apr 16 20:59:11] error : Warning: Client '1.2.3.4' supplied unknown user 'foo' accessing monit httpd
# [PDT Apr 16 20:59:33] error : Warning: Client '1.2.3.4' supplied wrong password for user 'admin' accessing monit httpd
failregex = Warning: Client '<HOST>' supplied
failregex = \]\s*error\s*:\s*Warning:\s+Client '<HOST>' supplied unknown user '\w+' accessing monit httpd$
\]\s*error\s*:\s*Warning:\s+Client '<HOST>' supplied wrong password for user '\w+' accessing monit httpd$
ignoreregex =

View File

@ -0,0 +1,6 @@
# failJSON: { "time": "2005-04-16T21:05:29", "match": true , "host": "69.93.127.111" }
[PDT Apr 16 21:05:29] error : Warning: Client '69.93.127.111' supplied unknown user 'foo' accessing monit httpd
# failJSON: { "time": "2005-04-16T20:59:33", "match": true , "host": "97.113.189.111" }
[PDT Apr 16 20:59:33] error : Warning: Client '97.113.189.111' supplied wrong password for user 'admin' accessing monit httpd