GitHub user merrimanr opened a pull request:

    METRON-1482: Update REST to work with Solr

    ## Contributor Comments
    This PR updates the REST start script to properly include the correct 
indexing jar on the classpath depending on the configured indexing writer 
(Elasticsearch or Solr).  To test this:
    1. Spin up full dev and follow the instructions for manually installing 
    2. Change the Index Writer to "Solr" in Ambari (Metron > Indexing tab) and 
restart the Indexing component.
    3. Verify data is landing in the Solr collections
    4. Restart the REST component in Ambari
    5. You should be able to execute search queries in Swagger
    I had to include a stubbed SolrMetaAlertDao class that doesn't do anything 
to get everything to start up.  This will eventually be replaced by the work 
being done in  I also fixed 
a bug in the SolrDao that was causing in issue in the Alerts UI.
    ## Pull Request Checklist
    Thank you for submitting a contribution to Apache Metron.  
    Please refer to our [Development 
 for the complete guide to follow for contributions.  
    Please refer also to our [Build Verification 
 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:
    - [x] Is there a JIRA ticket associated with this PR? If not one needs to 
be created at [Metron 
    - [x] 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 "-" 
    - [x] Has your PR been rebased against the latest commit within the target 
branch (typically master)?
    ### For code changes:
    - [x] Have you included steps to reproduce the behavior or problem that is 
being changed or addressed?
    - [x] Have you included steps or a guide to how the change may be verified 
and tested manually?
    - [x] 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 && 
    - [x] Have you written or updated unit tests and or integration tests to 
verify your changes?
    - [x] If adding new dependencies to the code, are these dependencies 
licensed in a way that is compatible for inclusion under [ASF 
    - [x] Have you verified the basic functionality of the build by building 
and running locally with Vagrant full-dev environment or the equivalent?
    ### For documentation related changes:
    - [ ] Have you ensured that format looks appropriate for the output in 
which it is rendered by building and verifying the site-book? If not then run 
the following commands and the verify changes via 
      cd site-book
      mvn site
    #### Note:
    Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.
    It is also recommended that [travis-ci]( is set up 
for your personal repository such that your branches are built there before 
submitting a pull request.

You can merge this pull request into a Git repository by running:

    $ git pull solr-rest

Alternatively you can review and apply these changes as the patch at:

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #957
commit 6bb30af9d2005414e3ee44c0bdb0ea14540ce13c
Author: cstella <cestella@...>
Date:   2018-02-01T21:33:56Z

    METRON-1441: Create complementary Solr schemas for the main sensors

commit f4ff0c401eff23d9c1b2ca3b264bd9b0d4e8f381
Author: cstella <cestella@...>
Date:   2018-02-01T21:47:12Z

    Updating dao

commit 7e2ecb0f2f55ea16529128fec14920bc2a546b07
Author: cstella <cestella@...>
Date:   2018-02-02T21:43:38Z

    Migrated data to files, renamed test and added yaf and error.

commit 2aacd202ff1a2ebcbeb30300b30d080391cfe1cf
Author: cstella <cestella@...>
Date:   2018-02-02T21:45:08Z

    Merge branch 'feature/METRON-1416-upgrade-solr' into SOLR_METRON-1441

commit 2e32e7ea4ef8cace764394c1dec693d8385a6b9a
Author: cstella <cestella@...>
Date:   2018-02-02T21:50:06Z

    Added to readme.

commit e2901d4bd4b9787f668c2dccd2e4f8aa53a926d7
Author: cstella <cestella@...>
Date:   2018-02-05T14:39:31Z

    Updating error to have a guid and removed docValues=true for bytes type.

commit 3c4319ec4581fdb259a697b548a267225316874a
Author: cstella <cestella@...>
Date:   2018-02-05T16:52:17Z

    Missed spec file additions

commit 43e5ad2d4fb26ac8d6c4c623f427d6358b0c85fa
Author: cstella <cestella@...>
Date:   2018-02-05T21:53:23Z

    Updated schema to include guid, which I missed earlier

commit 261c28b1b594de8b1d7a1357e54e2367c32d0652
Author: cstella <cestella@...>
Date:   2018-02-06T14:33:32Z

    Blah, forgot guid field

commit 34e67cbb897938fd804286ecfcb5861e724c5886
Author: cstella <cestella@...>
Date:   2018-02-06T17:33:52Z

    Added context and grouping for schemata

commit 62a2eb28c8410ad08529eec74bdba0958e71f1f8
Author: cstella <cestella@...>
Date:   2018-02-06T23:03:54Z

    Updating solrwriter

commit bfbd65f3d18af14544673262d99f2c0840447009
Author: cstella <cestella@...>
Date:   2018-02-06T23:20:54Z

    Updating config.

commit 3faace9509903f5436dd8b9242bc3b2fc2343af0
Author: cstella <cestella@...>
Date:   2018-02-07T16:32:56Z

    Merge branch 'feature/METRON-1416-upgrade-solr' into SOLR_writer_mod

commit c9d842519c0fb48d26492265cd5ae7d3aa6768c9
Author: cstella <cestella@...>
Date:   2018-02-07T16:44:58Z

    Merge branch 'feature/METRON-1416-upgrade-solr' into SOLR_writer_mod

commit e8d0efd9113c8163f484dcf26ff66d5b6cbaf081
Author: cstella <cestella@...>
Date:   2018-02-07T16:51:34Z

    Updating should commit to be taken from global config.

commit 820dde3a03d1636aa82254f241e8fc422bc1d911
Author: cstella <cestella@...>
Date:   2018-02-07T16:54:40Z

    JonZeolla is right.

commit 4baed6a7197cbb91faafd17bad9fc1b7a8ddc158
Author: cstella <cestella@...>
Date:   2018-02-07T17:11:26Z

    Updated readme.

commit ed1f6b56484fca1262e605613cc9bbcc6db5096f
Author: cstella <cestella@...>
Date:   2018-02-07T22:58:47Z

    updating docs and making configuration more extensible.

commit 8a34e4b6de67ae3a0684d4ec638c94a59d6d717e
Author: cstella <cestella@...>
Date:   2018-02-07T23:21:34Z


commit f1637b187660fa71284b335e3c6bc1e3714e969c
Author: cstella <cestella@...>
Date:   2018-02-08T00:29:34Z

    Updating writer to not have star imports.

commit 967b84b69b56319dcaa6c1d6ca22da14b86a1e06
Author: cstella <cestella@...>
Date:   2018-02-08T15:54:33Z

    change flux file to be correct

commit 3817d41adb1293178394b1bea5b3e21de9e05e51
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T18:12:17Z

    initial commit

commit ea8e8a57ab72c1f5747a9bfd09de213963ce01ab
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T21:36:13Z

    added more scripts

commit 154438e5e88c7cdb80939aad222457b5a0c0337f
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T21:50:56Z

    added documentation

commit af642d48e574eeeac16e1b76a5fbdb8b8ebd36c8
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T21:54:08Z

    initial commit

commit 7a8ec8d6bc09954aedea4f91ae8468d37c9bd824
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T22:11:48Z

    added newline

commit 596349d382973bab0490f3126da7989fd1e4950f
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T22:12:31Z

    Merge branch 'solr-ansible' into METRON-1423

commit 49667e06e9847b082c2919bba68377d72a61d880
Author: merrimanr <merrimanr@...>
Date:   2018-02-08T22:25:15Z

    Merge remote-tracking branch 'mirror/feature/METRON-1416-upgrade-solr' into 

commit 74f038a69336cd0c56a763baf0e46513b4a4cb00
Author: merrimanr <merrimanr@...>
Date:   2018-02-09T14:59:50Z

    Merge remote-tracking branch 'mirror/feature/METRON-1416-upgrade-solr' into 
    # Conflicts:

commit 051afdcf3f20d5b6c572a93adb89c0fadbe86a6d
Author: merrimanr <merrimanr@...>
Date:   2018-02-09T15:03:07Z

    removed log statement



Reply via email to