logstash-filter-date 3.1.5 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 560d311715c0a4a9fd5dce66347ac0454e8a0f9b
-  data.tar.gz: 16c331c55c8ee5473e7bd15b61cf984e3e02c26f
+SHA256:
+  metadata.gz: 31ec569a82c028d4cfe9e52115362fe5e9a62003a027e9353eadfe3cfd4b7849
+  data.tar.gz: b1502448af6b5021b3c36f698a8f1d72c001c1648d52b67bfbc5f38dbd555ca8
 SHA512:
-  metadata.gz: 4e2309227ddbc2945a328c27bf26bb2f3c48b86fe96797442bc919761079e1749282936532661923c225746699f7458529b1d2cd768d18d9e93f86513423d733
-  data.tar.gz: 6c41b484930ee043e2b19bc5725f59312ae69c27a7b732ea2ebfeb5d38c1359fa87cbacaf6d9ddbff5e3af5947969e8f8333bacf7390551e3bf02388445afcd2
+  metadata.gz: 110d7d64870d88e88392a09cabb58ce7b210da31e603030b7527207157289e0f99b549900e38d6d1f3ecf4c6242ad226d1fde11023595e63677b26b9758d43f2
+  data.tar.gz: 33d314cacf14063e6764a26908ca6a67766e233e93aad520dd18a8a55ca8db83e8ee5632a5293baa90bf50a13e6b31b3820fdeb81e24477ef49b9383e9b0e82d

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 3.1.11
+  - Internal: upgrade packaging tooling to Gradle 7 so that plugin can be packaged on modern Java releases [#140](https://github.com/logstash-plugins/logstash-filter-date/pull/140)
+  - Internal: refined spec and unit test assertions to account for changes in how timestamps are serialised in Logstash 8. [#141](https://github.com/logstash-plugins/logstash-filter-date/pull/141)
+  - Update log4j dependencies [#142](https://github.com/logstash-plugins/logstash-filter-date/pull/142)
+## 3.1.10
+  - Build against JRuby 9k #116
+  - Fix build failure #114
+  
+## 3.1.9
+  - Update gemspec summary
+
+## 3.1.8
+  - Fix some documentation issues
+
+## 3.1.6
+  - Fix #97 With "ISO8601" format and timezone interpolation, Joda complains at plugin startup
+  - Fix skipped DST test, caused by incorrect year guess logic, see comment in test spec/filters/date_spec.rb:540
+
 ## 3.1.5
   - Ignore cancelled events
 
@@ -49,7 +67,7 @@
  - use Event#tag, relax specs for Java Event, code cleanups
 
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - 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/CONTRIBUTORS

@@ -25,6 +25,7 @@ Contributors:
 * Richard Pijnenburg (electrical)
 * Suyog Rao (suyograo)
 * debadair
+* Guy Boertje (guyboertje)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in logstash-mass_effect.gemspec
 gemspec
+
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
+
+if Dir.exist?(logstash_path) && use_logstash_source
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end

data/LICENSE

@@ -1,13 +1,202 @@
-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.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Elastic and contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-date.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-date)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-filter-date.svg)](https://travis-ci.com/logstash-plugins/logstash-filter-date)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/docs/index.asciidoc

@@ -0,0 +1,215 @@
+:plugin: date
+:type: filter
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}s-{plugin}"]
+
+=== Date filter plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+The date filter is used for parsing dates from fields, and then using that
+date or timestamp as the logstash timestamp for the event.
+
+For example, syslog events usually have timestamps like this:
+[source,ruby]
+    "Apr 17 09:32:01"
+
+You would use the date format `MMM dd HH:mm:ss` to parse this.
+
+The date filter is especially important for sorting events and for
+backfilling old data. If you don't get the date correct in your
+event, then searching for them later will likely sort out of order.
+
+In the absence of this filter, logstash will choose a timestamp based on the
+first time it sees the event (at input time), if the timestamp is not already
+set in the event. For example, with file input, the timestamp is set to the
+time of each read.
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Date Filter Configuration Options
+
+This plugin supports the following configuration options plus the <<plugins-{type}s-{plugin}-common-options>> described later.
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-locale>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-match>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-tag_on_failure>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-target>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-timezone>> |<<string,string>>|No
+|=======================================================================
+
+Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
+filter plugins.
+
+&nbsp;
+
+[id="plugins-{type}s-{plugin}-locale"]
+===== `locale` 
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+
+Specify a locale to be used for date parsing using either IETF-BCP47 or POSIX language tag.
+Simple examples are `en`,`en-US` for BCP47 or `en_US` for POSIX.
+
+The locale is mostly necessary to be set for parsing month names (pattern with `MMM`) and
+weekday names (pattern with `EEE`).
+
+If not specified, the platform default will be used but for non-english platform default
+an english parser will also be used as a fallback mechanism.
+
+[id="plugins-{type}s-{plugin}-match"]
+===== `match` 
+
+  * Value type is <<array,array>>
+  * Default value is `[]`
+
+An array with field name first, and format patterns following, `[ field,
+formats... ]`
+
+If your time field has multiple possible formats, you can do this:
+[source,ruby]
+    match => [ "logdate", "MMM dd yyyy HH:mm:ss",
+              "MMM  d yyyy HH:mm:ss", "ISO8601" ]
+
+The above will match a syslog (rfc3164) or `iso8601` timestamp.
+
+There are a few special exceptions. The following format literals exist
+to help you save time and ensure correctness of date parsing.
+
+* `ISO8601` - should parse any valid ISO8601 timestamp, such as
+  `2011-04-19T03:44:01.103Z`
+* `UNIX` - will parse *float or int* value expressing unix time in seconds since epoch like 1326149001.132 as well as 1326149001
+* `UNIX_MS` - will parse **int** value expressing unix time in milliseconds since epoch like 1366125117000
+* `TAI64N` - will parse tai64n time values
+
+For example, if you have a field `logdate`, with a value that looks like
+`Aug 13 2010 00:03:44`, you would use this configuration:
+[source,ruby]
+    filter {
+      date {
+        match => [ "logdate", "MMM dd yyyy HH:mm:ss" ]
+      }
+    }
+
+If your field is nested in your structure, you can use the nested
+syntax `[foo][bar]` to match its value. For more information, please refer to
+<<logstash-config-field-references>>
+
+*More details on the syntax*
+
+The syntax used for parsing date and time text uses letters to indicate the
+kind of time value (month, minute, etc), and a repetition of letters to
+indicate the form of that value (2-digit month, full month name, etc).
+
+Here's what you can use to parse dates and times:
+
+[horizontal]
+y:: year
+  yyyy::: full year number. Example: `2015`.
+  yy::: two-digit year. Example: `15` for the year 2015.
+
+M:: month of the year
+  M::: minimal-digit month. Example: `1` for January and `12` for December.
+  MM::: two-digit month. zero-padded if needed. Example: `01` for January  and `12` for December
+  MMM::: abbreviated month text. Example: `Jan` for January. Note: The language used depends on your locale. See the `locale` setting for how to change the language.
+  MMMM::: full month text, Example: `January`. Note: The language used depends on your locale.
+
+d:: day of the month
+  d::: minimal-digit day. Example: `1` for the 1st of the month.
+  dd::: two-digit day, zero-padded if needed. Example: `01` for the 1st of the month.
+
+H:: hour of the day (24-hour clock)
+  H::: minimal-digit hour. Example: `0` for midnight.
+  HH::: two-digit hour, zero-padded if needed. Example: `00` for midnight.
+
+m:: minutes of the hour (60 minutes per hour)
+  m::: minimal-digit minutes. Example: `0`.
+  mm::: two-digit minutes, zero-padded if needed. Example: `00`.
+
+s:: seconds of the minute (60 seconds per minute)
+  s::: minimal-digit seconds. Example: `0`.
+  ss::: two-digit seconds, zero-padded if needed. Example: `00`.
+
+S:: fraction of a second
+  *Maximum precision is milliseconds (`SSS`). Beyond that, zeroes are appended.*
+  S::: tenths of a second. Example:  `0` for a subsecond value `012`
+  SS::: hundredths of a second. Example:  `01` for a subsecond value `01`
+  SSS::: thousandths of a second. Example:  `012` for a subsecond value `012`
+
+Z:: time zone offset or identity
+  Z::: Timezone offset structured as HHmm (hour and minutes offset from Zulu/UTC). Example: `-0700`.
+  ZZ::: Timezone offset structured as HH:mm (colon in between hour and minute offsets). Example: `-07:00`.
+  ZZZ::: Timezone identity. Example: `America/Los_Angeles`. Note: Valid IDs are listed on the http://joda-time.sourceforge.net/timezones.html[Joda.org available time zones page].
+
+z:: time zone names. *Time zone names ('z') cannot be parsed.*
+
+w:: week of the year
+  w::: minimal-digit week. Example: `1`.
+  ww::: two-digit week, zero-padded if needed. Example: `01`.
+
+D:: day of the year
+
+e:: day of the week (number)
+
+E:: day of the week (text)
+  E, EE, EEE::: Abbreviated day of the week. Example:  `Mon`, `Tue`, `Wed`, `Thu`, `Fri`, `Sat`, `Sun`. Note: The actual language of this will depend on your locale.
+  EEEE::: The full text day of the week. Example: `Monday`, `Tuesday`, ... Note: The actual language of this will depend on your locale.
+
+For non-formatting syntax, you'll need to put single-quote characters around the value. For example, if you were parsing ISO8601 time, "2015-01-01T01:12:23" that little "T" isn't a valid time format, and you want to say "literally, a T", your format would be this: "yyyy-MM-dd'T'HH:mm:ss"
+
+Other less common date units, such as era (G), century \(C), am/pm (a), and # more, can be learned about on the
+http://www.joda.org/joda-time/key_format.html[joda-time documentation].
+
+[id="plugins-{type}s-{plugin}-tag_on_failure"]
+===== `tag_on_failure` 
+
+  * Value type is <<array,array>>
+  * Default value is `["_dateparsefailure"]`
+
+Append values to the `tags` field when there has been no
+successful match
+
+[id="plugins-{type}s-{plugin}-target"]
+===== `target` 
+
+  * Value type is <<string,string>>
+  * Default value is `"@timestamp"`
+
+Store the matching timestamp into the given target field.  If not provided,
+default to updating the `@timestamp` field of the event.
+
+[id="plugins-{type}s-{plugin}-timezone"]
+===== `timezone` 
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+
+Specify a time zone canonical ID to be used for date parsing.
+The valid IDs are listed on the http://joda-time.sourceforge.net/timezones.html[Joda.org available time zones page].
+This is useful in case the time zone cannot be extracted from the value,
+and is not the platform default.
+If this is not specified the platform default will be used.
+Canonical ID is good as it takes care of daylight saving time for you
+For example, `America/Los_Angeles` or `Europe/Paris` are valid IDs.
+This field can be dynamic and include parts of the event using the `%{field}` syntax
+
+
+
+[id="plugins-{type}s-{plugin}-common-options"]
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash-filter-date_jars.rb

@@ -1,4 +1,4 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('org.logstash.filters', 'logstash-filter-date', '3.1.0')
+require_jar('org.logstash.filters', 'logstash-filter-date', '3.1.6')

data/logstash-filter-date.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-date'
-  s.version         = '3.1.5'
+  s.version         = '3.1.11'
   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.summary         = "Parses dates from fields to use as the Logstash timestamp for an event"
   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'
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib", "vendor/jar-dependencies"]
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT', "vendor/jar-dependencies/**/*.jar"]
+  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-input-generator'
   s.add_development_dependency 'logstash-codec-json'
   s.add_development_dependency 'logstash-output-null'
-  s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-devutils', '>= 2.3'
+  s.add_development_dependency 'insist'
   s.add_development_dependency 'benchmark-ips'
 end
 

data/spec/filters/date_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require "logstash/devutils/rspec/spec_helper"
+require "insist"
 require "logstash/filters/date"
 
 puts "Skipping date performance tests because this ruby is not jruby" if RUBY_ENGINE != "jruby"
@@ -127,7 +128,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     #Invalid value should not be evaluated to zero (String#to_i madness)
     sample("mydate" => "%{bad_value}") do
       insist { subject.get("mydate") } == "%{bad_value}"
-      insist { subject.get("@timestamp") } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
     end
   end
 
