You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2019/07/03 13:55:21 UTC
[metron] 01/01: Merge remote-tracking branch 'apache/master' into
feature/METRON-2088-support-hdp-3.1
This is an automated email from the ASF dual-hosted git repository.
nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1
in repository https://gitbox.apache.org/repos/asf/metron.git
commit 51c0ad0648fa017aa1b2cfd51a83b488b7b831d9
Merge: 1430d62 bf673a2
Author: Nick Allen <ni...@nickallen.org>
AuthorDate: Wed Jul 3 09:54:52 2019 -0400
Merge remote-tracking branch 'apache/master' into feature/METRON-2088-support-hdp-3.1
.travis.yml | 5 +-
Upgrading.md | 5 +
metron-deployment/development/README.md | 9 +
metron-deployment/packaging/ambari/.gitignore | 2 -
.../packaging/ambari/metron-mpack/pom.xml | 6 +-
.../configuration/metron-enrichment-env.xml | 82 ---
.../CURRENT/package/scripts/enrichment_commands.py | 15 +-
.../CURRENT/package/scripts/enrichment_master.py | 9 +-
.../CURRENT/package/scripts/params/params_linux.py | 12 -
.../METRON/CURRENT/themes/metron_theme.json | 63 +--
.../packaging/docker/rpm-docker/SPECS/metron.spec | 6 +-
metron-platform/Performance-tuning-guide.md | 10 +-
.../dao/ElasticsearchRetrieveLatestDao.java | 8 +
.../ElasticsearchUpdateIntegrationTest.java | 57 +-
.../metron-enrichment-storm/README.md | 15 +-
.../metron-enrichment-storm/enrichment_arch.png | Bin 113606 -> 0 bytes
.../main/config/enrichment-splitjoin.properties | 63 ---
.../main/config/enrichment-splitjoin.properties.j2 | 63 ---
...nt-unified.properties => enrichment.properties} | 0
...fied.properties.j2 => enrichment.properties.j2} | 0
.../src/main/flux/enrichment/remote-splitjoin.yaml | 593 ---------------------
.../{remote-unified.yaml => remote.yaml} | 0
.../metron/enrichment/bolt/EnrichmentJoinBolt.java | 122 -----
.../enrichment/bolt/EnrichmentSplitterBolt.java | 184 -------
.../apache/metron/enrichment/bolt/JoinBolt.java | 189 -------
.../apache/metron/enrichment/bolt/SplitBolt.java | 113 ----
.../enrichment/bolt/ThreatIntelJoinBolt.java | 123 -----
.../enrichment/bolt/ThreatIntelSplitterBolt.java | 67 ---
.../src/main/scripts/start_enrichment_topology.sh | 7 +-
.../enrichment/bolt/EnrichmentJoinBoltTest.java | 96 ----
.../bolt/EnrichmentSplitterBoltTest.java | 106 ----
.../metron/enrichment/bolt/JoinBoltTest.java | 193 -------
.../metron/enrichment/bolt/SplitBoltTest.java | 123 -----
.../enrichment/bolt/ThreatIntelJoinBoltTest.java | 222 --------
.../bolt/ThreatIntelSplitterBoltTest.java | 46 --
.../integration/EnrichmentIntegrationTest.java | 87 +--
.../UnifiedEnrichmentIntegrationTest.java | 96 ----
.../apache/metron/indexing/dao/MultiIndexDao.java | 3 +-
.../metron/indexing/dao/update/PatchException.java | 27 +
.../metron/indexing/dao/update/PatchOperation.java | 28 +
.../metron/indexing/dao/update/PatchUtils.java | 105 ++++
.../metron/indexing/dao/update/UpdateDao.java | 3 +-
.../metron/indexing/dao/MultiIndexDaoTest.java | 173 +++++-
.../metron/indexing/dao/UpdateIntegrationTest.java | 56 +-
.../metron/indexing/dao/update/PatchUtilsTest.java | 263 +++++++++
.../apache/metron/pcap/mr/FileFilterUtilTest.java | 37 +-
46 files changed, 790 insertions(+), 2702 deletions(-)