GitHub user merrimanr opened a pull request:
https://github.com/apache/metron/pull/1067
METRON-1625: Merge master into Solr feature branch
## Contributor Comments
This PR merges the latest version of master into the Solr feature branch.
An ES DAO change was involved so there were a couple extra changes needed.
The changes of interest are related to moving the change from
ElasticsearchMetaAlertDao.java to ElasticsearchMetaAlertUpdateDao.java (this
class does not exist in master) and adding tests to
ElasticsearchMetaAlertDaoTest.java.
I tested this in full dev to verify the PR from master is included and
functioning as expected.
## 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:
- [x] 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).
- [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 "-"
character.
- [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 &&
dev-utilities/build-utils/verify_licenses.sh
```
- [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
2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [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:
- [x] 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](https://travis-ci.org) 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 https://github.com/merrimanr/incubator-metron solr-master-merge
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/1067.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 #1067
----
commit 0bb358009f1823fd19682ddb18d00aefa1441bf6
Author: nickwallen <nick@...>
Date: 2018-06-18T15:29:53Z
METRON-1573 Enhance KAFKA_* functions to return partition and offset
details (nickwallen) closes apache/metron#1030
commit 36b20297b7f385202387b22087a5e85d92e55bc7
Author: merrimanr <merrimanr@...>
Date: 2018-06-18T21:35:51Z
METRON-1616 Changing alert status fails if no metaalerts have been created
yet (merrimanr) closes apache/metron#1061
commit 7e36cd90c887e040203ebf95928f5dd8dc740d0c
Author: merrimanr <merrimanr@...>
Date: 2018-06-19T20:05:49Z
Merge remote-tracking branch 'mirror/master' into solr-master-merge
commit cbe352a4dab634c5f3700d755424ece4e0c267c3
Author: merrimanr <merrimanr@...>
Date: 2018-06-19T20:06:04Z
Merge remote-tracking branch 'mirror/master' into solr-master-merge
commit df70cc6490222c64c1699f6a055c397a0904a923
Author: merrimanr <merrimanr@...>
Date: 2018-06-19T20:29:18Z
removed duplicate test
----
---
