METRON-2106: Escalation topic setting in Ambari has no effect

[merrimanr]

Contributor Comments

This PR fixes a small bug in the Metron REST start script that incorrectly configures the property files. Properties defined in rest_application.yml (where Ambari-managed properties are written) are being overridden by the defaults when the opposite should happen. This fixes that by updating the configuration to load rest_application.yml before the defaults.

Testing

This has been tested in full dev. Spin up full dev and configure a custom escalation topic in Ambari (Ambari > Services > Metron > Configs > REST > Metron escalation topic). Escalate a message:

curl -X POST --header 'Content-Type: application/json' --header 'Accept: */*' -d '[
  {"field":"value"}
]' 'http://user:password@node1:8082/api/v1/alerts/ui/escalate'

The message should appear in the custom escalation topic rather than the default escalation topic.

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
  

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.

[mmiklavc]

The ordering/appending via --spring.config.additional-location makes sense. But I see you've removed classpath:/application.yml altogether. Was that intentional? How is application.yml loaded now, or is it not needed at all?

[merrimanr]

Using --spring.config.location replaces the default locations. This is why classpath:/application.yml was originally included even though it matches the default locations. Using --spring.config.additional-location adds to the list of configs instead of replacing the default locations so having classpath:/application.yml in the list is no longer necessary. Doing it this way enforces that anything added on top with --spring.config.additional-location will take priority over the default. I think this is the correct way to do it because you don't have to worry about ordering them correctly.

[mmiklavc]

@merrimanr - perfect, that makes sense. Thanks for the explanation! +1 by inspection.