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

Fixed some bugs, and added tests.

Browse source
This commit is contained in:
Alex Wheeler 2012-10-24 17:15:42 -04:00
parent d1048fc6f2
commit 30b25afee1
2 changed files with 86 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/logstash/filters/kv.rb
View file

@ -94,8 +94,10 @@ class LogStash::Filters::KV < LogStash::Filters::Base
private
def parse(text, event)
#text.scan(/([^ =]+)=("[^"]+"|'[^']+'|[^ ]+)/) do |key, value|
scan_re =Regexp.new("([^ ="+@field_split+"]+)["+@value_split+"](?:\"([^\""+@field_split+"]+)\"|'([^'"+@field_split+"]+)'|([^ "+@field_split+"]+))")
if !event =~ /[@field_split]/
return
end
scan_re =Regexp.new("([^ "+@field_split+@value_split+"]+)["+@value_split+"](?:\"([^\""+@field_split+"]+)\"|'([^'"+@field_split+"]+)'|([^ "+@field_split+"]+))")
text.scan(scan_re) do |key, v1, v2, v3|
value = v1 || v2 || v3
if !@trim.nil?

82
spec/filters/kv.rb
View file

@ -23,6 +23,88 @@ describe LogStash::Filters::KV do
end
describe "test value_split" do
config <<-CONFIG
filter {
kv { value_split => ':' }
}
CONFIG
sample "hello:=world foo:bar baz=:fizz doublequoted:\"hello world\" singlequoted:'hello world'" do
insist { subject["hello"] } == "=world"
insist { subject["foo"] } == "bar"
insist { subject["baz="] } == "fizz"
insist { subject["doublequoted"] } == "hello world"
insist { subject["singlequoted"] } == "hello world"
end
end
describe "test field_split" do
config <<-CONFIG
filter {
kv { field_split => '?&' }
}
CONFIG
sample "?hello=world&foo=bar&baz=fizz&doublequoted=\"hello world\"&singlequoted='hello world'&ignoreme&foo12=bar12" do
insist { subject["hello"] } == "world"
insist { subject["foo"] } == "bar"
insist { subject["baz"] } == "fizz"
insist { subject["doublequoted"] } == "hello world"
insist { subject["singlequoted"] } == "hello world"
insist { subject["foo12"] } == "bar12"
end
end
describe "test prefix" do
config <<-CONFIG
filter {
kv { prefix => '__' }
}
CONFIG
sample "hello=world foo=bar baz=fizz doublequoted=\"hello world\" singlequoted='hello world'" do
insist { subject["__hello"] } == "world"
insist { subject["__foo"] } == "bar"
insist { subject["__baz"] } == "fizz"
insist { subject["__doublequoted"] } == "hello world"
insist { subject["__singlequoted"] } == "hello world"
end
end
describe "test container" do
config <<-CONFIG
filter {
kv { container => 'kv' }
}
CONFIG
sample "hello=world foo=bar baz=fizz doublequoted=\"hello world\" singlequoted='hello world'" do
insist { subject["kv"]["hello"] } == "world"
insist { subject["kv"]["foo"] } == "bar"
insist { subject["kv"]["baz"] } == "fizz"
insist { subject["kv"]["doublequoted"] } == "hello world"
insist { subject["kv"]["singlequoted"] } == "hello world"
end
end
describe "test empty container" do
config <<-CONFIG
filter {
kv { container => 'kv' }
}
CONFIG
sample "hello:world:foo:bar:baz:fizz" do
insist { subject["kv"] } == nil
end
end
describe "speed test" do
count = 10000 + rand(3000)
config <<-CONFIG