Merge branch 'master' into feature/METRON-1554-pcap-query-panel
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/b580a69f Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/b580a69f Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/b580a69f Branch: refs/heads/master Commit: b580a69f1d9d3346171d749dcd6f791a9bc6d894 Parents: a5a5139 aceca46 Author: Michael Miklavcic <michael.miklav...@gmail.com> Authored: Fri Jul 20 09:40:09 2018 -0600 Committer: Michael Miklavcic <michael.miklav...@gmail.com> Committed: Fri Jul 20 09:40:09 2018 -0600 ---------------------------------------------------------------------- .travis.yml | 14 +- .../metron/profiler/client/window/Window.java | 8 +- .../profiler/client/window/WindowProcessor.java | 35 +- .../client/window/predicates/DayPredicates.java | 2 +- .../profiler/DefaultMessageDistributor.java | 18 +- .../ansible/playbooks/docker_probe_install.yml | 2 +- .../ansible/roles/bro/vars/main.yml | 2 +- .../centos6/ansible/inventory/group_vars/all | 2 +- .../ubuntu14/ansible/inventory/group_vars/all | 2 +- .../package/scripts/alerts_ui_commands.py | 9 +- .../package/scripts/management_ui_commands.py | 9 +- metron-deployment/scripts/platform-info.sh | 4 + .../alert-details-status.e2e-spec.ts | 129 +++--- .../meta-alerts/meta-alert.e2e-spec.ts | 30 +- metron-interface/metron-alerts/karma.conf.js | 15 +- metron-interface/metron-alerts/package.json | 3 +- metron-interface/metron-alerts/pom.xml | 14 +- .../apache/metron/rest/config/KafkaConfig.java | 4 +- .../service/impl/StormAdminServiceImpl.java | 23 +- .../rest/service/impl/StormCLIWrapper.java | 25 +- .../common/bolt/ConfiguredParserBolt.java | 10 +- .../configuration/IndexingConfigurations.java | 2 +- .../configuration/SensorParserConfig.java | 12 +- .../writer/ConfigurationsStrategies.java | 2 +- .../apache/metron/common/error/MetronError.java | 64 +-- .../common/performance/PerformanceLogger.java | 10 +- .../apache/metron/common/system/FakeClock.java | 18 +- .../metron/common/utils/ReflectionUtils.java | 2 +- .../configurations/ConfigurationsUpdater.java | 1 - .../common/bolt/ConfiguredParserBoltTest.java | 2 +- .../metron/common/error/MetronErrorTest.java | 16 +- .../indexing/dao/metaalert/MetaAlertDao.java | 6 +- .../dao/metaalert/MetaAlertIntegrationTest.java | 56 +++ .../metron/management/KafkaFunctions.java | 109 +++++ .../KafkaFunctionsIntegrationTest.java | 92 +++++ .../metron-parsers/3rdPartyParser.md | 408 +++++++++---------- metron-platform/metron-parsers/README.md | 25 +- .../apache/metron/parsers/bolt/ParserBolt.java | 241 ++++++----- .../apache/metron/parsers/bolt/WriterBolt.java | 3 +- .../parsers/topology/ParserComponents.java | 67 +++ .../parsers/topology/ParserTopologyBuilder.java | 200 ++++++--- .../parsers/topology/ParserTopologyCLI.java | 264 ++++++++---- .../parsers/topology/config/ValueSupplier.java | 3 +- .../metron/parsers/bolt/ParserBoltTest.java | 182 ++++++--- .../metron/parsers/bolt/WriterBoltTest.java | 30 +- .../parsers/integration/ParserDriver.java | 50 ++- .../components/ParserTopologyComponent.java | 58 +-- .../parsers/topology/ParserTopologyCLITest.java | 318 ++++++++++----- ...pleHbaseEnrichmentWriterIntegrationTest.java | 3 +- .../integration/WriterBoltIntegrationTest.java | 150 ++++++- .../src/main/config/schema/metaalert/schema.xml | 6 +- .../metron/writer/BulkWriterComponent.java | 27 +- .../metron/writer/BulkWriterComponentTest.java | 34 +- .../stellar/common/CachingStellarProcessor.java | 2 +- .../org/apache/metron/stellar/dsl/Context.java | 2 +- .../dsl/functions/DateFunctionsTest.java | 3 +- use-cases/forensic_clustering/README.md | 228 +++++++---- use-cases/parser_chaining/README.md | 14 + .../aggregated_parser_chaining_flow.svg | 14 + .../aggregated_parser_chaining_flow.xml | 14 + use-cases/typosquat_detection/README.md | 9 +- 61 files changed, 2109 insertions(+), 998 deletions(-) ----------------------------------------------------------------------