Merge branch 'gdb-master'

This commit is contained in:
Jordan Sissel 2012-12-27 22:46:12 -08:00
commit 685fcb3910
2 changed files with 2 additions and 2 deletions

View file

@ -250,7 +250,7 @@ class LogStash::Filters::Grok < LogStash::Filters::Base
if !matched
# Tag this event if we can't parse it. We can use this later to
# reparse+reindex logs if we improve the patterns given .
event.tags << "_grokparsefailure"
event.tags << "_grokparsefailure" unless event.tags.include?("_grokparsefailure")
end
@logger.debug? and @logger.debug("Event now: ", :event => event)

View file

@ -1,2 +1,2 @@
RUBY_LOGLEVEL (?:DEBUG|FATAL|ERROR|WARN|INFO)
RUBY_LOGGER [DFEWI], \[%{TIMESTAMP_ISO8601:timestamp} #%{POSINT:pid}\] *%{RUBY_LOGLEVEL:loglevel} -- *%{DATA:progname}: %{GREEDYDATA:message}
RUBY_LOGGER [DFEWI], \[%{TIMESTAMP_ISO8601:timestamp} #%{POSINT:pid}\] *%{RUBY_LOGLEVEL:loglevel} -- +%{DATA:progname}: %{GREEDYDATA:message}