logstash-filter-dns 2.1.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f916d39bc569e1614134307584a79c8365676b2
-  data.tar.gz: 8c214913b8c02c364a1ca92e3752bcb69ee39ff2
+  metadata.gz: b81dd2e483bae6eaa02ecf1a3eb7ef0558353a0f
+  data.tar.gz: 930ea7507738f0930dc969336ef32194abc4bb55
 SHA512:
-  metadata.gz: ce13f987f145089f32cfbacdfa6cece0cfb1cf794adcd6bce01d8a8dd94fce140a91e275cf1ec60faa8267ff7e23e65522190b32919b7467ee26d09d87822213
-  data.tar.gz: e881ca531576a6da50ccb49633d7b3679f4fe14b1046a47e4e57527e734008dcfb2c08a79522016eec4cf17fce369618cd24b54cde4eefe02e15c3af7fa03697
+  metadata.gz: 2094391841c6c1361b727fed619059e541c8302f79b3d1ff707e2cda8cb34c995b2f961c618bca91e127eba67573b0bfab34fd9ebf22ac29349c3cca1a722e92
+  data.tar.gz: 4224d854c2c50f2b4d2f8dc591b6026a6efe49bf4c0d86122c96ca40420aea9edf39976957f7b7e2d23d8c829a34616bb08c9cdb0d480e2632180755782ef71d

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 ## 2.1.3
   - Fix spec early termination by removing an explicit return from a block
 

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-dns-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-dns-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-dns.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-dns)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/filters/dns.rb

@@ -102,7 +102,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
   def resolve(event)
     @resolve.each do |field|
       is_array = false
-      raw = event[field]
+      raw = event.get(field)
       if raw.is_a?(Array)
         is_array = true
         if raw.length > 1
@@ -136,15 +136,17 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
       if @action == "replace"
         if is_array
-          event[field] = [address]
+          event.set(field, [address])
         else
-          event[field] = address
+          event.set(field, address)
         end
       else
         if !is_array
-          event[field] = [event[field], address]
+          event.set(field, [event.get(field), address])
         else
-          event[field] << address
+          arr = event.get(field)
+          arr << address
+          event.set(field, arr)
         end
       end
 
@@ -154,7 +156,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
   private
   def reverse(event)
     @reverse.each do |field|
-      raw = event[field]
+      raw = event.get(field)
       is_array = false
       if raw.is_a?(Array)
           is_array = true
@@ -167,7 +169,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
       if ! @ip_validator.match(raw)
         @logger.debug("DNS: not an address",
-                      :field => field, :value => event[field])
+                      :field => field, :value => event.get(field))
         return
       end
       begin
@@ -194,15 +196,17 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
 
       if @action == "replace"
         if is_array
-          event[field] = [hostname]
+          event.set(field, [hostname])
         else
-          event[field] = hostname
+          event.set(field, hostname)
         end
       else
         if !is_array
-          event[field] = [event[field], hostname]
+          event.set(field, [event.get(field), hostname])
         else
-          event[field] << hostname
+          arr = event.get(field)
+          arr << hostname
+          event.set(field, arr)
         end
       end
     end

data/logstash-filter-dns.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-dns'
-  s.version         = '2.1.3'
+  s.version         = '3.0.0'
   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"
+  s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -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-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'lru_redux', "~> 1.1.0"
 
   s.add_development_dependency 'logstash-devutils'

data/spec/filters/dns_spec.rb

@@ -25,7 +25,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => "199.192.228.250") do
-      insist { subject["foo"] } == "carrera.databits.net"
+      insist { subject.get("foo") } == "carrera.databits.net"
     end
   end
 
@@ -40,8 +40,8 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => "199.192.228.250") do
-      insist { subject["foo"][0] } == "199.192.228.250"
-      insist { subject["foo"][1] } == "carrera.databits.net"
+      insist { subject.get("foo")[0] } == "199.192.228.250"
+      insist { subject.get("foo")[1] } == "carrera.databits.net"
     end
   end
 
@@ -55,7 +55,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => "not.an.ip") do
-      insist { subject["foo"] } == "not.an.ip"
+      insist { subject.get("foo") } == "not.an.ip"
     end
   end
 