@@ -155,15 +156,16 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     #Invalid value should not be evaluated to zero (String#to_i madness)
     sample("mydate" => "%{bad_value}") do
       insist { subject.get("mydate") } == "%{bad_value}"
-      insist { subject.get("@timestamp") } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
+      insist { subject.get("@timestamp").time } != Time.iso8601("1970-01-01T00:00:00.000Z").utc
     end
 
     # Regression test
-    # Support numeric values that come through the JSON parser. These numbers appear as BigDecimal 
+    # Support numeric values that come through the JSON parser. These numbers appear as BigDecimal
     # instead of Float.
     sample(LogStash::Json.load('{ "mydate": 1350414944.123456 }')) do
-      insist { subject.get("mydate") } == 1350414944.123456
-      p subject.to_hash
+      # its generally problematic to compare different Floating Point class implementations using equals
+      # because they can't always represent a value exactly.
+      insist { subject.get("mydate") } == BigDecimal.new("1350414944.123456")
       insist { subject.get("@timestamp").time } == Time.iso8601("2012-10-16T12:15:44.123-07:00").utc
     end
   end
@@ -191,7 +193,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     times.each do |input, output|
       sample("mydate" => input) do
         insist { subject.get("mydate") } == input
-        insist { subject.get("@timestamp").time } == Time.iso8601(output)
+        insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
       end
     end # times.each
   end
