-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/49458/
-----------------------------------------------------------
(Updated July 9, 2016, 10:13 a.m.)
Review request for Flume.
Bugs: FLUME-2921
https://issues.apache.org/jira/browse/FLUME-2921
Repository: flume-git
Description
-------
This patch adds the support for Elasticsearch version 2.0+. The version I used
is 2.3.3, which is the latest stable release.
This patch does not fix any known issues with this sink, its only purpose is to
support current versions of elasticsearch.
Elasticsearch 2.3.3 depends on guava 18.0, which collided with our version. I
had to create a new module, flume-ng-elasticsearch-shaded, and shade guava.
This worked this time, but due to guava's popularity I think we should remove
this dependency in the future. This should be easier, now that Flume uses Java
1.7.
Diffs (updated)
-----
flume-ng-configuration/src/main/java/org/apache/flume/Context.java f00b571
flume-ng-core/src/main/java/org/apache/flume/source/MultiportSyslogTCPSource.java
b9f2438
flume-ng-dist/src/main/assembly/bin.xml a61180d
flume-ng-doc/sphinx/FlumeUserGuide.rst f9ca1b2
flume-ng-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java
c122a12
flume-ng-node/src/main/java/org/apache/flume/node/MaterializedConfiguration.java
a80bfdf
flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml c372c0b
flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/ContentBuilderUtil.java
83c3ffd
flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/ElasticSearchLogStashEventSerializer.java
3638368
flume-ng-sinks/flume-ng-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/client/ElasticSearchTransportClient.java
2cf365e
flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/AbstractElasticSearchSinkTest.java
9fbd747
flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchDynamicSerializer.java
d4e4654
flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchIndexRequestBuilderFactory.java
b62254e
flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchLogStashEventSerializer.java
65b4dab
flume-ng-sinks/flume-ng-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchSink.java
69acc06
pom.xml b50693e
Diff: https://reviews.apache.org/r/49458/diff/
Testing
-------
I made sure that all unit tests (due to guava upgrade) pass successfully. The
known flaky tests may not pass, though.
In addition, I tested the sink against a local elasticsearch instance.
Thanks,
Lior Zeno
