Skip to content

Process the ranges on the network property only on register #13

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Process the ranges on the network property only on register #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaeb310
When using the network property on the configuration, process the def…
jorgelbg Mar 5, 2018
d9bd201
Avoid overwriting the @network property on plugin register
jorgelbg Mar 6, 2018
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
21 changes: 10 additions & 11 deletions lib/logstash/filters/cidr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ def register
if @network_path
@next_refresh = Time.now + @refresh_interval
lock_for_write { load_file }
else
@network_list = @network.collect do |n|
begin
IPAddr.new(n)
rescue ArgumentError => e
@logger.warn("Invalid IP network, skipping", :network => n)
end
end
end
end # def register

Expand Down Expand Up @@ -131,6 +139,8 @@ def filter(event)
end
address.compact!

network = @network_list

if @network_path #in case we are getting networks from an external file
if needs_refresh?
lock_for_write do
Expand All @@ -151,17 +161,6 @@ def filter(event)
nil
end
end

else #networks come from array in config file

network = @network.collect do |n|
begin
IPAddr.new(event.sprintf(n))
rescue ArgumentError => e
@logger.warn("Invalid IP network, skipping", :network => n, :event => event)
nil
end
end
end

network.compact! #clean nulls
Expand Down