@@ -223,7 +225,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     times.each do |input, output|
       sample("mydate" => input) do
         insist { subject.get("mydate") } == input
-        insist { subject.get("@timestamp").time } == Time.iso8601(output)
+        insist { subject.get("@timestamp").time } == Time.iso8601(output).utc
       end
     end # times.each
   end
@@ -323,7 +325,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     CONFIG
 
     sample("thedate" => "2013/Apr/21") do
-      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      expected = Time.iso8601("2013-04-21T00:00:00.000Z").utc
+      expect(subject.get("@timestamp").time).not_to eq(expected)
     end
   end
 
@@ -333,12 +336,14 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
         date {
           match => [ "thedate", "yyyy/MM/dd" ]
           add_tag => "tagged"
+          timezone => "UTC"
         }
       }
     CONFIG
 
     sample("thedate" => "2013/04/21") do
-      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      expected = Time.iso8601("2013-04-21T00:00:00.000Z").utc
+      expect(subject.get("@timestamp").time).to eq(expected)
       insist { subject.get("tags") } == ["tagged"]
     end
   end
@@ -349,12 +354,14 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
         date {
           match => [ "thedate", "yyyy/MM/dd" ]
           add_tag => "tagged"
+          timezone => "UTC"
         }
       }
     CONFIG
 
     sample("thedate" => "2013/Apr/21") do
-      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      expected = Time.iso8601("2013-04-21T00:00:00.000Z").utc
+      expect(subject.get("@timestamp").time).not_to eq(expected)
       reject { subject.get("tags") }.include? "tagged"
     end
   end
@@ -365,12 +372,14 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
         date {
           match => [ "thedate", "yyyy/MM/dd" ]
           tag_on_failure => ["date_failed"]
+          timezone => "UTC"
         }
       }
     CONFIG
 
     sample("thedate" => "2013/Apr/21") do
-      insist { subject.get("@timestamp") } != "2013-04-21T00:00:00.000Z"
+      expected = Time.iso8601("2013-04-21T00:00:00.000Z").utc
+      expect(subject.get("@timestamp").time).not_to eq(expected)
       insist { subject.get("tags") }.include? "date_failed"
     end
   end
@@ -423,6 +432,35 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     end # times.each
   end
 
