logstash-filter-dns 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73cb8fe595b22b20b424bfe6866ba69fd68431a5
-  data.tar.gz: 6c927a38fca97eecf5f82c7123e416dc6e3fd905
+  metadata.gz: 451e8d858fcc890df189f2d688ec283dcd1f1220
+  data.tar.gz: 4621ac9e64a810f7b0353166c01f76c0002d5f74
 SHA512:
-  metadata.gz: 887d7a1b2b03386141678e8446dfbc03c2e404508049db13f9054435d54e224ec665df9b611bd9734826e13164bbd95c2715637ba71aa9c55b1ca4c9e2ae78a2
-  data.tar.gz: ddc8b7725bfe4d1f296c4cd06dae9e5e79a46b6e81aeefb6d4062ae2a70b89a9be39c955b977c52c23c8d6a1386a1ad68c7a8b263f6188f74e767a4656a3a067
+  metadata.gz: 88bd974c5b13cfc27e46669b1099d009bdadc1ba2ea33f3a1d568b6c7bf6b9b5c6f39c01d6b2fc82dbf9b030704a57c748b70dd84e90eb711848a955abf18794
+  data.tar.gz: 5d51182313de8c1e78a0ace576a32d3b98bfcabd2c920380f5e6c3cf09298171f08c0ad61aec9e4e218d807ca96e6932d5630f0f3e41332c8f183310b4b454ef

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+

data/lib/logstash/filters/dns.rb

@@ -42,8 +42,8 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
   # specified under `reverse` and `resolve`.
   config :action, :validate => [ "append", "replace" ], :default => "append"
 
-  # Use custom nameserver.
-  config :nameserver, :validate => :string
+  # Use custom nameserver(s). For example: `["8.8.8.8", "8.8.4.4"]`
+  config :nameserver, :validate => :array
 
   # `resolv` calls will be wrapped in a timeout instance
   config :timeout, :validate => :number, :default => 2
@@ -55,7 +55,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
     if @nameserver.nil?
       @resolv = Resolv.new
     else
-      @resolv = Resolv.new(resolvers=[::Resolv::Hosts.new, ::Resolv::DNS.new(:nameserver => [@nameserver], :search => [], :ndots => 1)])
+      @resolv = Resolv.new(resolvers=[::Resolv::Hosts.new, ::Resolv::DNS.new(:nameserver => @nameserver, :search => [], :ndots => 1)])
     end
 
     @ip_validator = Resolv::AddressRegex
@@ -63,7 +63,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
   public
   def filter(event)
-    return unless filter?(event)
+    
 
     new_event = event.clone
 

data/logstash-filter-dns.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-dns'
-  s.version         = '2.0.0'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This filter will resolve any IP addresses from a field of your choosing."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/dns_spec.rb

@@ -206,4 +206,36 @@ describe LogStash::Filters::DNS do
       insist { subject["foo"] } == "does.not.exist"
     end
   end
+
+  describe "dns resolve lookup, single custom nameserver" do
+    config <<-CONFIG
+      filter {
+        dns {
+          resolve => ["host"]
+          action => "replace"
+          nameserver => "8.8.8.8"
+        }
+      }
+    CONFIG
+
+    sample("host" => "carrera.databits.net") do
+      insist { subject["host"] } == "199.192.228.250"
+    end
+  end
+
+  describe "dns resolve lookup, multiple nameserver fallback" do
+    config <<-CONFIG
+      filter {
+        dns {
+          resolve => ["host"]
+          action => "replace"
+          nameserver => ["127.0.0.99", "8.8.8.8"]
+        }
+      }
+    CONFIG
+
+    sample("host" => "carrera.databits.net") do
+      insist { subject["host"] } == "199.192.228.250"
+    end
+  end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-dns
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: