This is an automated email from the ASF dual-hosted git repository.
otto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push:
new 43f74fc METRON-2185 Update Simple-Syslog dependency to fix error in
Structured Data (ottobackwards) closes apache/metron#1466
43f74fc is described below
commit 43f74fc91a24ea2b24f5a41038cdf46d3d883fa1
Author: ottobackwards <ottobackwa...@gmail.com>
AuthorDate: Fri Jul 19 10:10:04 2019 -0400
METRON-2185 Update Simple-Syslog dependency to fix error in Structured Data
(ottobackwards) closes apache/metron#1466
---
dependencies_with_url.csv | 2 +-
.../src/main/sample/data/syslog5424/parsed/Syslog5424Parsed | 4 ++--
.../src/main/sample/data/syslog5424/raw/Syslog5424Output | 4 ++--
.../java/org/apache/metron/parsers/syslog/Syslog5424ParserTest.java | 6 +++---
pom.xml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dependencies_with_url.csv b/dependencies_with_url.csv
index 04f7935..595cf0e 100644
--- a/dependencies_with_url.csv
+++ b/dependencies_with_url.csv
@@ -494,7 +494,7 @@ org.sonatype.sisu:sisu-inject-bean:jar:2.2.2:compile
org.sonatype.sisu:sisu-inject-plexus:jar:2.2.2:compile
com.zaxxer:HikariCP:jar:2.7.8:compile,ASLv2,https://github.com/brettwooldridge/HikariCP
org.hibernate.validator:hibernate-validator:jar:6.0.9.Final:compile,ASLv2,https://github.com/hibernate/hibernate-validator
-com.github.palindromicity:simple-syslog:jar:0.0.1:compile,ASLv2,https://github.com/palindromicity/simple-syslog
+com.github.palindromicity:simple-syslog:jar:0.0.3:compile,ASLv2,https://github.com/palindromicity/simple-syslog
org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
org.elasticsearch.plugin:aggs-matrix-stats-client:jar:5.6.14:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
org.fusesource.jansi:jansi:jar:1.16:compile,ASLv2,https://github.com/fusesource/jansi/blob/master/license.txt
diff --git
a/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/parsed/Syslog5424Parsed
b/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/parsed/Syslog5424Parsed
index ee1c6f6..82ebf15 100644
---
a/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/parsed/Syslog5424Parsed
+++
b/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/parsed/Syslog5424Parsed
@@ -1,3 +1,3 @@
{"syslog.header.hostName":"loggregator","syslog.header.facility":"1","syslog.header.timestamp":"2014-06-20T09:14:07+00:00","syslog.message":"Removing
instance","syslog.header.pri":"14","syslog.header.procId":"DEA","syslog.header.severity":"6","source.type":"syslog5424","syslog.header.appName":"d0602076-b14a-4c55-852a-981e7afeed38","syslog.header.version":"1","original_string":"<14>1
2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA
- - Removing instance","sys [...]
-{"syslog.structureddata.examples...@32480.iut":"4","syslog.structuredData.exampleSDID@32480.eventSource":"Other
Application","syslog.header.hostName":"loggregator","syslog.header.facility":"1","syslog.structuredData.exampleSDID@32480.eventID":"2022","syslog.structuredData.exampleSDID@32473.eventSource":"Application","syslog.header.timestamp":"2014-06-20T09:14:08+00:00","syslog.message":"Removing
instance","syslog.header.pri":"14","syslog.header.procId":"DEA","syslog.header.severity":"6",
[...]
-{"syslog.structureddata.examples...@32480.iut":"4","syslog.structuredData.exampleSDID@32480.eventSource":"Other
Application","syslog.structureddata.examples...@32474.iut":"3","syslog.structuredData.exampleSDID@32474.eventID":"1011","syslog.header.hostName":"loggregator","syslog.header.facility":"1","syslog.structuredData.exampleSDID@32480.eventID":"2022","syslog.header.timestamp":"2014-06-20T09:14:09+00:00","syslog.message":"Removing
instance","syslog.header.pri":"14","syslog.header.proc [...]
\ No newline at end of file
+{"syslog.structureddata.examples...@32480.iut":"4","syslog.structuredData.exampleSDID@32480.eventSource":"Other
Application","syslog.header.hostName":"loggregator","syslog.header.facility":"1","syslog.structuredData.exampleSDID@32480.eventID":"2022","syslog.structuredData.exampleSDID@32473.eventSource":"Application","syslog.header.timestamp":"2014-06-20T09:14:08+00:00","syslog.message":"Removing
instance","syslog.header.pri":"14","syslog.header.procId":"DEA","syslog.header.severity":"6",
[...]
+{"syslog.structureddata.examples...@32480.iut":"4","syslog.structuredData.exampleSDID@32480.eventSource":"Other
Application","syslog.structureddata.examples...@32474.iut":"3","syslog.structuredData.exampleSDID@32474.eventID":"1011","syslog.header.hostName":"loggregator","syslog.header.facility":"1","syslog.structuredData.exampleSDID@32480.eventID":"2022","syslog.header.timestamp":"2014-06-20T09:14:09+00:00","syslog.message":"Removing
instance","syslog.header.pri":"14","syslog.header.proc [...]
\ No newline at end of file
diff --git
a/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/raw/Syslog5424Output
b/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/raw/Syslog5424Output
index 869797a..01b7e2b 100644
---
a/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/raw/Syslog5424Output
+++
b/metron-platform/metron-integration-test/src/main/sample/data/syslog5424/raw/Syslog5424Output
@@ -1,3 +1,3 @@
<14>1 2014-06-20T09:14:07+00:00 loggregator
d0602076-b14a-4c55-852a-981e7afeed38 DEA - - Removing instance
-<14>1 2014-06-20T09:14:08+00:00 loggregator
d0602076-b14a-4c55-852a-981e7afeed40 DEA MSG-02 [exampleSDID@32473 iut="3"
eventSource="Application" eventID="1011"] [exampleSDID@32480 iut="4"
eventSource="Other Application" eventID="2022"] Removing instance
-<14>1 2014-06-20T09:14:09+00:00 loggregator
d0602076-b14a-4c55-852a-981e7afeed42 DEA MSG-03 [exampleSDID@32474 iut="3"
eventSource="Application" eventID="1011"] [exampleSDID@32480 iut="4"
eventSource="Other Application" eventID="2022"] Removing instance
\ No newline at end of file
+<14>1 2014-06-20T09:14:08+00:00 loggregator
d0602076-b14a-4c55-852a-981e7afeed40 DEA MSG-02 [exampleSDID@32473 iut="3"
eventSource="Application" eventID="1011"][exampleSDID@32480 iut="4"
eventSource="Other Application" eventID="2022"] Removing instance
+<14>1 2014-06-20T09:14:09+00:00 loggregator
d0602076-b14a-4c55-852a-981e7afeed42 DEA MSG-03 [exampleSDID@32474 iut="3"
eventSource="Application" eventID="1011"][exampleSDID@32480 iut="4"
eventSource="Other Application" eventID="2022"] Removing instance
\ No newline at end of file
diff --git
a/metron-platform/metron-parsing/metron-parsers-common/src/test/java/org/apache/metron/parsers/syslog/Syslog5424ParserTest.java
b/metron-platform/metron-parsing/metron-parsers-common/src/test/java/org/apache/metron/parsers/syslog/Syslog5424ParserTest.java
index 3c6c72f..461fe3f 100644
---
a/metron-platform/metron-parsing/metron-parsers-common/src/test/java/org/apache/metron/parsers/syslog/Syslog5424ParserTest.java
+++
b/metron-platform/metron-parsing/metron-parsers-common/src/test/java/org/apache/metron/parsers/syslog/Syslog5424ParserTest.java
@@ -41,17 +41,17 @@ public class Syslog5424ParserTest {
private static final String SYSLOG_LINE_ALL = "<14>1
2014-06-20T09:14:07+00:00 loggregator"
+ " d0602076-b14a-4c55-852a-981e7afeed38 DEA MSG-01"
+ " [exampleSDID@32473 iut=\"3\" eventSource=\"Application\"
eventID=\"1011\"]"
- + " [exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\"
eventID=\"2022\"] Removing instance";
+ + "[exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\"
eventID=\"2022\"] Removing instance";
private static final String SYSLOG_LINE_MISSING = "<14>1
2014-06-20T09:14:07+00:00 loggregator"
+ " d0602076-b14a-4c55-852a-981e7afeed38 DEA -"
+ " [exampleSDID@32473 iut=\"3\" eventSource=\"Application\"
eventID=\"1011\"]"
- + " [exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\"
eventID=\"2022\"] Removing instance";
+ + "[exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\"
eventID=\"2022\"] Removing instance";
private static final String SYSLOG_LINE_MISSING_DATE = "<14>1 - loggregator"
+ " d0602076-b14a-4c55-852a-981e7afeed38 DEA -"
+ " [exampleSDID@32473 iut=\"3\" eventSource=\"Application\"
eventID=\"1011\"]"
- + " [exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\"
eventID=\"2022\"] Removing instance";
+ + "[exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\"
eventID=\"2022\"] Removing instance";
private static final String expectedVersion = "1";
private static final String expectedMessage = "Removing instance";
diff --git a/pom.xml b/pom.xml
index 66a935e..edc2a03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<global_reflections_version>0.9.10</global_reflections_version>
<global_checkstyle_version>8.0</global_checkstyle_version>
<global_log4j_core_version>2.1</global_log4j_core_version>
- <global_simple_syslog_version>0.0.1</global_simple_syslog_version>
+ <global_simple_syslog_version>0.0.3</global_simple_syslog_version>
<global_spark_version>2.3.1</global_spark_version>
<global_httpclient_version>4.3.2</global_httpclient_version>
<global_aesh_version>0.66.19</global_aesh_version>
