logstash-filter-date_formatter 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a971a4312e60245a61ee5c4a26e301fcc3463493
-  data.tar.gz: 282da909a146cc044cbd2942ed2354f9b6c3482e
+  metadata.gz: e50948486c6146e1c59da17efc1823f1c180b0ed
+  data.tar.gz: 09ccaba493f987da276c3d5916f8daea2da6a2a9
 SHA512:
-  metadata.gz: 9ce60da76000a4c4b90052b361844d56906572f4aaed44fcb12075c70644a1fecf31d68773258ea5628d013283d6d0924e0018c14963ce9a36920211636793ce
-  data.tar.gz: c806966d86191bcd57279bbbfdba152fbe371a49ced4eb1c832ee9d956bb361307672089ad872edf7408698170a515dd7bace0e2c7b54ed0b555448b96c731ae
+  metadata.gz: 5466c6c6e0177a8af5c374ea217eeb2b516c5f7f43c05ae8491c5383ab8a7b6bc70ab2860bbf06630d5816403ccc1a69436f82f9f87b3687a411f023587cc2ec
+  data.tar.gz: 846f287c880dd620f6ec1c5ab733b1ea062670f000d5663366ae3c99421e1741de18608d094b400f72ac6b81eb12153938f53b39bf0c483f36e3f31a1d2a4ffc

data/CHANGELOG.md

@@ -1,8 +1,8 @@
-## 1.0.1
- - internal:Dependency on logstash-core-plugin-api to 1.x
+## 2.0.0
+ - internal: change compatibility to new plugin API targetting 5.0
 
 ## 1.0.0
- - internal:Dependency on logstash-core update to 2.0
+ - Dependency on logstash-core update to 2.0
 
 ## 0.1.1
  - Initial release

data/lib/logstash/filters/date_formatter.rb

@@ -150,13 +150,15 @@ class LogStash::Filters::DateFormatter < LogStash::Filters::Base
   def filter(event)
     return unless filter?(event)
     return unless event.include?(@source)
-    src = event[@source]
+    src = event.get(@source)
     src = src.first if src.respond_to?(:each)
     target = nil
-    begin 
+    begin
       case src
       when LogStash::Timestamp,Time
         target = getFormatter(event).print((src.to_f * 1000.0).to_i)
+      when Java::OrgJodaTime::DateTime
+        target = getFormatter(event).print(src)
       else
         @logger.warn("Unsupporter source field. It is neither a ruby Time or a Logstash::Timestamp")
       end
@@ -165,13 +167,12 @@ class LogStash::Filters::DateFormatter < LogStash::Filters::Base
                    :value => src, :exception => e.message)
       # Tag this event. We can use this later to reparse+reindex logs if necessary.
       @tag_on_failure.each do |tag|
-        event["tags"] ||= []
-        event["tags"] << tag unless event["tags"].include?(tag)
+        event.tag(tag)
       end
       target = nil
     end
     if target
-      event[@target] = target
+      event.set(@target, target)
       filter_matched(event)
     end
     return event

data/logstash-filter-date_formatter.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-date_formatter'
-  s.version         = '1.0.1'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The date_formatter filter is used for formatting date or time from fields containing a time object like @timestamp, and then storing that formatted string in the field defined as target."
   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,6 +20,6 @@ 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-devutils'
 end

data/spec/filters/date_formatter_spec.rb

@@ -19,10 +19,10 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
     CONFIG
 
     sample({ "mydate" => LogStash::Timestamp.at(1423718682)}) do
-      expect(subject["locale_date"]).to eq("jeudi, 12 février 2015")
+      expect(subject.get("locale_date")).to eq("jeudi, 12 février 2015")
     end
   end
-  
+
   describe "Using a specific timezone" do
     config <<-CONFIG
       filter {
@@ -36,7 +36,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
     CONFIG
 
     sample({ "mydate" => LogStash::Timestamp.at(1423718682)}) do
-      expect(subject["locale_date"]).to eq("2015-02-12T06:24:42.000+01:00")
+      expect(subject.get("locale_date")).to eq("2015-02-12T06:24:42.000+01:00")
     end
   end
 
@@ -53,7 +53,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
     CONFIG
 
     sample({ "mydate" => LogStash::Timestamp.at(1423718682)}) do
-      expect(subject["japan_date"]).to eq("2015年02月12日")
+      expect(subject.get("japan_date")).to eq("2015年02月12日")
     end
   end
 
@@ -70,13 +70,13 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
     CONFIG
 
     sample({ "mydate" => LogStash::Timestamp.at(1423718682)}) do
-      expect(subject["locale_date"]).to eq("2015-02-12T06:24:42.000+01:00")
+      expect(subject.get("locale_date")).to eq("2015-02-12T06:24:42.000+01:00")
     end
     sample({ "mydate" => Time.at(1423718682)}) do
-      expect(subject["locale_date"]).to eq("2015-02-12T06:24:42.000+01:00")
+      expect(subject.get("locale_date")).to eq("2015-02-12T06:24:42.000+01:00")
     end
     sample({ "mydate" => "any string"}) do
-      expect(subject["locale_date"]).to be_nil
+      expect(subject.get("locale_date")).to be_nil
     end
   end
 
@@ -94,10 +94,10 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
     CONFIG
 
     sample({ "mydate" => LogStash::Timestamp.at(1423718682), "locale" => "fr-Fr", "timezone" => "Europe/Paris"}) do
-      expect(subject["locale_date"]).to eq("jeudi, 12 février 2015 +01:00")
+      expect(subject.get("locale_date")).to eq("jeudi, 12 février 2015 +01:00")
     end
     sample({ "mydate" => LogStash::Timestamp.at(1423718682), "locale" => "en-US", "timezone" => "America/Los_Angeles"}) do
-      expect(subject["locale_date"]).to eq("Wednesday, 11 February 2015 -08:00")
+      expect(subject.get("locale_date")).to eq("Wednesday, 11 February 2015 -08:00")
     end
   end
 
@@ -115,10 +115,10 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
     CONFIG
 
     sample({ "mydate" => LogStash::Timestamp.at(1423718682), "pattern" => "EEEE, dd MMMM yyyy ZZ"}) do
-       expect(subject["locale_date"]).to eq("Wednesday, 11 February 2015 -08:00")
+       expect(subject.get("locale_date")).to eq("Wednesday, 11 February 2015 -08:00")
     end
     sample({ "mydate" => LogStash::Timestamp.at(1423718682), "pattern" => "yyyy-MM-dd'T'HH:mm:ss.SSSZZ"}) do
-       expect(subject["locale_date"]).to eq("2015-02-11T21:24:42.000-08:00")
+       expect(subject.get("locale_date")).to eq("2015-02-11T21:24:42.000-08:00")
     end
   end
 
@@ -167,8 +167,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::DateFormatter do
       CONFIG
 
       sample({ "mydate" => LogStash::Timestamp.at(1423718682), "pattern" => "yyyy-MM-ddabcdef"}) do
-        expect(subject["dateformatted"]).to be_nil
-        expect(subject["tags"]).to include("_dateformatfailure")
+        expect(subject.get("dateformatted")).to be_nil
+        expect(subject.get("tags")).to include("_dateformatfailure")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-date_formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Elasticsearch
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: