logstash-filter-grok 4.3.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d8be42f7b846a0684d25d18ec624a81574b52e394df863afa004d458ecd915
-  data.tar.gz: 605d0cea73b747d9900bebfc2a99f59d2950300af7ef52ec5b9cb3f556a7d5fd
+  metadata.gz: 0d8ab6e291bb1b8412aa14aeba1e555b848ea04473c5e1b16672ef102751f828
+  data.tar.gz: db3d113bbb82463cc35036cb0680e91932dbd53dd456cb3a65f5eb79db544fbb
 SHA512:
-  metadata.gz: '096791bcc8691300c8e59aa8c6741d499c515b6fc70b3f7e4deea0c23440bce1875d98d7aaad0d6f8d8ab12dc526051e46e2a61b590422d646d7939221ec3fc7'
-  data.tar.gz: efe3dcc313d22e67986828351b365b9383c5c91d0a4caf8da78bd8c34126e7088d81ce9c672a6dc0758a9c3c4d1e4a2cae53e2df2c79bcd510848b69ecac9945
+  metadata.gz: 05d8ebab39fd928e10bd84b6586574fe0583b7a93b8692824ba3bdf0e197969b5c6532eb7d69aa0e703afe0836d17ddd5677fd9dbd09bfcdd955a836f1268ffe
+  data.tar.gz: 65bd577d0cc170883fba3ee5ca88f047aec62a03affd4bc63cc23708a660f4f2e8dfa18bdd0bce6cbde613975d20c0c7415e8a97f6eea4dfdbd264ea032c7ed2

data/CHANGELOG.md

