GitHub user nickwallen opened a pull request: https://github.com/apache/metron/pull/1235
METRON-1823 Refactor Elasticsearch Configuration Settings This refactors the various ElasticsearchWriter settings so they are all defined in a single place as constants. There is no functional change. This is simply a refactor. This is the refactor I was looking at doing for #1218, but decided to keep it separate to simplify the review process. ## Testing 1. Spin-up the development environment. 1. Ensure alerts are visible in the Alerts UI. ## Pull Request Checklist Thank you for submitting a contribution to Apache Metron. Please refer to our [Development Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235) for the complete guide to follow for contributions. Please refer also to our [Build Verification Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview) for complete smoke testing guides. In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following: ### For all changes: - [ ] Is there a JIRA ticket associated with this PR? If not one needs to be created at [Metron Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel). - [ ] Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character. - [ ] Has your PR been rebased against the latest commit within the target branch (typically master)? ### For code changes: - [ ] Have you included steps to reproduce the behavior or problem that is being changed or addressed? - [ ] Have you included steps or a guide to how the change may be verified and tested manually? - [ ] Have you ensured that the full suite of tests and checks have been executed in the root metron folder via: ``` mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh ``` - [ ] Have you written or updated unit tests and or integration tests to verify your changes? - [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)? - [ ] Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent? You can merge this pull request into a Git repository by running: $ git pull https://github.com/nickwallen/metron ELASTIC-CONFIG-REFACTOR Alternatively you can review and apply these changes as the patch at: https://github.com/apache/metron/pull/1235.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1235 ---- commit 23a96ccc0786d31dfe2190fe470b0afe2b52c936 Author: Nick Allen <nick@...> Date: 2018-10-01T22:39:03Z Can change source field used for document ID. Unable to /findOne in Alerts UI commit 2d0f478327981403eb2463b7efefe3d871441db0 Author: Nick Allen <nick@...> Date: 2018-10-02T15:09:02Z Cannot assume that ES doc ID == Metron GUID commit d66c839eda55d5efd22f56f8f5920937e2703d14 Author: Nick Allen <nick@...> Date: 2018-10-02T15:10:13Z Removed unnecessary dependencies commit 36c59211181480db571619b811456105b80d7b0d Author: Nick Allen <nick@...> Date: 2018-10-02T19:33:04Z Search results need to use Metron GUID as ID, not the doc ID commit 4ebb8000522540b6ff2a30e2d5ffeffcf6016bb4 Author: Nick Allen <nick@...> Date: 2018-10-02T21:31:58Z Small rename commit 13d698df8cb46a3cf8ef747f7f62acc298ef8e4b Author: Nick Allen <nick@...> Date: 2018-10-02T21:38:00Z Removed unncessary part of error msg commit 5711c89acf49e993022e4fa1bc367beebcad6d21 Author: Nick Allen <nick@...> Date: 2018-10-03T12:05:16Z Elasticsearch always returns a GUID, while Solr does not for now. Needed to fix-up the integration tests due to this. commit 1766cb387db6c1caa67fd4c3fbfdb003c5ffcaeb Author: Nick Allen <nick@...> Date: 2018-10-03T14:43:13Z Added Mpack support commit 6fa5b5b36d6ead95ebd44c6010d0bfcaa17c35e8 Author: Nick Allen <nick@...> Date: 2018-10-03T15:03:27Z Added simple gitignore commit dbb83ad8280a22a04cf7433255e0d43e3cfff285 Author: Nick Allen <nick@...> Date: 2018-10-03T15:03:51Z Added documentation for es.document.id commit af36ebf55ce3d95d368d2f876fe6862c6d20a8e5 Author: Nick Allen <nick@...> Date: 2018-10-03T17:21:32Z Changed default behavior to use Elasticsearch generated doc ID, which is the most performant option commit 6b79429175919d41fe3c263a95fcd4b75f1e3f9a Author: Nick Allen <nick@...> Date: 2018-10-08T22:16:49Z Improve description of `es.document.id` commit 5a793ce7c3785ec6972dbd68116e2ce4d23d2b7c Author: Nick Allen <nick@...> Date: 2018-10-08T22:18:14Z Better define default commit f3fe193b74c60fe943e1dba6737855d6419a8eea Author: Nick Allen <nick@...> Date: 2018-10-11T17:53:44Z Removed the ElasticsearchWriterConfig class to maintain consistency commit d98a81d2a4650b62d87a4c3382b11c0858803df3 Author: Nick Allen <nick@...> Date: 2018-10-11T18:08:21Z No need to fix in this PR. Others have already fixed this elsewhere in master commit 57cc1408d50891be04824cfade64ebcfcfd69ebe Author: Nick Allen <nick@...> Date: 2018-10-11T20:37:12Z Refactor Elasticsearch configuration settings commit 7bd304200def6cf6f8e5c1c1fec7fb6a3f224ece Author: Nick Allen <nick@...> Date: 2018-10-11T20:42:51Z Merge remote-tracking branch 'apache/master' into ELASTIC-CONFIG-REFACTOR ---- ---