Skip to content

Commit

Permalink
Replace custom CEF parse with cef-parser
Browse files Browse the repository at this point in the history
Additionally create proper testing infrastructure with test fixtures
and merge Raw and Syslog CEF inputs.
  • Loading branch information
Jochen Schalanda committed Sep 26, 2017
1 parent ec669b2 commit 4a7c31b
Show file tree
Hide file tree
Showing 59 changed files with 1,389 additions and 1,487 deletions.
23 changes: 23 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
</properties>

<dependencies>
<dependency>
<groupId>org.graylog.cef</groupId>
<artifactId>cef-parser</artifactId>
<version>0.0.1.8</version>
</dependency>
<dependency>
<groupId>org.graylog2</groupId>
<artifactId>graylog2-server</artifactId>
Expand All @@ -70,6 +75,24 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/org/graylog/plugins/cef/CEFInputModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.MapBinder;
import org.graylog.plugins.cef.codec.CEFCodec;
import org.graylog.plugins.cef.codec.CEFSyslogCodec;
import org.graylog.plugins.cef.input.CEFAmqpInput;
import org.graylog.plugins.cef.input.CEFKafkaInput;
import org.graylog.plugins.cef.input.CEFSyslogTCPInput;
import org.graylog.plugins.cef.input.CEFSyslogUDPInput;
import org.graylog.plugins.cef.input.CEFTCPInput;
import org.graylog.plugins.cef.input.CEFUDPInput;
import org.graylog.plugins.cef.pipelines.rules.CEFParserFunction;
Expand All @@ -20,12 +17,9 @@ public class CEFInputModule extends PluginModule {
protected void configure() {
// Register message input.
addCodec(CEFCodec.NAME, CEFCodec.class);
addCodec(CEFSyslogCodec.NAME, CEFSyslogCodec.class);

addMessageInput(CEFUDPInput.class);
addMessageInput(CEFTCPInput.class);
addMessageInput(CEFSyslogUDPInput.class);
addMessageInput(CEFSyslogTCPInput.class);

addMessageInput(CEFAmqpInput.class);
addMessageInput(CEFKafkaInput.class);
Expand Down
123 changes: 0 additions & 123 deletions src/main/java/org/graylog/plugins/cef/codec/BaseCEFCodec.java

This file was deleted.

Loading

0 comments on commit 4a7c31b

Please sign in to comment.