@@ -1,8 +1,19 @@
+## 4.4.2
+  - Clarify the definition of matches that depend on previous captures [#169](https://github.com/logstash-plugins/logstash-filter-grok/pull/169)
+
+## 4.4.1
+ - Added preview of ECS v8 support using existing ECS v1 implementation [#175](https://github.com/logstash-plugins/logstash-filter-grok/pull/175)
+
+## 4.4.0
+ - Feat: ECS compatibility support [#162](https://github.com/logstash-plugins/logstash-filter-grok/pull/162)
+ 
+   The filter supports using built-in pattern definitions that are fully Elastic Common Schema (ECS) compliant.
+
 ## 4.3.0
- -  Added: added target support [#156](https://github.com/logstash-plugins/logstash-filter-grok/pull/156)
+ - Added: added target support [#156](https://github.com/logstash-plugins/logstash-filter-grok/pull/156)
 
 ## 4.2.0
- -  Added: support for timeout_scope [#153](https://github.com/logstash-plugins/logstash-filter-grok/pull/153)
+ - Added: support for timeout_scope [#153](https://github.com/logstash-plugins/logstash-filter-grok/pull/153)
 
 ## 4.1.1
  - Fix formatting for code sample [#148](https://github.com/logstash-plugins/logstash-filter-grok/pull/148)

data/LICENSE

@@ -1,13 +1,202 @@
-Copyright (c) 2012-2018 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-grok.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-grok)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-filter-grok.svg)](https://travis-ci.com/logstash-plugins/logstash-filter-grok)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/docs/index.asciidoc

@@ -175,6 +175,21 @@ Another option is to define patterns _inline_ in the filter using `pattern_defin
 This is mostly for convenience and allows user to define a pattern which can be used just in that 
 filter. This newly defined patterns in `pattern_definitions` will not be available outside of that particular `grok` filter.
 
+[id="plugins-{type}s-{plugin}-ecs"]
+==== Migrating to Elastic Common Schema (ECS)
+
+To ease migration to the {ecs-ref}[Elastic Common Schema (ECS)], the filter
+plugin offers a new set of ECS-compliant patterns in addition to the existing
+patterns. The new ECS pattern definitions capture event field names that are
+compliant with the schema.
+
+The ECS pattern set has all of the pattern definitions from the legacy set, and is
+a drop-in replacement. Use the <<plugins-{type}s-{plugin}-ecs_compatibility>>
+setting to switch modes. 
+
+New features and enhancements will be added to the ECS-compliant files. The
+legacy patterns may still receive bug fixes which are backwards compatible.
+
 
 [id="plugins-{type}s-{plugin}-options"]
 ==== Grok Filter Configuration Options
@@ -185,6 +200,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 |=======================================================================
 |Setting |Input type|Required
 | <<plugins-{type}s-{plugin}-break_on_match>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-ecs_compatibility>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-keep_empty_captures>> |<<boolean,boolean>>|No
 | <<plugins-{type}s-{plugin}-match>> |<<hash,hash>>|No
 | <<plugins-{type}s-{plugin}-named_captures_only>> |<<boolean,boolean>>|No
@@ -213,6 +229,20 @@ Break on first match. The first successful match by grok will result in the
 filter being finished. If you want grok to try all patterns (maybe you are
 parsing different things), then set this to false.
 
+[id="plugins-{type}s-{plugin}-ecs_compatibility"]
+===== `ecs_compatibility`
+
+* Value type is <<string,string>>
+* Supported values are:
+** `disabled`: the plugin will load legacy (built-in) pattern definitions
+** `v1`,`v8`: all patterns provided by the plugin will use ECS compliant captures
+* Default value depends on which version of Logstash is running:
+** When Logstash provides a `pipeline.ecs_compatibility` setting, its value is used as the default
+** Otherwise, the default value is `disabled`.
+
+Controls this plugin's compatibility with the {ecs-ref}[Elastic Common Schema (ECS)].
+The value of this setting affects extracted event field names when a composite pattern (such as `HTTPD_COMMONLOG`) is matched.
+
 [id="plugins-{type}s-{plugin}-keep_empty_captures"]
 ===== `keep_empty_captures` 
 
@@ -251,6 +281,36 @@ If you need to match multiple patterns against a single field, the value can be
         }
       }
     }
+    
+To perform matches on multiple fields just use multiple entries in the `match` hash:
+
+[source,ruby]
+    filter {
+      grok {
+        match => {
+          "speed" => "Speed: %{NUMBER:speed}"
+          "duration => "Duration: %{NUMBER:duration}"
+        }
+      }
+    }
+
+However, if one pattern depends on a field created by a previous pattern, separate these into two separate grok filters:
+
+
+[source,ruby]
+    filter {
+      grok {
+        match => {
+          "message" => "Hi, the rest of the message is: %{GREEDYDATA:rest}"
+        }
+      }
+      grok {
+        match => {
+          "rest => "a number %{NUMBER"number}, and a word %{WORD:word}"
+        }
+      }
+    }
+
 
 [id="plugins-{type}s-{plugin}-named_captures_only"]
 ===== `named_captures_only` 
@@ -283,6 +343,17 @@ overwrite the `message` field with part of the match like so:
 In this case, a line like `May 29 16:37:11 sadness logger: hello world`
 will be parsed and `hello world` will overwrite the original message.
 
+If you are using a field reference in `overwrite`, you must use the field 
+reference in the pattern. Example:
+[source,ruby]
+    filter {
+      grok {
+        match => { "somefield" => "%{NUMBER} %{GREEDYDATA:[nested][field][test]}" }
+        overwrite => [ "[nested][field][test]" ]
+      }
+    }
+
+
 [id="plugins-{type}s-{plugin}-pattern_definitions"]
 ===== `pattern_definitions` 
 

data/lib/logstash/filters/grok.rb

@@ -3,8 +3,8 @@
   require "logstash/namespace"
   require "logstash/environment"
   require "logstash/patterns/core"
+  require 'logstash/plugin_mixins/ecs_compatibility_support'
   require "grok-pure" # rubygem 'jls-grok'
-  require "set"
   require "timeout"
 
   # Parse arbitrary text and structure it.
@@ -144,6 +144,8 @@
   # filter. This newly defined patterns in `pattern_definitions` will not be available outside of that particular `grok` filter.
   #
   class LogStash::Filters::Grok < LogStash::Filters::Base
+    include LogStash::PluginMixins::ECSCompatibilitySupport
+
     config_name "grok"
 
     # A hash of matches of field => value
@@ -250,22 +252,14 @@
     # will be parsed and `hello world` will overwrite the original message.
     config :overwrite, :validate => :array, :default => []
 
-    # Register default pattern paths
-    @@patterns_path ||= Set.new
-    @@patterns_path += [
-      LogStash::Patterns::Core.path,
-      LogStash::Environment.pattern_path("*")
-    ]
-
     def register
       # a cache of capture name handler methods.
       @handlers = {}
 
       @patternfiles = []
-
-      # Have @@patterns_path show first. Last-in pattern definitions win; this
-      # will let folks redefine built-in patterns at runtime.
-      @patternfiles += patterns_files_from_paths(@@patterns_path.to_a, "*")
+      # Have (default) patterns_path show first. Last-in pattern definitions wins
+      # this will let folks redefine built-in patterns at runtime
+      @patternfiles += patterns_files_from_paths(patterns_path, "*")
       @patternfiles += patterns_files_from_paths(@patterns_dir, @patterns_files_glob)
 
       @patterns = Hash.new { |h,k| h[k] = [] }
@@ -278,11 +272,11 @@
         patterns = [patterns] if patterns.is_a?(String)
         @metric_match_fields.gauge(field, patterns.length)
 
-        @logger.trace("Grok compile", :field => field, :patterns => patterns)
+        @logger.trace? && @logger.trace("Grok compile", :field => field, :patterns => patterns)
         patterns.each do |pattern|
-          @logger.debug? and @logger.debug("regexp: #{@type}/#{field}", :pattern => pattern)
+          @logger.debug? && @logger.debug("regexp: #{@type}/#{field}", :pattern => pattern)
           grok = Grok.new
-          grok.logger = @logger unless @logger.nil?
+          grok.logger = @logger
           add_patterns_from_files(@patternfiles, grok)
           add_patterns_from_inline_definition(@pattern_definitions, grok)
           grok.compile(pattern, @named_captures_only)
@@ -301,15 +295,14 @@
     def filter(event)
       matched = false
 
-      @logger.debug? and @logger.debug("Running grok filter", :event => event)
+      @logger.debug? && @logger.debug("Running grok filter", :event => event.to_hash)
 
       @patterns.each do |field, groks|
         if match(groks, field, event)
           matched = true
           break if @break_on_match
         end
-        #break if done
-      end # @patterns.each
+      end
 
       if matched
         @match_counter.increment(1)
@@ -319,7 +312,7 @@
         @tag_on_failure.each {|tag| event.tag(tag)}
       end
 
-      @logger.debug? and @logger.debug("Event now: ", :event => event)
+      @logger.debug? && @logger.debug("Event now: ", :event => event.to_hash)
     rescue GrokTimeoutException => e
       @logger.warn(e.message)
       metric.increment(:timeouts)
@@ -331,6 +324,27 @@
 
     private
 
+    # The default pattern paths, depending on environment.
+    def patterns_path
+      patterns_path = []
+      case ecs_compatibility
+      when :disabled
+        patterns_path << LogStash::Patterns::Core.path # :legacy
+      when :v1
+        patterns_path << LogStash::Patterns::Core.path('ecs-v1')
+      when :v8
+        @logger.warn("ECS v8 support is a preview of the unreleased ECS v8, and uses the v1 patterns. When Version 8 of the Elastic Common Schema becomes available, this plugin will need to be updated")
+        patterns_path << LogStash::Patterns::Core.path('ecs-v1')
+      else
+        fail(NotImplementedError, "ECS #{ecs_compatibility} is not supported by this plugin.")
+      end
+      # allow plugin to be instantiated outside the LS environment (in tests)
+      if defined? LogStash::Environment.pattern_path
+        patterns_path << LogStash::Environment.pattern_path("*")
+      end
+      patterns_path
+    end
+
     def match(groks, field, event)
       input = event.get(field)
       if input.is_a?(Array)
@@ -343,7 +357,7 @@
         match_against_groks(groks, field, input, event)
       end
     rescue StandardError => e
-      @logger.warn("Grok regexp threw exception", :exception => e.message, :backtrace => e.backtrace, :class => e.class.name)
+      @logger.warn("Grok regexp threw exception", :message => e.message, :exception => e.class, :backtrace => e.backtrace)
       return false
     end
 

data/logstash-filter-grok.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
-
   s.name            = 'logstash-filter-grok'
-  s.version         = '4.3.0'
+  s.version         = '4.4.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Parses unstructured event data into fields"
   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"
@@ -22,10 +21,11 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency "logstash-core", ">= 5.6.0"
+  s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~> 1.0'
 
   s.add_runtime_dependency 'jls-grok', '~> 0.11.3'
   s.add_runtime_dependency 'stud', '~> 0.0.22'
-  s.add_runtime_dependency 'logstash-patterns-core'
+  s.add_runtime_dependency 'logstash-patterns-core', '>= 4.3.0', '< 5'
 
-  s.add_development_dependency 'logstash-devutils', '= 1.3.6'
+  s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/grok_performance_spec.rb

@@ -21,13 +21,7 @@ describe LogStash::Filters::Grok do
 
   describe "base-line performance", :performance => true do
 
-    EXPECTED_MIN_RATE = 15_000 # per second
-    # NOTE: based on Travis CI (docker) numbers :
-    # logstash_1_d010d1d29244 | LogStash::Filters::Grok
-    # logstash_1_d010d1d29244 |   base-line performance
-    # logstash_1_d010d1d29244 | filters/grok parse rate: 14464/sec, elapsed: 20.740866999999998s
-    # logstash_1_d010d1d29244 | filters/grok parse rate: 29957/sec, elapsed: 10.014199s
-    # logstash_1_d010d1d29244 | filters/grok parse rate: 32932/sec, elapsed: 9.109601999999999s
+    EXPECTED_MIN_RATE = 30_000 # per second - based on Travis CI (docker) numbers
 
     let(:config) do
       { 'match' => { "message" => "%{SYSLOGLINE}" }, 'overwrite' => [ "message" ] }
@@ -87,10 +81,9 @@ describe LogStash::Filters::Grok do
       puts "filters/grok(timeout => 0) warmed up in #{wout_timeout_duration}"
       before_sample!
       no_timeout_durations = Array.new(SAMPLE_COUNT).map do
-        duration = do_sample_filter(filter_wout_timeout)
-        puts "filters/grok(timeout => 0) took #{duration}"
-        duration
+        do_sample_filter(filter_wout_timeout)
       end
+      puts "filters/grok(timeout => 0) took #{no_timeout_durations}"
 
       expected_duration = avg(no_timeout_durations)
       expected_duration += (expected_duration / 100) * ACCEPTED_TIMEOUT_DEGRADATION
@@ -100,12 +93,17 @@ describe LogStash::Filters::Grok do
       with_timeout_duration = do_sample_filter(filter_with_timeout) # warmup
       puts "filters/grok(timeout_scope => event) warmed up in #{with_timeout_duration}"
 
-      before_sample!
-      expect do
-        duration = do_sample_filter(filter_with_timeout)
-        puts "filters/grok(timeout_scope => event) took #{duration}"
-        duration
-      end.to perform_under(expected_duration).sample(SAMPLE_COUNT).times
+      try(3) do
+        before_sample!
+        durations = []
+        begin
+          expect do
+            do_sample_filter(filter_with_timeout).tap { |duration| durations << duration }
+          end.to perform_under(expected_duration).sample(SAMPLE_COUNT).times
+        ensure
+          puts "filters/grok(timeout_scope => event) took #{durations}"
+        end
+      end
     end
 
     @private
@@ -119,10 +117,6 @@ describe LogStash::Filters::Grok do
       end
     end
 
-    def sample_event(hash)
-      LogStash::Event.new("message" => SAMPLE_MESSAGE)
-    end
-
   end
 
   @private

data/spec/filters/grok_spec.rb

@@ -38,6 +38,18 @@ describe LogStash::Filters::Grok do
       expect( event.get("pid") ).to eql "1713"
     end
 
+    %w(v1 v8).each do |ecs_mode|
+      context "in ecs mode #{ecs_mode}" do
+        let(:config) { super().merge('ecs_compatibility' => ecs_mode) }
+
+        it "matches pattern" do
+          expect( event.get("host") ).to eql "hostname"=>"evita"
+          expect( event.get("process") ).to eql "name"=>"postfix/smtpd", "pid"=>1713
+          expect( event.get("message") ).to eql "connect from camomile.cloud9.net[168.100.1.3]"
+        end
+      end
+    end
+
     context 'with target' do
       let(:config) { { "match" => { "message" => "%{SYSLOGLINE}" }, "target" => "grok" } }
 
@@ -393,15 +405,17 @@ describe LogStash::Filters::Grok do
           "message" => [
             "(.*f){20}", "(.*e){20}", "(.*d){20}", "(.*c){20}", "(.*b){20}",
             "(.*a){25}", "(.*a){24}", "(.*a){23}", "(.*a){22}", "(.*a){21}",
+            "(.*a){25}", "(.*a){24}", "(.*a){23}", "(.*a){22}", "(.*a){21}",
+            "(.*a){25}", "(.*a){24}", "(.*a){23}", "(.*a){22}", "(.*a){21}",
             "(.*a){20}"
           ]
         },
-        'timeout_millis' => 500,
+        'timeout_millis' => 750,
         'timeout_scope' => 'pattern'
       }
     }
 
-    sample( 'b' * 10 + 'c' * 10 + 'd' * 10 + 'e' * 10 + ' ' + 'a' * 20 ) do
+    sample( 'b' * 15 + 'c' * 15 + 'd' * 15 + 'e' * 15 + ' ' + 'a' * 20 ) do
       expect( event.get("tags") ).to be nil
     end
   end
@@ -413,15 +427,17 @@ describe LogStash::Filters::Grok do
           "message" => [
             "(.*f){20}", "(.*e){20}", "(.*d){20}", "(.*c){20}", "(.*b){20}",
             "(.*a){25}", "(.*a){24}", "(.*a){23}", "(.*a){22}", "(.*a){21}",
+            "(.*a){25}", "(.*a){24}", "(.*a){23}", "(.*a){22}", "(.*a){21}",
+            "(.*a){25}", "(.*a){24}", "(.*a){23}", "(.*a){22}", "(.*a){21}",
             "(.*a){20}"
           ]
         },
-        'timeout_millis' => 500,
+        'timeout_millis' => 750,
         'timeout_scope' => 'event'
       }
     }
 
-    sample( 'b' * 10 + 'c' * 10 + 'd' * 10 + 'e' * 10 + ' ' + 'a' * 20 ) do
+    sample( 'b' * 15 + 'c' * 15 + 'd' * 15 + 'e' * 15 + ' ' + 'a' * 20 ) do
       expect( event.get("tags") ).to include("_groktimeout")
       expect( event.get("tags") ).not_to include("_grokparsefailure")
     end
@@ -687,7 +703,7 @@ describe LogStash::Filters::Grok do
       expect( LogStash::Json.dump(event.get('username')) ).to eql "\"testuser\""
 
       expect( event.to_json ).to match %r|"src_ip":"1.1.1.1"|
-      expect( event.to_json ).to match %r|"@timestamp":"20\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ"|
+      expect( event.to_json ).to match %r|"@timestamp":"#{Regexp.escape(event.get('@timestamp').to_s)}"|
       expect( event.to_json ).to match %r|"port":"22"|
       expect( event.to_json ).to match %r|"@version":"1"|
       expect( event.to_json ).to match %r|"username"|i
@@ -755,6 +771,26 @@ describe LogStash::Filters::Grok do
   end
 end
 
+describe LogStash::Filters::Grok do
+
+  subject(:grok_filter) { described_class.new(config) }
+  let(:config) { {} }
+
+  context 'when initialized with `ecs_compatibility => v8`' do
+    let(:config) { super().merge("ecs_compatibility" => "v8", "match" => ["message", "%{SYSLOGLINE}"]) }
+    context '#register' do
+      let(:logger_stub) { double('Logger').as_null_object }
+      before(:each) { allow_any_instance_of(described_class).to receive(:logger).and_return(logger_stub)}
+
+      it 'logs a helpful warning about the unreleased v8' do
+        grok_filter.register
+
+        expect(logger_stub).to have_received(:warn).with(a_string_including "preview of the unreleased ECS v8")
+      end
+    end
+  end
+end
+
 describe LogStash::Filters::Grok do
   describe "(LEGACY)" do
     describe "patterns in the 'patterns/' dir override core patterns" do
@@ -774,7 +810,7 @@ describe LogStash::Filters::Grok do
       end
 
       sample("message" => 'hello') do
-        insist { subject.get("tags") } == ["_grokparsefailure"]
+        expect(subject.get("tags")).to eql ["_grokparsefailure"]
       end
 
       after do
@@ -804,7 +840,7 @@ describe LogStash::Filters::Grok do
       end
 
       sample("message" => '0') do
-        insist { subject.get("tags") } == nil
+        expect(subject.get("tags")).to be nil
       end
 
       after do
@@ -833,7 +869,7 @@ describe LogStash::Filters::Grok do
       end
 
       sample("message" => '0') do
-        insist { subject.get("tags") } == nil
+        expect(subject.get("tags")).to be nil
       end
 
       after do
@@ -859,7 +895,7 @@ describe LogStash::Filters::Grok do
       end
 
       sample("message" => '0') do
-        insist { subject.get("tags") } == nil
+        expect(subject.get("tags")).to be nil
       end
 
       after do
@@ -879,17 +915,17 @@ describe LogStash::Filters::Grok do
       CONFIG
 
       sample "treebranch" do
-        insist { subject.get("name2") } == "branch"
+        expect(subject.get("name2")).to eql "branch"
       end
 
       sample "bushbeard" do
-        insist { subject.get("name1") } == "bush"
+        expect(subject.get("name1")).to eql "bush"
       end
 
       sample "treebeard" do
-        insist { subject.get("name1") } == "tree"
-        insist { subject.get("name2") } == "beard"
+        expect(subject.get("name1")).to eql "tree"
+        expect(subject.get("name2")).to eql "beard"
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-grok
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.6.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  name: logstash-mixin-ecs_compatibility_support
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -77,7 +91,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   name: logstash-patterns-core
   prerelease: false
   type: :runtime
@@ -85,21 +102,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        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
@@ -141,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Parses unstructured event data into fields