You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ot...@apache.org on 2016/10/31 13:07:51 UTC
[10/19] incubator-metron git commit: Merge remote-tracking branch
'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/10bc425f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/10bc425f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/10bc425f
Branch: refs/heads/master
Commit: 10bc425f31cfcd8db1d1007bb0a0916800443c23
Parents: 56686c0 609ea40
Author: Otto Fowler <of...@industrialdefender.com>
Authored: Tue Oct 11 16:07:09 2016 -0400
Committer: Otto Fowler <of...@industrialdefender.com>
Committed: Tue Oct 11 16:07:09 2016 -0400
----------------------------------------------------------------------
.../metron-profiler-client/README.md | 82 ++++++
metron-analytics/metron-profiler-client/pom.xml | 159 +++---------
.../profiler/client/stellar/GetProfile.java | 8 +-
metron-analytics/metron-profiler-common/pom.xml | 53 ++++
.../metron/profiler/ProfileMeasurement.java | 134 ++++++++++
.../apache/metron/profiler/ProfilePeriod.java | 99 +++++++
.../metron/profiler/hbase/ColumnBuilder.java | 50 ++++
.../metron/profiler/hbase/RowKeyBuilder.java | 60 +++++
.../profiler/hbase/SaltyRowKeyBuilder.java | 204 +++++++++++++++
.../profiler/hbase/ValueOnlyColumnBuilder.java | 76 ++++++
.../stellar/DefaultStellarExecutor.java | 144 ++++++++++
.../profiler/stellar/StellarExecutor.java | 74 ++++++
.../src/main/resources/META-INF/LICENSE | 234 +++++++++++++++++
.../metron/profiler/ProfilePeriodTest.java | 121 +++++++++
.../profiler/hbase/SaltyRowKeyBuilderTest.java | 260 +++++++++++++++++++
.../stellar/DefaultStellarExecutorTest.java | 181 +++++++++++++
.../src/test/resources/log4j.properties | 28 ++
metron-analytics/metron-profiler/README.md | 20 +-
metron-analytics/metron-profiler/pom.xml | 63 ++---
.../src/main/assembly/assembly.xml | 2 +-
.../metron/profiler/ProfileMeasurement.java | 134 ----------
.../apache/metron/profiler/ProfilePeriod.java | 99 -------
.../metron/profiler/hbase/ColumnBuilder.java | 50 ----
.../metron/profiler/hbase/RowKeyBuilder.java | 60 -----
.../profiler/hbase/SaltyRowKeyBuilder.java | 214 ---------------
.../profiler/hbase/ValueOnlyColumnBuilder.java | 76 ------
.../stellar/DefaultStellarExecutor.java | 144 ----------
.../profiler/stellar/StellarExecutor.java | 74 ------
.../src/main/scripts/start_profiler_topology.sh | 2 +-
.../metron/profiler/ProfilePeriodTest.java | 120 ---------
.../profiler/bolt/ProfileBuilderBoltTest.java | 1 -
.../profiler/hbase/SaltyRowKeyBuilderTest.java | 259 ------------------
.../stellar/DefaultStellarExecutorTest.java | 180 -------------
metron-analytics/pom.xml | 3 +-
.../docker/rpm-docker/SPECS/metron.spec | 6 +-
.../roles/metron_common/tasks/main.yml | 4 +-
.../roles/metron_streaming/defaults/main.yml | 3 +
.../metron_streaming/tasks/copy_bundles.yml | 85 ++----
metron-platform/metron-common/README.md | 7 +-
.../dsl/functions/DataStructureFunctions.java | 31 ++-
.../common/interfaces/BulkMessageWriter.java | 38 ---
.../metron/common/interfaces/MessageWriter.java | 30 ---
.../metron/common/writer/BulkMessageWriter.java | 46 ++++
.../common/writer/BulkWriterResponse.java | 93 +++++++
.../metron/common/writer/MessageWriter.java | 30 +++
.../org/apache/metron/common/writer/test.json | 28 ++
.../functions/DataStructureFunctionsTest.java | 62 +++++
.../metron/common/stellar/StellarTest.java | 35 ++-
metron-platform/metron-elasticsearch/pom.xml | 2 +
.../src/main/assembly/assembly.xml | 2 +-
.../writer/ElasticsearchWriter.java | 41 ++-
.../scripts/start_elasticsearch_topology.sh | 2 +-
.../writer/ElasticsearchWriterTest.java | 190 ++++++++++++++
metron-platform/metron-enrichment/pom.xml | 13 +
.../enrichment/bolt/EnrichmentJoinBolt.java | 4 +-
.../enrichment/bolt/EnrichmentSplitterBolt.java | 4 +-
.../enrichment/bolt/ThreatIntelJoinBolt.java | 4 +-
.../bolt/ThreatIntelSplitterBolt.java | 4 +-
.../writer/SimpleHbaseEnrichmentWriter.java | 18 +-
.../bolt/BulkMessageWriterBoltTest.java | 2 +-
.../apache/metron/hbase/writer/HBaseWriter.java | 3 +-
metron-platform/metron-indexing/pom.xml | 2 +
.../main/sample/data/snort/parsed/SnortParsed | 6 +-
.../apache/metron/management/GrokFunctions.java | 9 +-
metron-platform/metron-parsers/pom.xml | 38 ++-
.../src/main/assembly/assembly.xml | 2 +-
.../org/apache/metron/parsers/GrokParser.java | 7 +-
.../metron/parsers/bolt/WriterHandler.java | 4 +-
.../metron/parsers/snort/BasicSnortParser.java | 39 ++-
.../parsers/topology/ParserTopologyBuilder.java | 4 +-
.../src/main/scripts/start_parser_topology.sh | 2 +-
.../apache/metron/parsers/SnortParserTest.java | 6 +-
.../metron/parsers/bolt/ParserBoltTest.java | 12 +-
.../metron/parsers/bolt/WriterBoltTest.java | 86 ++++--
metron-platform/metron-pcap-backend/pom.xml | 2 -
.../apache/metron/pcap/QueryPcapFilterTest.java | 12 +-
.../PcapTopologyIntegrationTest.java | 64 ++++-
.../src/test/resources/log4j.properties | 24 ++
.../metron/pcap/filter/PcapFieldResolver.java | 10 +-
.../pcap/filter/fixed/FixedPcapFilter.java | 18 +-
metron-platform/metron-solr/pom.xml | 9 +-
.../metron-solr/src/main/assembly/assembly.xml | 2 +-
.../apache/metron/solr/writer/SolrWriter.java | 12 +-
.../src/main/scripts/start_solr_topology.sh | 2 +-
.../metron/writer/BulkWriterComponent.java | 29 ++-
.../org/apache/metron/writer/NoopWriter.java | 9 +-
.../metron/writer/WriterToBulkWriter.java | 22 +-
.../writer/bolt/BulkMessageWriterBolt.java | 4 +-
.../apache/metron/writer/hdfs/HdfsWriter.java | 21 +-
.../apache/metron/writer/kafka/KafkaWriter.java | 2 +-
90 files changed, 2845 insertions(+), 1869 deletions(-)
----------------------------------------------------------------------