This is an automated email from the ASF dual-hosted git repository.
nickallen pushed a change to branch feature/METRON-2088-support-hdp-3.1
in repository https://gitbox.apache.org/repos/asf/metron.git.
from 1430d62 METRON-2161 Ambari client exception occurred: No JSON object
could be decoded (nickwallen) closes apache/metron#1447
add f2f3bb4 METRON-2155 Cache Maven in Travis CI Builds (nickwallen)
closes apache/metron#1445
add c9604c2 METRON-2166 FileFilterUtilTest.test_getPaths_leftEdge:116
expected:<1> but was:<2> (mmiklavc) closes apache/metron#1452
add 02f88a3 METRON-2164 Remove the Split-Join Enrichment Topology
(nickwallen) closes apache/metron#1448
add 8792882 METRON-2061 Solr documents with date fields cannot be updated
with Dao classes (merrimanr) closes apache/metron#1374
add c8f2c9a METRON-2084 Add documentation notice for MacOS Mojave users
for new security permissions (mmiklavc) closes apache/metron#1449
add bf673a2 METRON-2168 Elasticsearch Updates Not Tested in Integration
Test (nickwallen) closes apache/metron#1451
new 51c0ad0 Merge remote-tracking branch 'apache/master' into
feature/METRON-2088-support-hdp-3.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 | 16 +-
.../metron/indexing/dao/update/PatchOperation.java | 18 +-
.../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, 750 insertions(+), 2721 deletions(-)
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/enrichment_arch.png
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/config/enrichment-splitjoin.properties
delete mode 100755
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/config/enrichment-splitjoin.properties.j2
rename
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/config/{enrichment-unified.properties
=> enrichment.properties} (100%)
rename
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/config/{enrichment-unified.properties.j2
=> enrichment.properties.j2} (100%)
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/flux/enrichment/remote-splitjoin.yaml
rename
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/flux/enrichment/{remote-unified.yaml
=> remote.yaml} (100%)
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/java/org/apache/metron/enrichment/bolt/EnrichmentJoinBolt.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBolt.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/java/org/apache/metron/enrichment/bolt/JoinBolt.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/java/org/apache/metron/enrichment/bolt/SplitBolt.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/java/org/apache/metron/enrichment/bolt/ThreatIntelJoinBolt.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/main/java/org/apache/metron/enrichment/bolt/ThreatIntelSplitterBolt.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentJoinBoltTest.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBoltTest.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/bolt/JoinBoltTest.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/bolt/SplitBoltTest.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/bolt/ThreatIntelJoinBoltTest.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/bolt/ThreatIntelSplitterBoltTest.java
delete mode 100644
metron-platform/metron-enrichment/metron-enrichment-storm/src/test/java/org/apache/metron/enrichment/integration/UnifiedEnrichmentIntegrationTest.java
copy
metron-interface/metron-alerts/src/app/shared/list-group/list-group.component.scss
=>
metron-platform/metron-indexing/metron-indexing-common/src/main/java/org/apache/metron/indexing/dao/update/PatchException.java
(82%)
copy
metron-interface/metron-alerts/src/app/shared/metron-table/metron-table-pagination/metron-table-pagination.component.scss
=>
metron-platform/metron-indexing/metron-indexing-common/src/main/java/org/apache/metron/indexing/dao/update/PatchOperation.java
(87%)
create mode 100644
metron-platform/metron-indexing/metron-indexing-common/src/main/java/org/apache/metron/indexing/dao/update/PatchUtils.java
create mode 100644
metron-platform/metron-indexing/metron-indexing-common/src/test/java/org/apache/metron/indexing/dao/update/PatchUtilsTest.java
