Skip to content

Fix regular expression to parse grok #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2019
Merged

Fix regular expression to parse grok #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/fluent/plugin/grok.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class GrokPatternNotFoundError < StandardError
(?<pattern>[A-z0-9]+)
(?::(?<subname>[@\[\]A-z0-9_:.-]+?)
(?::(?<type>(?:string|bool|integer|float|
time(?::.+)?|
time(?::.+?)?|
array(?::.)?)))?)?
)
\}/x
Expand Down
15 changes: 15 additions & 0 deletions test/test_grok_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,21 @@ class GrokParserTest < ::Test::Unit::TestCase
assert_equal(event_time("28/Feb/2013:12:00:00 +0900", format: "%d/%b/%Y:%H:%M:%S %z"), time)
end
end

test "leading time type with following other type" do
d = create_driver(%[
<grok>
pattern \\[%{HTTPDATE:log_timestamp:time:%d/%b/%Y:%H:%M:%S %z}\\] %{GREEDYDATA:message}
</grok>
])
expected_record = {
"log_timestamp" => event_time("03/Feb/2019:06:47:21 +0530", format: "%d/%b/%Y:%H:%M:%S %z"),
"message" => "Python-urllib/2.7"
}
d.instance.parse('[03/Feb/2019:06:47:21 +0530] Python-urllib/2.7') do |time, record|
assert_equal(expected_record, record)
end
end
end

private
Expand Down