You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2018/05/18 18:29:34 UTC
[13/13] metron git commit: Merge branch 'master' into
feature/METRON-1416-upgrade-solr
Merge branch 'master' into feature/METRON-1416-upgrade-solr
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/eb336665
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/eb336665
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/eb336665
Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: eb3366656de643e7436f7cf280561b94f3921c65
Parents: bc16e68 71a015f
Author: justinjleet <ju...@gmail.com>
Authored: Fri May 18 14:21:24 2018 -0400
Committer: justinjleet <ju...@gmail.com>
Committed: Fri May 18 14:21:24 2018 -0400
----------------------------------------------------------------------
dependencies_with_url.csv | 56 ++-
.../metron/profiler/ProfileMeasurement.java | 3 +-
.../apache/metron/profiler/ProfilePeriod.java | 3 +-
.../metron/profiler/ProfileMeasurementTest.java | 108 +++++
.../metron/profiler/ProfilePeriodTest.java | 49 +++
metron-analytics/metron-profiler/README.md | 62 ++-
.../src/main/config/profiler.properties | 13 +
.../src/main/flux/profiler/remote.yaml | 3 +
.../zookeeper/profile-with-stats/profiler.json | 12 +
.../integration/ProfilerIntegrationTest.java | 83 +++-
.../metron/statistics/StatisticsProvider.java | 6 +-
.../statistics/sampling/UniformSampler.java | 5 +-
metron-deployment/amazon-ec2/ansible.cfg | 5 +-
.../roles/ambari_config/vars/single_node_vm.yml | 1 +
metron-deployment/packaging/ambari/.gitignore | 2 +
.../enrichment-splitjoin.properties.j2 | 63 ---
.../templates/enrichment-unified.properties.j2 | 60 ---
.../package/templates/profiler.properties.j2 | 13 +
metron-interface/metron-alerts/README.md | 6 +
metron-interface/metron-alerts/proxy.conf.json | 9 -
.../alert-details/alert-details.component.ts | 2 +-
.../alert-details/alerts-details.routing.ts | 2 +-
.../alerts/alerts-list/alerts-list.component.ts | 25 +-
.../table-view/table-view.component.ts | 32 +-
.../tree-view/tree-view.component.ts | 17 +-
.../alerts/meta-alerts/meta-alerts.component.ts | 20 +-
.../metron-alerts/src/app/app.module.ts | 4 +-
.../src/app/model/search-request.ts | 2 +-
.../src/app/service/authentication.service.ts | 10 +-
.../service/elasticsearch-localstorage-impl.ts | 6 +-
.../src/app/service/global-config.service.ts | 50 +++
.../src/app/service/update.service.ts | 10 +-
.../metron-alerts/src/app/utils/constants.ts | 4 +-
.../metron-alerts/src/app/utils/utils.ts | 7 +-
metron-interface/metron-config/proxy.conf.json | 4 +-
metron-interface/metron-rest/README.md | 2 +
metron-interface/metron-rest/pom.xml | 17 +-
.../metron/rest/MetronRestApplication.java | 7 +
.../apache/metron/rest/MetronRestConstants.java | 2 +
.../metron/rest/config/JpaConfiguration.java | 6 +-
.../metron/rest/config/WebSecurityConfig.java | 19 +-
.../rest/service/impl/SearchServiceImpl.java | 42 +-
.../src/main/resources/application-test.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
.../metron-rest/src/main/scripts/metron-rest.sh | 2 +-
.../SearchControllerIntegrationTest.java | 9 +-
.../service/impl/SearchServiceImplTest.java | 60 ++-
metron-platform/metron-common/README.md | 15 +-
.../org/apache/metron/common/Constants.java | 10 +-
.../configuration/SensorParserConfig.java | 410 +++++++++++--------
.../configuration/profiler/ProfileResult.java | 4 +-
.../profiler/ProfileResultExpressions.java | 4 +-
.../profiler/ProfileTriageExpressions.java | 3 +-
.../configuration/profiler/ProfilerConfig.java | 12 +-
.../common/utils/CompressionStrategies.java | 100 +++++
.../common/utils/CompressionStrategy.java | 52 +++
.../apache/metron/common/utils/SerDeUtils.java | 7 +-
.../profiler/ProfilerConfigTest.java | 85 +++-
.../common/utils/CompressionUtilsTest.java | 62 +++
.../nonbulk/geo/GeoEnrichmentLoader.java | 70 +++-
.../nonbulk/geo/GeoEnrichmentLoaderTest.java | 40 +-
.../parsers/topology/ParserTopologyBuilder.java | 139 ++++---
.../parsers/topology/ParserTopologyCLI.java | 147 +++++--
.../components/ParserTopologyComponent.java | 80 ++--
.../parsers/topology/ParserTopologyCLITest.java | 122 ++++--
...pleHbaseEnrichmentWriterIntegrationTest.java | 69 ++--
.../integration/WriterBoltIntegrationTest.java | 382 +++++++++++------
.../apache/metron/writer/kafka/KafkaWriter.java | 5 +
.../stellar/common/utils/BloomFilter.java | 8 +-
.../metron/stellar/common/utils/SerDeUtils.java | 16 +-
.../common/utils/StellarProcessorUtils.java | 101 ++++-
.../metron/stellar/dsl/functions/Ordinal.java | 36 ++
.../stellar/dsl/functions/OrdinalFunctions.java | 48 ++-
.../dsl/functions/OrdinalFunctionsTest.java | 41 +-
74 files changed, 2203 insertions(+), 792 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/eb336665/dependencies_with_url.csv
----------------------------------------------------------------------
diff --cc dependencies_with_url.csv
index 0b4b16b,df3bcd2..706f641
--- a/dependencies_with_url.csv
+++ b/dependencies_with_url.csv
@@@ -21,9 -22,9 +22,10 @@@ com.esotericsoftware:reflectasm:jar:1.1
com.flipkart.zjsonpatch:zjsonpatch:jar:0.3.4:compile,Apache v2, https://github.com/flipkart-incubator/zjsonpatch
com.google.protobuf:protobuf-java:jar:2.5.0:compile,New BSD license,http://code.google.com/p/protobuf
com.google.protobuf:protobuf-java:jar:2.6.1:compile,New BSD license,http://code.google.com/p/protobuf
+com.google.protobuf:protobuf-java:jar:3.1.0:compile,New BSD license,http://code.google.com/p/protobuf
com.jcraft:jsch:jar:0.1.42:compile,BSD,http://www.jcraft.com/jsch/
com.jayway.jsonpath:json-path:jar:2.3.0:compile,Apache v2,https://github.com/json-path/JsonPath
+ com.jayway.jsonpath:json-path:jar:2.4.0:compile,Apache v2,https://github.com/json-path/JsonPath
net.minidev:accessors-smart:jar:1.2:compile,Apache v2,https://github.com/netplex/json-smart-v2
net.minidev:json-smart:jar:2.3:compile,Apache v2,https://github.com/netplex/json-smart-v2
com.maxmind.db:maxmind-db:jar:1.2.1:compile,CC-BY-SA 3.0,https://github.com/maxmind/MaxMind-DB
@@@ -96,9 -100,9 +102,10 @@@ org.slf4j:slf4j-log4j12:jar:1.7.25:comp
org.slf4j:slf4j-log4j12:jar:1.7.5:compile,MIT,http://www.slf4j.org
org.slf4j:slf4j-log4j12:jar:1.7.7:compile,MIT,http://www.slf4j.org
org.slf4j:slf4j-simple:jar:1.7.7:compile,MIT,http://www.slf4j.org
+org.slf4j:jcl-over-slf4j:jar:1.7.7:compile,MIT,http://www.slf4j.org
org.slf4j:jcl-over-slf4j:jar:1.7.21:compile,MIT,http://www.slf4j.org
org.slf4j:jul-to-slf4j:jar:1.7.21:compile,MIT,http://www.slf4j.org
+ org.slf4j:jul-to-slf4j:jar:1.7.25:compile,MIT,http://www.slf4j.org
aopalliance:aopalliance:jar:1.0:compile,Public Domain,http://aopalliance.sourceforge.net
com.101tec:zkclient:jar:0.8:compile,The Apache Software License, Version 2.0,https://github.com/sgroschupf/zkclient
com.github.stephenc.findbugs:findbugs-annotations:jar:1.3.9-1:compile,Apache License, Version 2.0,http://stephenc.github.com/findbugs-annotations
http://git-wip-us.apache.org/repos/asf/metron/blob/eb336665/metron-deployment/ansible/roles/ambari_config/vars/single_node_vm.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/eb336665/metron-deployment/packaging/ambari/.gitignore
----------------------------------------------------------------------
diff --cc metron-deployment/packaging/ambari/.gitignore
index 72538a0,2f93166..d2cc43c
--- a/metron-deployment/packaging/ambari/.gitignore
+++ b/metron-deployment/packaging/ambari/.gitignore
@@@ -1,6 -1,7 +1,8 @@@
archive.zip
*.hash
elasticsearch.properties.j2
+solr.properties.j2
hdfs.properties.j2
enrichment.properties.j2
+ enrichment-splitjoin.properties.j2
+ enrichment-unified.properties.j2
http://git-wip-us.apache.org/repos/asf/metron/blob/eb336665/metron-interface/metron-rest/src/main/scripts/metron-rest.sh
----------------------------------------------------------------------