Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

Conversation

@merrimanr
Copy link
Contributor

@merrimanr merrimanr commented Aug 21, 2019

Contributor Comments

This PR upgrades Solr from 6.6.2 to 7.4.0.

Changes Included

  • Solr no longer throws an error for a facet query when two indices have different types defined for a facet field. I had to split that test into separate integration tests for ES and Solr.
  • I refactored MetronSolrClient into a SolrClientFactory, more closely aligning with how we create clients in ES. I also moved the code in MetronSolrClient that administers collections to SolrComponent since that is the only place it is used.
  • Updated our code to use the new Solr Client Kerberos API.
  • Adjusted pom.xml files to fix class path issues.

Testing

  1. Launch the centOS 7 development environment.

    cd metron-deployment/development/centos7
    vagrant up
    
  2. Ensure that telemetry is visible within the Alerts UI.

  3. Stop Metron services, Elasticsearch and Kibana.

  4. Install Solr.

    source /etc/default/metron
    cd $METRON_HOME
    bin/install_solr.sh
    
  5. Define Solr Collections.

    source /etc/default/metron
    export ZOOKEEPER=node1:9983
    $METRON_HOME/bin/create_collection.sh bro
    $METRON_HOME/bin/create_collection.sh snort
    $METRON_HOME/bin/create_collection.sh yaf
    $METRON_HOME/bin/create_collection.sh metaalert
    $METRON_HOME/bin/create_collection.sh error
    
  6. Enable Solr by following these instructions.

  7. Start Metron services.

  8. Ensure that telemetry is visible within the Alerts UI.

Pull Request Checklist

Thank you for submitting a contribution to Apache Metron.
Please refer to our Development Guidelines for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines 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.
  • 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?

  • 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 site-book/target/site/index.html:

    cd site-book
    mvn site
    
  • Have you ensured that any documentation diagrams have been updated, along with their source files, using draw.io? See Metron Development Guidelines for instructions.

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.

Copy link
Contributor

@nickwallen nickwallen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. I have just a few questions.

@nickwallen nickwallen changed the title METRON-2225: Upgrade Solr METRON-2225: Upgrade to Solr 7.4.0 Aug 23, 2019
…3.1' into METRON-2225

# Conflicts:
#	pom.xml
@nickwallen
Copy link
Contributor

Before I forget, there are some links in metron-solr-common/README.md that will need updated to point to version 7.4.0.

@merrimanr
Copy link
Contributor Author

The latest commit updates the README for 7.4.

Copy link
Contributor

@nickwallen nickwallen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 I was able to spin this up successfully. Good updates on the README. Solid. Thanks

@nickwallen
Copy link
Contributor

This has been merged into the feature branch as ad71c04.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants