Skip to content

Bug 1901505: Fixed 'time' type to be Fluent::EventTime #2028

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
Dec 7, 2020
Merged

Bug 1901505: Fixed 'time' type to be Fluent::EventTime #2028

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
9 changes: 8 additions & 1 deletion fluentd/lib/parser_viaq_host_audit/lib/parser_viaq_host_audit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@ def configure(conf={})
def parse(text)
begin
parsed_line = @audit_parser.parse_audit_line text
time = parsed_line.nil? ? Time.now.to_f : DateTime.parse(parsed_line['time']).to_time.to_f

if parsed_line.nil?
t = Time.now
time = Fluent::EventTime.new(t.to_i, t.nsec)
Copy link
Contributor

@igor-karpukhin igor-karpukhin Nov 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This repeatable line can be moved out of if...else..end scope.

else
t = DateTime.parse(parsed_line['time']).to_time
time = Fluent::EventTime.new(t.to_i, t.nsec)
end

yield time, parsed_line
rescue Fluent::ViaqHostAudit::ViaqHostAuditParserException => e
Expand Down
2 changes: 2 additions & 0 deletions fluentd/lib/parser_viaq_host_audit/test/parser_viaq_host_audit_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def create_driver(conf = '')
assert_equal('296', record['audit.linux']['record_id'])
assert_equal("2019-10-24T09:56:31.145999+00:00", record['time'])
assert_equal(message, record['message'])
assert_true(time.instance_of? Fluent::EventTime)
end
end
test 'AVC denial is detected' do
Expand All @@ -36,6 +37,7 @@ def create_driver(conf = '')
assert_equal('233', record['audit.linux']['record_id'])
assert_equal("2019-10-24T09:56:31.145999+00:00", record['time'])
assert_equal(message, record['message'])
assert_true(time.instance_of? Fluent::EventTime)
end
end
end
Expand Down