Bring back support for grok patterns containing named groups with underscore #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
bernd
requested changes
Mar 22, 2019
|
|
||
| import io.krakens.grok.api.Converter.IConverter; | ||
|
|
||
| import com.google.code.regexp.Matcher; | ||
| import com.google.code.regexp.Pattern; | ||
|
|
There was a problem hiding this comment.
The commit that changed to java.util.regex in the upstream repository (thekrakken@bd098c3) changed the following in this file:
With your change we are still calling GrokUtils.namedGroups(m, m.group()); instead of the previous m.namedGroups(). Is that correct or do we need to use m.namedGroups() again?
| import java.util.regex.Matcher; | ||
|
|
||
| import com.google.code.regexp.Matcher; | ||
|
|
There was a problem hiding this comment.
Same as above, do we need to use m.namedGroups() here?
- Map<String, String> mappedw = this.match.namedGroups();
+ Map<String, String> mappedw = GrokUtils.namedGroups(this.match,this.subject);
The test originally assumed that name0 is the result with underscore. I have no idea why I thought this. The test now will test that a pattern with underscore will be returned proper after compilation
bernd
approved these changes
Mar 25, 2019
bernd
added a commit
to Graylog2/graylog2-server
that referenced
this pull request
Mar 25, 2019
To support underscores ("_") in Grok match group names, we had to modify
the java-grok library to use the old regexp engine again.
See: graylog-labs/java-grok#2
This also adds a test for the Grok extractor to make sure that using
underscores works.
Fixes #5704
Fixes #5563
kmerz
pushed a commit
to Graylog2/graylog2-server
that referenced
this pull request
Mar 26, 2019
* Switch back to a repackaged and fixed version of java-grok
To support underscores ("_") in Grok match group names, we had to modify
the java-grok library to use the old regexp engine again.
See: graylog-labs/java-grok#2
This also adds a test for the Grok extractor to make sure that using
underscores works.
Fixes #5704
Fixes #5563
* Fix GrokPatternService#extractPatternNames and add a test for it
* Add missing license header to GrokPatternServiceTest
* Add test for named group with underscore
Prior to this change, there was no test for named groups
with underscores in the FunctionSnippetsTest
This change enhances the grok() test to run with a
named group with underscore.
bernd
added a commit
to Graylog2/graylog2-server
that referenced
this pull request
Mar 26, 2019
* Switch back to a repackaged and fixed version of java-grok
To support underscores ("_") in Grok match group names, we had to modify
the java-grok library to use the old regexp engine again.
See: graylog-labs/java-grok#2
This also adds a test for the Grok extractor to make sure that using
underscores works.
Fixes #5704
Fixes #5563
* Fix GrokPatternService#extractPatternNames and add a test for it
* Add missing license header to GrokPatternServiceTest
* Add test for named group with underscore
Prior to this change, there was no test for named groups
with underscores in the FunctionSnippetsTest
This change enhances the grok() test to run with a
named group with underscore.
(cherry picked from commit e642a41)
kmerz
pushed a commit
to Graylog2/graylog2-server
that referenced
this pull request
Mar 26, 2019
…5807) * Switch back to a repackaged and fixed version of java-grok To support underscores ("_") in Grok match group names, we had to modify the java-grok library to use the old regexp engine again. See: graylog-labs/java-grok#2 This also adds a test for the Grok extractor to make sure that using underscores works. Fixes #5704 Fixes #5563 * Fix GrokPatternService#extractPatternNames and add a test for it * Add missing license header to GrokPatternServiceTest * Add test for named group with underscore Prior to this change, there was no test for named groups with underscores in the FunctionSnippetsTest This change enhances the grok() test to run with a named group with underscore. (cherry picked from commit e642a41)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Grok Patterns with named groups (
(?<name0>test)) can contain a name with a underscore ((?<my_name>test)).The java-grok library dropped the support unintentionally by moving the regex Engine from "named-regexp" to java (thekrakken#53).
To preserve the support this PR switches back from java to "named-regexp".