@@ -71,8 +71,8 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("host" => "carrera.databits.net") do
-      insist { subject["host"] } == "199.192.228.250"
-      insist { subject["tags"] } == ["success"]
+      insist { subject.get("host") } == "199.192.228.250"
+      insist { subject.get("tags") } == ["success"]
     end
   end
 
@@ -88,9 +88,9 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("host1" => "carrera.databits.net", "host2" => "nonexistanthostname###.net") do
-      insist { subject["tags"] }.nil?
-      insist { subject["host1"] } == "199.192.228.250"
-      insist { subject["host2"] } == "nonexistanthostname###.net"
+      insist { subject.get("tags") }.nil?
+      insist { subject.get("host1") } == "199.192.228.250"
+      insist { subject.get("host2") } == "nonexistanthostname###.net"
     end
   end
 
@@ -106,7 +106,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("host1" => "carrera.databits.net", "host2" => "carrera.databits.net") do
-      insist { subject["tags"] } == ["success"]
+      insist { subject.get("tags") } == ["success"]
     end
   end
 
@@ -125,10 +125,10 @@ describe LogStash::Filters::DNS do
     sample("host1" => "carrera.databits.net",
            "ip1" => "127.0.0.1",
            "ip2" => "128.0.0.1") do
-      insist { subject["tags"] }.nil?
-      insist { subject["host1"] } == "199.192.228.250"
-      insist { subject["ip1"] } == "localhost"
-      insist { subject["ip2"] } == "128.0.0.1"
+      insist { subject.get("tags") }.nil?
+      insist { subject.get("host1") } == "199.192.228.250"
+      insist { subject.get("ip1") } == "localhost"
+      insist { subject.get("ip2") } == "128.0.0.1"
     end
   end
 
@@ -143,7 +143,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => "carrera.databits.net") do
-      insist { subject["foo"] } == "199.192.228.250"
+      insist { subject.get("foo") } == "199.192.228.250"
     end
   end
 
@@ -158,7 +158,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => ["carrera.databits.net", "foo.databits.net"]) do
-      insist { subject["foo"] } == ["carrera.databits.net", "foo.databits.net"]
+      insist { subject.get("foo") } == ["carrera.databits.net", "foo.databits.net"]
     end
   end
 
@@ -173,8 +173,8 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => "carrera.databits.net") do
-      insist { subject["foo"][0] } == "carrera.databits.net"
-      insist { subject["foo"][1] } == "199.192.228.250"
+      insist { subject.get("foo")[0] } == "carrera.databits.net"
+      insist { subject.get("foo")[1] } == "199.192.228.250"
     end
   end
 
@@ -189,7 +189,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => ["carrera.databits.net", "foo.databits.net"]) do
-      insist { subject["foo"] } == ["carrera.databits.net", "foo.databits.net"]
+      insist { subject.get("foo") } == ["carrera.databits.net", "foo.databits.net"]
     end
   end
 
@@ -203,7 +203,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("foo" => "does.not.exist") do
-      insist { subject["foo"] } == "does.not.exist"
+      insist { subject.get("foo") } == "does.not.exist"
     end
   end
 
@@ -219,7 +219,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("host" => "carrera.databits.net") do
-      insist { subject["host"] } == "199.192.228.250"
+      insist { subject.get("host") } == "199.192.228.250"
     end
   end
 
@@ -235,7 +235,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("host" => "carrera.databits.net") do
-      insist { subject["host"] } == "199.192.228.250"
+      insist { subject.get("host") } == "199.192.228.250"
     end
   end
 
@@ -251,7 +251,7 @@ describe LogStash::Filters::DNS do
     CONFIG
 
     sample("host" => "carrera.databits.net") do
-      insist { subject["host"] } == "199.192.228.250"
+      insist { subject.get("host") } == "199.192.228.250"
     end
   end
 

metadata

@@ -1,58 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-dns
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  prerelease: false
+        version: '2.0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: lru_redux
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This gem is a Logstash plugin required to be installed on top of the
+  Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
+  gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -73,24 +75,24 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: This filter will resolve any IP addresses from a field of your choosing.
 test_files: