logstash-filter-date 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7e2d12c0916f9c311953e2306d722ec3f2a4c93
-  data.tar.gz: 805e03dcbaba174eca7cdd32d55335a38a8b8022
+  metadata.gz: b55acd38d75625d5aad84145a3ba0543b967e7c2
+  data.tar.gz: 468b66d39fe5bb0e766787f222618b76191d2a07
 SHA512:
-  metadata.gz: 07d32fb6f83437c27d232353d5f16a5f74c5c267f67f7a33bdc2b6a63082fa232c8c134c505d8733a211e5f3e7250e23158191ab26f4c8d992fc7d8b9f3e8a46
-  data.tar.gz: 410341d8a4c5d285c29281ef176fc31b49efef7aa94243a95bb57c81ea341533888f538a8cc0226e3923af3930f93e4e1c3c41fb758c85c65bd6ebb0bb9a6ac5
+  metadata.gz: 086fc7bf00a6c5e7346ee65b20ba5d998f9aaba9a9995ed30af065c8e7957c51a34bae96af80d127c7d2c95122c63d52f8bdb51b74649e47b6fee48f32f36dcf
+  data.tar.gz: 5e3521439c348673c5ad1d23dacbe770690db36a84cbd739ae2f37f0cd1c34a4d7041101ae3436319f80cde3916b3e71ad37560ddd16f394260f057e3a925fe0

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# 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
   - doc: Include formatting syntax documentation in match config #60 (fix for #38)
   - internal: correct dependencies scope

data/lib/logstash/filters/date.rb

@@ -24,6 +24,10 @@ class LogStash::Filters::Date < LogStash::Filters::Base
   if RUBY_ENGINE == "jruby"
     JavaException = java.lang.Exception
     UTC = org.joda.time.DateTimeZone.forID("UTC")
+    java_import org.joda.time.LocalDateTime
+    class LocalDateTime
+      java_alias :to_datetime_with_tz, :toDateTime, [Java::org.joda.time.DateTimeZone]
+    end
   end
 
   config_name "date"
@@ -185,22 +189,35 @@ class LogStash::Filters::Date < LogStash::Filters::Base
     setupMatcher(@config["match"].shift, locale, @config["match"] )
   end
 
-  def parseWithJodaParser(joda_parser, date, format_has_year)
+  def parseWithJodaParser(joda_parser, date, format_has_year, format_has_timezone)
     return joda_parser.parseMillis(date) if format_has_year
     now = Time.now
     now_month = now.month
-    result = joda_parser.parseDateTime(date)
+    if (format_has_timezone)
+      result = joda_parser.parseDateTime(date)
+    else
+      # Parse date in UTC, Timezone correction later
+      result = joda_parser.withZone(UTC).parseLocalDateTime(date)
+    end
+
     event_month = result.getMonthOfYear
 
     if (event_month == now_month)
-      result.with_year(now.year)
+      result = result.with_year(now.year)
     elsif (event_month == 12 && now_month == 1)
-      result.with_year(now.year-1)
+      result = result.with_year(now.year-1)
     elsif (event_month == 1 && now_month == 12)
-      result.with_year(now.year+1)
+      result = result.with_year(now.year+1)
     else
-      result.with_year(now.year)
-    end.get_millis
+      result = result.with_year(now.year)
+    end
+
+    if (format_has_timezone)
+      return result.get_millis
+    else
+      #Timezone correction
+      return result.to_datetime_with_tz(joda_parser.getZone()).get_millis
+    end
   end
 
   def setupMatcher(field, locale, value)
@@ -248,6 +265,7 @@ class LogStash::Filters::Date < LogStash::Filters::Base
         else
           begin
             format_has_year = format.match(/y|Y/)
+            format_has_timezone = format.match(/Z/)
             joda_parser = org.joda.time.format.DateTimeFormat.forPattern(format)
             if @timezone && !@sprintf_timezone
               joda_parser = joda_parser.withZone(org.joda.time.DateTimeZone.forID(@timezone))
@@ -259,11 +277,11 @@ class LogStash::Filters::Date < LogStash::Filters::Base
             end
             if @sprintf_timezone
               parsers << lambda { |date , tz|
-                return parseWithJodaParser(joda_parser.withZone(org.joda.time.DateTimeZone.forID(tz)), date, format_has_year)
+                return parseWithJodaParser(joda_parser.withZone(org.joda.time.DateTimeZone.forID(tz)), date, format_has_year, format_has_timezone)
               }
             end
             parsers << lambda do |date|
-              return parseWithJodaParser(joda_parser, date, format_has_year)
+              return parseWithJodaParser(joda_parser, date, format_has_year, format_has_timezone)
             end
 
             #Include a fallback parser to english when default locale is non-english
@@ -271,7 +289,7 @@ class LogStash::Filters::Date < LogStash::Filters::Base
               "en" != java.util.Locale.getDefault().getLanguage() &&
               (format.include?("MMM") || format.include?("E"))
               en_joda_parser = joda_parser.withLocale(java.util.Locale.forLanguageTag('en-US'))
-              parsers << lambda { |date| parseWithJodaParser(en_joda_parser, date, format_has_year) }
+              parsers << lambda { |date| parseWithJodaParser(en_joda_parser, date, format_has_year, format_has_timezone) }
             end
           rescue JavaException => e
             raise LogStash::ConfigurationError, I18n.t("logstash.agent.configuration.invalid_plugin_register",

data/logstash-filter-date.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-date'
-  s.version         = '2.1.5'
+  s.version         = '2.1.6'
   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"

data/spec/filters/date_spec.rb

@@ -386,6 +386,28 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     end # times.each
   end
 
+  describe "don't fail on next years DST switchover in CET" do
+    config <<-CONFIG
+      filter {
+        date {
+          match => [ "message", "yyyy MMM dd HH:mm:ss" ]
+          locale => "en"
+          timezone => "CET"
+        }
+      }
+    CONFIG
+
+    before(:each) do
+      logstash_time = Time.utc(2016,03,29,23,59,50)
+      allow(Time).to receive(:now).and_return(logstash_time)
+    end
+
+    sample "2016 Mar 26 02:00:37" do
+      insist { subject["tags"] } != ["_dateparsefailure"]
+      insist { subject["@timestamp"].to_s } == "2016-03-26T01:00:37.000Z"
+    end
+  end
+
   context "Default year handling when parsing with timezone from event" do
 
     describe "LOGSTASH-34 - Default year should be this year" do
@@ -445,6 +467,28 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
         insist { subject["@timestamp"].year } == 2014
       end
     end
+
+    describe "don't fail on next years DST switchover in CET" do
+      config <<-CONFIG
+        filter {
+          date {
+            match => [ "message", "MMM dd HH:mm:ss" ]
+            locale => "en"
+            timezone => "CET"
+          }
+        }
+      CONFIG
+
+      before(:each) do
+        logstash_time = Time.utc(2016,03,29,23,59,50)
+        allow(Time).to receive(:now).and_return(logstash_time)
+      end
+
+      sample "Mar 26 02:00:37" do
+        insist { subject["tags"] } != ["_dateparsefailure"]
+        insist { subject["@timestamp"].to_s } == "2016-03-26T01:00:37.000Z"
+      end
+    end
   end
 
   describe "LOGSTASH-34 - Default year should be this year" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-date
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement