logstash-filter-date 2.1.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55acd38d75625d5aad84145a3ba0543b967e7c2
-  data.tar.gz: 468b66d39fe5bb0e766787f222618b76191d2a07
+  metadata.gz: ce4c40f91ec18b26069a407aeccc148174f7796d
+  data.tar.gz: 2ee04b70cd0c1c20c85ac347430950465b609df8
 SHA512:
-  metadata.gz: 086fc7bf00a6c5e7346ee65b20ba5d998f9aaba9a9995ed30af065c8e7957c51a34bae96af80d127c7d2c95122c63d52f8bdb51b74649e47b6fee48f32f36dcf
-  data.tar.gz: 5e3521439c348673c5ad1d23dacbe770690db36a84cbd739ae2f37f0cd1c34a4d7041101ae3436319f80cde3916b3e71ad37560ddd16f394260f057e3a925fe0
+  metadata.gz: 49a7051b4e41344e923cce3084ae481694671ec56f7080f8bf5681ea8f7468c42052296d166502ed6b52ed83232eb2e5ae1bd0bdcfb253020a96f8247ed9bd16
+  data.tar.gz: 3ce7f31df2d6e4850cddee98d561d9ae65b6770adc9bd317a35b1570c47fabfd5db4ba1704b767a9089f235bc9dcce3a3aba670efa4684aed4ef3a272e3da93d

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.6
   - bugfix: Fails to parse a timestamp without year that falls in DST switchover for CET #63 (fix for #62)
 # 2.1.5

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+
+# 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-date-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-date-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-date.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-date)
 
 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/date.rb

@@ -308,14 +308,14 @@ class LogStash::Filters::Date < LogStash::Filters::Base
   end
 
   def filter(event)
-    @logger.debug? && @logger.debug("Date filter: received event", :type => event["type"])
+    @logger.debug? && @logger.debug("Date filter: received event", :type => event.get("type"))
 
     @parsers.each do |field, fieldparsers|
       @logger.debug? && @logger.debug("Date filter looking for field",
-                                      :type => event["type"], :field => field)
+                                      :type => event.get("type"), :field => field)
       next unless event.include?(field)
 
-      fieldvalues = event[field]
+      fieldvalues = event.get(field)
       fieldvalues = [fieldvalues] if !fieldvalues.is_a?(Array)
       fieldvalues.each do |value|
         next if value.nil?
@@ -343,9 +343,9 @@ class LogStash::Filters::Date < LogStash::Filters::Base
           raise last_exception unless success
 
           # Convert joda DateTime to a ruby Time
-          event[@target] = LogStash::Timestamp.at(epochmillis / 1000, (epochmillis % 1000) * 1000)
+          event.set(@target, LogStash::Timestamp.at(epochmillis / 1000, (epochmillis % 1000) * 1000))
 
-          @logger.debug? && @logger.debug("Date parsing done", :value => value, :timestamp => event[@target])
+          @logger.debug? && @logger.debug("Date parsing done", :value => value, :timestamp => event.get(@target))
           filter_matched(event)
         rescue StandardError, JavaException => e
           @logger.warn("Failed parsing date from field", :field => field,

data/logstash-filter-date.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-date'
-  s.version         = '2.1.6'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The date filter is used for parsing dates from fields, and then using that date or timestamp as the logstash timestamp for the event."
-  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_development_dependency 'logstash-input-generator'
   s.add_development_dependency 'logstash-codec-json'
   s.add_development_dependency 'logstash-output-null'

data/spec/filters/date_spec.rb

@@ -68,8 +68,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     times.each do |input, output|
       sample("mydate" => input) do
         begin
-          insist { subject["mydate"] } == input
-          insist { subject["@timestamp"].time } == Time.iso8601(output).utc
+          insist { subject.get("mydate") } == input
+          insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
         rescue
           #require "pry"; binding.pry
           raise
@@ -97,8 +97,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     }
     times.each do |input, output|
       sample("mydate" => input) do
-        insist { subject["mydate"] } == input
-        insist { subject["@timestamp"].time } == Time.iso8601(output).utc
+        insist { subject.get("mydate") } == input
+        insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
       end
     end # times.each
   end
@@ -123,15 +123,15 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     }
     times.each do |input, output|
       sample("mydate" => input) do
-        insist { subject["mydate"] } == input
-        insist { subject["@timestamp"].time } == Time.iso8601(output).utc
+        insist { subject.get("mydate") } == input
+        insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
       end
     end # times.each
 
     #Invalid value should not be evaluated to zero (String#to_i madness)
     sample("mydate" => "%{bad_value}") do
-      insist { subject["mydate"] } == "%{bad_value}"
-      insist { subject["@timestamp"] } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
+      insist { subject.get("mydate") } == "%{bad_value}"
+      insist { subject.get("@timestamp") } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
     end
   end
 
@@ -152,14 +152,14 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
 
     #Support float values
     sample("mydate" => 1350414944.123456) do
-      insist { subject["mydate"] } == 1350414944.123456
-      insist { subject["@timestamp"].time } == Time.iso8601("2012-10-16T12:15:44.123-07:00").utc
+      insist { subject.get("mydate") } == 1350414944.123456
+      insist { subject.get("@timestamp").time } == Time.iso8601("2012-10-16T12:15:44.123-07:00").utc
     end
 
     #Invalid value should not be evaluated to zero (String#to_i madness)
     sample("mydate" => "%{bad_value}") do
-      insist { subject["mydate"] } == "%{bad_value}"
-      insist { subject["@timestamp"] } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
+      insist { subject.get("mydate") } == "%{bad_value}"
+      insist { subject.get("@timestamp") } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
     end
   end
 
@@ -185,8 +185,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     }
     times.each do |input, output|
       sample("mydate" => input) do
-        insist { subject["mydate"] } == input
-        insist { subject["@timestamp"].time } == Time.iso8601(output)
+        insist { subject.get("mydate") } == input
+        insist { subject.get("@timestamp").time } == Time.iso8601(output)
       end
     end # times.each
   end
@@ -255,8 +255,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     time = "2001-09-09T01:46:40.000Z"
 
     sample("mydate" => time) do
-      insist { subject["mydate"] } == time
-      insist { subject["@timestamp"].time } == Time.iso8601(time).utc
+      insist { subject.get("mydate") } == time
+      insist { subject.get("@timestamp").time } == Time.iso8601(time).utc
     end
   end
 
@@ -271,7 +271,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("data" => { "deep" => "2013-01-01T00:00:00.000Z" }) do
-      insist { subject["@timestamp"].time } == Time.iso8601("2013-01-01T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } == Time.iso8601("2013-01-01T00:00:00.000Z").utc
     end
   end
 
@@ -286,7 +286,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("thedate" => "2013/Apr/21") do
-      insist { subject["@timestamp"] } != "2013-04-21T00:00:00.000Z"
+      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
     end
   end
 
@@ -301,8 +301,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("thedate" => "2013/04/21") do
-      insist { subject["@timestamp"] } != "2013-04-21T00:00:00.000Z"
-      insist { subject["tags"] } == ["tagged"]
+      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      insist { subject.get("tags") } == ["tagged"]
     end
   end
 
@@ -317,8 +317,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("thedate" => "2013/Apr/21") do
-      insist { subject["@timestamp"] } != "2013-04-21T00:00:00.000Z"
-      reject { subject["tags"] }.include? "tagged"
+      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      reject { subject.get("tags") }.include? "tagged"
     end
   end
 
@@ -333,8 +333,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("thedate" => "2013/Apr/21") do
-      insist { subject["@timestamp"] } != "2013-04-21T00:00:00.000Z"
-      insist { subject["tags"] }.include? "date_failed"
+      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      insist { subject.get("tags") }.include? "date_failed"
     end
   end
 
@@ -356,8 +356,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     }
     times.each do |input, output|
       sample("mydate" => input) do
-        insist { subject["mydate"] } == input
-        insist { subject["@timestamp"].time } == Time.iso8601(output).utc
+        insist { subject.get("mydate") } == input
+        insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
       end
     end # times.each
   end
@@ -380,8 +380,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     }
     times.each do |input, output|
       sample("mydate" => input, "mytz" => "America/Los_Angeles") do
-        insist { subject["mydate"] } == input
-        insist { subject["@timestamp"].time } == Time.iso8601(output).utc
+        insist { subject.get("mydate") } == input
+        insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
       end
     end # times.each
   end
@@ -403,8 +403,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     end
 
     sample "2016 Mar 26 02:00:37" do
-      insist { subject["tags"] } != ["_dateparsefailure"]
-      insist { subject["@timestamp"].to_s } == "2016-03-26T01:00:37.000Z"
+      insist { subject.get("tags") } != ["_dateparsefailure"]
+      insist { subject.get("@timestamp").to_s } == "2016-03-26T01:00:37.000Z"
     end
   end
 
@@ -422,7 +422,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       CONFIG
 
       sample("message" => "Sun Jun 02 20:38:03", "mytz" => "UTC") do
-        insist { subject["@timestamp"].year } == Time.now.year
+        insist { subject.get("@timestamp").year } == Time.now.year
       end
     end
 
@@ -443,7 +443,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
 
       sample("message" => "Dec 31 23:59:00", "mytz" => "UTC") do
-        insist { subject["@timestamp"].year } == 2013
+        insist { subject.get("@timestamp").year } == 2013
       end
     end
 
@@ -464,7 +464,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
 
       sample( "message" => "Jan 01 01:00:00", "mytz" => "UTC") do
-        insist { subject["@timestamp"].year } == 2014
+        insist { subject.get("@timestamp").year } == 2014
       end
     end
 
@@ -485,8 +485,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
 
       sample "Mar 26 02:00:37" do
-        insist { subject["tags"] } != ["_dateparsefailure"]
-        insist { subject["@timestamp"].to_s } == "2016-03-26T01:00:37.000Z"
+        insist { subject.get("tags") } != ["_dateparsefailure"]
+        insist { subject.get("@timestamp").to_s } == "2016-03-26T01:00:37.000Z"
       end
     end
   end
@@ -502,7 +502,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample "Sun Jun 02 20:38:03" do
-      insist { subject["@timestamp"].year } == Time.now.year
+      insist { subject.get("@timestamp").year } == Time.now.year
     end
   end
 
@@ -523,7 +523,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     end
 
     sample "Dec 31 23:59:00" do
-      insist { subject["@timestamp"].year } == 2013
+      insist { subject.get("@timestamp").year } == 2013
     end
   end
 
@@ -544,7 +544,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     end
 
     sample "Jan 01 01:00:00" do
-      insist { subject["@timestamp"].year } == 2014
+      insist { subject.get("@timestamp").year } == 2014
     end
   end
 
@@ -560,7 +560,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample "14 juillet 1789" do
-      insist { subject["@timestamp"].time } == Time.iso8601("1789-07-14T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } == Time.iso8601("1789-07-14T00:00:00.000Z").utc
     end
   end
 
@@ -576,7 +576,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample "14 juillet 1789" do
-      insist { subject["@timestamp"].time } == Time.iso8601("1789-07-14T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } == Time.iso8601("1789-07-14T00:00:00.000Z").utc
     end
   end
 
@@ -592,7 +592,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample "14 juillet 1789" do
-      insist { subject["@timestamp"].time } == Time.iso8601("1789-07-14T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } == Time.iso8601("1789-07-14T00:00:00.000Z").utc
     end
   end
 
@@ -608,7 +608,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("timestamp" => "25/Mar/2013:20:33:56 +0000") do
-      insist { subject["@timestamp"].time } == Time.iso8601("2013-03-25T20:33:56.000Z")
+      insist { subject.get("@timestamp").time } == Time.iso8601("2013-03-25T20:33:56.000Z")
     end
   end
 
@@ -626,7 +626,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample "01 September 2014" do
-      insist { subject["@timestamp"].time } == Time.iso8601("2014-09-01T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } == Time.iso8601("2014-09-01T00:00:00.000Z").utc
     end
     #Restore default locale
     java.util.Locale.setDefault(default_locale)
@@ -652,7 +652,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       CONFIG
 
       sample "Sun Jun 02 20:38:03" do
-        insist { subject["@timestamp"].year } == Time.now.year
+        insist { subject.get("@timestamp").year } == Time.now.year
       end
     end
 
@@ -672,7 +672,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
 
       sample "Dec 31 23:59:00" do
-        insist { subject["@timestamp"].year } == 2013
+        insist { subject.get("@timestamp").year } == 2013
       end
     end
 
@@ -692,7 +692,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
 
       sample "Jan 01 01:00:00" do
-        insist { subject["@timestamp"].year } == 2014
+        insist { subject.get("@timestamp").year } == 2014
       end
     end
   end

metadata

@@ -1,86 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-date
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-output-null
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-output-null
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  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/plugin install gemname. This gem is not a stand-alone program
+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: []
@@ -101,7 +103,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -116,10 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: The date filter is used for parsing dates from fields, and then using that date or timestamp as the logstash timestamp for the event.
+summary: The date filter is used for parsing dates from fields, and then using that
+  date or timestamp as the logstash timestamp for the event.
 test_files:
 - spec/filters/date_spec.rb