github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:Spredzy/logstash into Spredzy-master

Browse source 
Conflicts:
	spec/filters/grok.rb
This commit is contained in:
Jordan Sissel 2013-04-11 15:05:45 -07:00
commit cd7c7c197a
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/logstash/filters/grok.rb
View file

@ -363,7 +363,7 @@ class LogStash::Filters::Grok < LogStash::Filters::Base
end
# Special casing to skip captures that represent the entire log message.
if fieldvalue == value and field == "@message"
if fieldvalue == value and field == "@message" and key.nil?
# Skip patterns that match the entire message
@logger.debug? and @logger.debug("Skipping capture since it matches the whole line.", :field => key)
next

14
spec/filters/grok.rb
View file

@ -280,4 +280,18 @@ describe LogStash::Filters::Grok do
reject { subject["@tags"] }.include?("_grokparsefailure")
end
end
describe "captures named fields even if the whole text matches" do
config <<-CONFIG
filter {
grok {
pattern => "%{DATE_EU:stimestamp}"
}
}
CONFIG
sample "2011/01/01" do
insist { subject["stimestamp"] } == "2011/01/01"
end
end
end