GitHub user merrimanr opened a pull request:
https://github.com/apache/metron/pull/1006
METRON-1542: Merge master into Solr feature branch
## Contributor Comments
I had to resolve several conflicts when merging master into the Solr
feature branch. I think it would be a good idea for this to be reviewed and
tested by others. The majority of conflicts were in the ElasticsearchDao
classes so those classes should be reviewed more closely.
I ran all tests and verified the DAO endpoitns still work in full dev.
## 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:
- [ ] 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?
- [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?
- [ ] 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:
- [ ] 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-merge
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/1006.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 #1006
----
commit 9b4b40278086b881803a8c82e7eebb47d83847f7
Author: nickwallen <nick@...>
Date: 2018-03-06T12:29:33Z
METRON-1452 Rebase Dev Environment on Latest CentOS 6 (nickwallen) closes
apache/metron#933
commit e22479e62fab2ae64de1ab803e0f9f0a5fab98b3
Author: merrimanr <merrimanr@...>
Date: 2018-03-06T14:09:22Z
METRON-1337 List of facets should not be hardcoded (merrimanr) closes
apache/metron#853
commit 7b68f188185b0eb6b3b0b70f98ce6b36bb22c46f
Author: MohanDV <mvenkateshaiah@...>
Date: 2018-03-06T15:30:29Z
METRON-1450 Add REST endpoint docs for index topology split (MohanDV via
nickwallen) closes apache/metron#936
commit 486be49e71f3db4d9934dfa1af3e222078df09dd
Author: xyztdanid <xyztdanid4@...>
Date: 2018-03-06T22:35:30Z
METRON-1470 Update jquery to version 3+ (xyztdanid via merrimanr) closes
apache/metron#950
commit 1d95b8316a18097747be116a0276c56b894fb79c
Author: cstella <cestella@...>
Date: 2018-03-07T14:16:45Z
METRON-1460: Create a complementary non-split-join enrichment topology
closes apache/metron#940
commit 9fb0d06e644597032da58c5df020a841b93d19c0
Author: cstella <cestella@...>
Date: 2018-03-07T14:21:52Z
METRON-1463: Adjust the groupings and shuffles in enrichment to be more
efficient closes apache/metron#944
commit abb152b83631001ad067849dfaefd2d4e3b0cdb4
Author: cstella <cestella@...>
Date: 2018-03-07T16:20:56Z
METRON-1467: Replace guava caches in places where the keyspace might be
large closes apache/metron#947
commit 8bc7732e4c904085e4f78469abded84635971632
Author: cstella <cestella@...>
Date: 2018-03-08T22:17:57Z
METRON-1471: Migrate shuffle connections to local or shuffle closes
apache/metron#949
commit 03a4aa3846773065d51086167a28fb4c37d7b2a9
Author: JonZeolla <zeolla@...>
Date: 2018-03-09T14:05:03Z
METRON-1468 Add support for apache/metron-bro-plugin-kafka to
prepare-commit (JonZeolla) closes apache/metron#948
commit 37662d3bd8a4162bef4474be7ab60a2fabbe3e2f
Author: cstella <cestella@...>
Date: 2018-03-15T16:05:39Z
METRON-1490: Better error message when user specifies an enrichment type
that doesn't exist closes apache/metron#963
commit 26c5d3065bd7a635699083e8131d4a7629bf3b4d
Author: cstella <cestella@...>
Date: 2018-03-15T16:06:56Z
METRON-1488: user_settings hbase table does not have acls set up for
kerberos closes apache/metron#962
commit e69ce213aaad84fd49d972c329a4bf4bf7d4b2ad
Author: JonZeolla <zeolla@...>
Date: 2018-03-15T18:09:28Z
METRON-1485 Upgrade vagrant for dev environments closes
apache/incubator-metron#959
commit 85d12475cf363f0b9d6bdd973ec9860550f73980
Author: ottobackwards <ottobackwards@...>
Date: 2018-03-15T18:13:44Z
METRON-1299 In MetronError tests, don't test for HostName if getHostName
wouldn't work closes apache/incubator-metron#924
commit 9c5d9d76644fc07bae36644906f52e0422f33d0e
Author: ottobackwards <ottobackwards@...>
Date: 2018-03-15T18:17:31Z
METRON-1397 Support for JSON Path and complex documents in JSONMapParser
closes apache/incubator-metron#914
commit 52dd9fb852bef5998dac83109ac6e122860be489
Author: nickwallen <nick@...>
Date: 2018-03-16T14:16:07Z
METRON-1493 Unhelpful Error Message When Assignment Expressions Fail
(nickwallen) closes apache/metron#966
commit e3eeec38a66e1f10c296c110d47bc8bc3e995629
Author: nickwallen <nick@...>
Date: 2018-03-17T13:22:15Z
METRON-1487 Define Performance Benchmarks for Enrichment Topology
(nickwallen) closes apache/metron#961
commit 46ad9d93b4385da0f8668f2ba84212d54d00ba4b
Author: cstella <cestella@...>
Date: 2018-03-20T13:36:32Z
METRON-1483: Create a tool to monitor performance of the topologies closes
apache/incubator-metron#958
commit 3083b471fe912bc74d27017834e6c80ff177680e
Author: nickwallen <nick@...>
Date: 2018-03-20T20:00:20Z
METRON-590 Enable Use of Event Time in Profiler (nickwallen) closes
apache/metron#965
commit 5ed9631a2936ec60d0ea6557ca4396cffdadc688
Author: cstella <cestella@...>
Date: 2018-03-20T22:08:02Z
METRON-1491: The indexing topology restart logic is wrong (cstella via
mmiklavc) closes apache/metron#964
commit 9e95d4b61410c8033f0a4ea51e831566d5d933d3
Author: nickwallen <nick@...>
Date: 2018-03-23T16:23:34Z
METRON-1500 Enhance 'prepare-commit' to Support Feature Branches
(nickwallen) closes apache/metron#971
commit 19b237de27eed37ee87eca6d8e2198083fdb88d7
Author: MohanDV <mohan.dv@...>
Date: 2018-04-03T14:25:52Z
METRON-1497 Rest endpoint '/api/v1/search/search' needs to handle null when
elastic search response return null for getAggregations (MohanDV via
justinleet) closes apache/metron#968
commit 0d847cf5f91dc0d3b3b6838eb4b4de4aa2cf2fec
Author: cestella <cestella@...>
Date: 2018-04-03T14:29:19Z
METRON-1501 Parser messages that fail to validate are dropped silently
(cestella via justinleet) closes apache/metron#972
commit 0ab39a32b61104812a6a9e69e999e7053e3e7e90
Author: mmiklavc <michael.miklavcic@...>
Date: 2018-04-05T15:07:48Z
METRON-1462: Separate ES and Kibana from Metron Mpack (mmiklavc via
mmiklavc) closes apache/metron#943
commit ab4f8e65e13aaea3a10491290a7411b3b6dc955e
Author: nickwallen <nick@...>
Date: 2018-04-06T20:40:01Z
METRON-1449 Set Zookeeper URL for Stellar Running in Zeppelin Notebook
(nickwallen) closes apache/metron#931
commit 46bc63dbcfe9f0ddabfd4821958962a2dac9378e
Author: nickwallen <nick@...>
Date: 2018-04-07T15:28:01Z
METRON-1505 Intermittent Profiler Integration Test Failure (nickwallen)
closes apache/metron#977
commit 3ba9ae25126bc393e3b9307f4ffe63ac66a909f4
Author: cstella <cestella@...>
Date: 2018-04-09T15:47:51Z
METRON-1504: Enriching missing values does not match the semantics between
the new enrichment topology and old closes apache/incubator-metron#976
commit a8b555dcc9f548d7b91789a46d9435b4d8b17581
Author: wardbekker <ward@...>
Date: 2018-04-09T19:14:13Z
METRON-1465:Support for Elasticsearch X-pack (wardbekker via mmiklavc)
closes apache/metron#946
commit ed50d48bb47cf3f301884f6e18fe4efc8c1b91f1
Author: nickwallen <nick@...>
Date: 2018-04-10T21:16:20Z
METRON-1518 Build Failure When Using Profile HDP-2.5.0.0 (nickwallen)
closes apache/metron#986
commit 438893b78c852e34d7edb965840500a78503d299
Author: anandsubbu <anandsubbu@...>
Date: 2018-04-11T05:33:37Z
METRON-1510 Update Metron website to include info about github update
subscription (anandsubbu) closes apache/metron#981
commit 62d1a1bf7e8b9b3ee2f260c358719ea5080c9045
Author: nickwallen <nick@...>
Date: 2018-04-11T21:57:09Z
METRON-1494 Profiler Emits Messages to Kafka When Not Needed (nickwallen)
closes apache/metron#967
----
---
