METRON-1834: Migrate Elasticsearch from TransportClient to new Java REST API (mmiklavc via mmiklavc)
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/fcd644ca Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/fcd644ca Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/fcd644ca Branch: refs/heads/master Commit: fcd644ca77394d48d460c460b672a23d6594f49b Parents: 0c4c622 8bf3b6e Author: mmiklavc <michael.miklav...@gmail.com> Authored: Thu Nov 15 17:03:18 2018 -0700 Committer: Michael Miklavcic <michael.miklav...@gmail.com> Committed: Thu Nov 15 17:03:55 2018 -0700 ---------------------------------------------------------------------- Upgrading.md | 7 + dependencies_with_url.csv | 2 + metron-deployment/Kerberos-manual-setup.md | 154 +----------- .../METRON/CURRENT/configuration/metron-env.xml | 9 - .../CURRENT/package/scripts/metron_service.py | 2 - .../package/scripts/params/params_linux.py | 3 +- .../METRON/CURRENT/themes/metron_theme.json | 10 - .../rest/service/impl/MetaAlertServiceImpl.java | 2 +- metron-platform/elasticsearch-shaded/pom.xml | 47 +--- .../META-INF/log4j-provider.properties | 18 -- metron-platform/metron-common/README.md | 48 ++-- .../src/main/config/zookeeper/global.json | 1 - .../common/configuration/ConfigOption.java | 7 + metron-platform/metron-elasticsearch/README.md | 45 +++- metron-platform/metron-elasticsearch/pom.xml | 32 ++- .../client/ElasticsearchClient.java | 245 +++++++++++++++++++ .../client/ElasticsearchClientFactory.java | 189 ++++++++++++++ .../config/ElasticsearchClientConfig.java | 187 ++++++++++++++ .../config/ElasticsearchClientOptions.java | 60 +++++ .../dao/ElasticsearchColumnMetadataDao.java | 101 +++----- .../elasticsearch/dao/ElasticsearchDao.java | 21 +- .../dao/ElasticsearchMetaAlertDao.java | 2 +- .../dao/ElasticsearchMetaAlertSearchDao.java | 6 +- .../dao/ElasticsearchMetaAlertUpdateDao.java | 4 +- .../dao/ElasticsearchRequestSubmitter.java | 13 +- .../dao/ElasticsearchRetrieveLatestDao.java | 28 ++- .../dao/ElasticsearchSearchDao.java | 19 +- .../dao/ElasticsearchUpdateDao.java | 19 +- .../elasticsearch/utils/ElasticsearchUtils.java | 182 ++------------ .../elasticsearch/utils/FieldMapping.java | 32 +++ .../elasticsearch/utils/FieldProperties.java | 36 +++ .../writer/ElasticsearchWriter.java | 26 +- .../dao/ElasticsearchColumnMetadataDaoTest.java | 59 ++--- .../elasticsearch/dao/ElasticsearchDaoTest.java | 8 +- .../dao/ElasticsearchRequestSubmitterTest.java | 23 +- .../dao/ElasticsearchUpdateDaoTest.java | 12 +- .../ElasticsearchMetaAlertIntegrationTest.java | 9 +- .../ElasticsearchSearchIntegrationTest.java | 144 ++++++----- .../ElasticsearchUpdateIntegrationTest.java | 2 +- .../components/ElasticSearchComponent.java | 6 +- .../dao/metaalert/MetaAlertSearchDao.java | 4 +- .../dao/metaalert/MetaAlertIntegrationTest.java | 2 +- .../src/main/config/zookeeper/global.json | 2 +- 43 files changed, 1134 insertions(+), 694 deletions(-) ----------------------------------------------------------------------