+  describe "parsing IS08601 with timezone from event" do
+    config <<-CONFIG
+      filter {
+        date {
+          match => ["mydate", "ISO8601"]
+          locale => "en"
+          timezone => "%{mytz}"
+        }
+      }
+    CONFIG
+
+    require 'java'
+
+    # Venezuela changed from -4:00 to -4:30 at 03:00 on Sun, 9 Dec 2007
+    sample("mydate" => "2007-12-09T01:00:00", "mytz" => "America/Caracas") do
+      expect(subject.get("mydate")).to eq("2007-12-09T01:00:00")
+      expect(subject.get("@timestamp").time).to eq(Time.iso8601("2007-12-09T05:00:00.000Z").utc)
+    end
+    sample("mydate" => "2007-12-09T10:00:00", "mytz" => "America/Caracas") do
+      expect(subject.get("mydate")).to eq("2007-12-09T10:00:00")
+      expect(subject.get("@timestamp").time).to eq(Time.iso8601("2007-12-09T14:30:00.000Z").utc)
+    end
+    # Venezuela changed from -4:30 to -4:00 at 02:30 on Sunday, 1 May 2016
+    sample("mydate" => "2016-05-01T08:18:18.123", "mytz" => "America/Caracas") do
+      expect(subject.get("mydate")).to eq("2016-05-01T08:18:18.123")
+      expect(subject.get("@timestamp").time).to eq(Time.iso8601("2016-05-01T12:18:18.123Z").utc)
+    end
+  end
+
   describe "don't fail on next years DST switchover in CET" do
     config <<-CONFIG
       filter {
@@ -440,9 +478,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
     end
 
     sample "2016 Mar 26 02:00:37" do
-      p :subject => subject
       insist { subject.get("tags") } != ["_dateparsefailure"]
-      insist { subject.get("@timestamp").to_s } == "2016-03-26T01:00:37.000Z"
+      expect(subject.get("@timestamp")).to be_a_logstash_timestamp_equivalent_to("2016-03-26T01:00:37.000Z")
     end
   end
 
@@ -508,7 +545,14 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
       end
     end
 
-    describe "don't fail on next years DST switchover in CET", :skip => "This test tries to parse a time that doesn't exist. '02:00:37' is a time that doesn't exist because this DST switch goes from 01:59:59 to 03:00:00, skipping 2am entirely. I don't know how this spec ever passed..." do
+    describe "do fail on 2016 DST switchover in CET" do
+      # This test tries to parse a time that doesn't exist. '02:00:01' is a time that doesn't exist
+      # because this DST switch goes from 01:59:59 to 03:00:00, skipping 2am entirely. The last Sunday of March in 2016 was 27th.
+      # (Guy Boertje) Fixed the GuessYear logic
+      # Joda has a default year for DateTimeFormat of 2000
+      # meaning that the initial time parsed was Monday 2000-03-27 02:00:01 and the last Sunday of March in 2000 was the 26th
+      # then by adding the year of 2016 creates an invalid time
+      # The parser default now takes the year from the DefaultClock in the JodaParser
       config <<-CONFIG
         filter {
           date {
@@ -525,9 +569,18 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Date do
         org.logstash.filters.parser.JodaParser.setDefaultClock { org.joda.time.DateTime.new(2016,03,29,23,59,50, org.joda.time.DateTimeZone::UTC ) }
       end
 
-      sample "Mar 26 02:00:37" do
-        insist { subject.get("tags") } != ["_dateparsefailure"]
-        insist { subject.get("@timestamp").to_s } == "2016-03-26T01:00:37.000Z"
+      sample "Mar 27 01:59:59" do
+        expect(subject.get("tags")).to be_nil
+        expect(subject.get("@timestamp")).to be_a_logstash_timestamp_equivalent_to("2016-03-27T00:59:59.000Z")
+      end
+
+      sample "Mar 27 02:00:01" do
+        expect(subject.get("tags")).to eq ["_dateparsefailure"]
+      end
+
+      sample "Mar 27 03:00:01" do
+        expect(subject.get("tags")).to be_nil
+        expect(subject.get("@timestamp")).to be_a_logstash_timestamp_equivalent_to("2016-03-27T01:00:01.000Z")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-date
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.11
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -77,10 +77,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   name: logstash-devutils
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: insist
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,7 +114,9 @@ dependencies:
     - - ">="
       - !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
+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: []
@@ -112,12 +128,13 @@ files:
 - LICENSE
 - NOTICE.TXT
 - README.md
+- docs/index.asciidoc
 - lib/logstash-filter-date_jars.rb
 - lib/logstash/filters/date.rb
 - logstash-filter-date.gemspec
 - spec/filters/date_spec.rb
 - spec/fixtures/old_date_filter.rb
-- vendor/jar-dependencies/org/logstash/filters/logstash-filter-date/3.1.0/logstash-filter-date-3.1.0.jar
+- vendor/jar-dependencies/org/logstash/filters/logstash-filter-date/3.1.6/logstash-filter-date-3.1.6.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -140,11 +157,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 3.1.6
 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: Parses dates from fields to use as the Logstash timestamp for an event
 test_files:
 - spec/filters/date_spec.rb
 - spec/fixtures/old_date_filter.rb