honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ingest: grok remove duplicated patterns (#35886) 

This commit removes the redundant (and incorrect) JAVACLASS
and JAVAFILE grok patterns. This helps to keep parity with 
Logstash's patterns. 

See also: https://github.com/logstash-plugins/logstash-patterns-core/pull/237
 
closes #35699
This commit is contained in:
John 2018-11-26 12:13:46 -05:00 committed by Jake Landis
parent 4b99a663c1
commit 0baffda390
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/grok/src/main/resources/patterns/java
View File

@ -7,8 +7,6 @@ JAVAMETHOD (?:(<init>)|[a-zA-Z$_][a-zA-Z$_0-9]*)
JAVASTACKTRACEPART %{SPACE}at %{JAVACLASS:class}\.%{JAVAMETHOD:method}\(%{JAVAFILE:file}(?::%{NUMBER:line})?\) JAVASTACKTRACEPART %{SPACE}at %{JAVACLASS:class}\.%{JAVAMETHOD:method}\(%{JAVAFILE:file}(?::%{NUMBER:line})?\)
# Java Logs # Java Logs
JAVATHREAD (?:[A-Z]{2}-Processor[\d]+) JAVATHREAD (?:[A-Z]{2}-Processor[\d]+)
JAVACLASS (?:[a-zA-Z0-9-]+\.)+[A-Za-z0-9$]+
JAVAFILE (?:[A-Za-z0-9_.-]+)
JAVASTACKTRACEPART at %{JAVACLASS:class}\.%{WORD:method}\(%{JAVAFILE:file}:%{NUMBER:line}\) JAVASTACKTRACEPART at %{JAVACLASS:class}\.%{WORD:method}\(%{JAVAFILE:file}:%{NUMBER:line}\)
JAVALOGMESSAGE (.*) JAVALOGMESSAGE (.*)
# MMM dd, yyyy HH:mm:ss eg: Jan 9, 2014 7:13:13 AM # MMM dd, yyyy HH:mm:ss eg: Jan 9, 2014 7:13:13 AM

10
libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java
View File

@ -477,6 +477,16 @@ public class GrokTests extends ESTestCase {
assertNull(matches); assertNull(matches);
} }
public void testJavaClassPatternWithUnderscore() {
Grok grok = new Grok(basePatterns, "%{JAVACLASS}");
assertThat(grok.match("Test_Class.class"), is(true));
}
public void testJavaFilePatternWithSpaces() {
Grok grok = new Grok(basePatterns, "%{JAVAFILE}");
assertThat(grok.match("Test Class.java"), is(true));
}
private void assertGrokedField(String fieldName) { private void assertGrokedField(String fieldName) {
String line = "foo"; String line = "foo";
Grok grok = new Grok(basePatterns, "%{WORD:" + fieldName + "}"); Grok grok = new Grok(basePatterns, "%{WORD:" + fieldName + "}");