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 58f4519 Merge remote-tracking branch 'apache/master' into feature/METRON-2088-support-hdp-3.1 add adf477d METRON-2089 [UI] Adding loading state to Alerts details view (tiborm via sardell) closes apache/metron#1390 add 5a3fd55 METRON-2111 Update public web site to point at 0.7.1 new release (justinleet) closes apache/metron#1406 add fcd681d METRON-1997 Replace Threat Triage Score Field Slider with Text Box (ruffle1986 via sardell) closes apache/metron#1334 add b8df052 METRON-2107 Add architecture diagram item to PR checklist (mmiklavc) closes apache/metron#1401 add 2653157 METRON-2058 UI: Actions -> Add to Alert can still be selected from dropdown when no alerts are selected. (ruffle1986 via sardell) closes apache/metron#1373 add 506c18c METRON-2085 [UI] Alerts UI Details Pane: naming meta alerts is broken (ruffle1986 via sardell) closes apache/metron#1388 add 22cc622 METRON-2118 Added a LEEF parser (simonellistonball via mmiklavc) closes apache/metron#1408 add 3b04460 METRON-1788 Batch profiler pull profile information from zookeeper (tigerquoll via mmiklavc) closes apache/metron#1383 add a6281d3 METRON-2113 Update version to 0.7.2 (justinleet) closes apache/metron#1407 add 373ac51 METRON-2109 Add option to use Metron GUID as the id in Elasticsearch (merrimanr) closes apache/metron#1403 add 9b70adf METRON-2123 Expand Stellar JOIN to work on all Iterables (mmiklavc) closes apache/metron#1416 add ccb5bec METRON-2143 Travis Build Fails to Download Maven (nickwallen) closes apache/metron#1433 add bfe662d METRON-2128 LEEF config file is missing in RPM spec file (simonellistonball via mmiklavc) closes apache/metron#1419 add b9a130c METRON-2087 Remove Storm dependency from metron-indexing (merrimanr) closes apache/metron#1389 add 3754ff3 METRON-2112 Normalize parser original_string handling (mmiklavc) closes apache/metron#1409 add 2dd753e METRON-2152 Add debug logging for when sensor batchTimeout exceeds the calculated maximum (mmiklavc) closes apache/metron#1437 add a8f2d3a METRON-2083 Fix broken links in root metron README (mmiklavc) closes apache/metron#1435 add dbf8bf9 METRON-2145 Clarify RPM build documentation (mmiklavc) closes apache/metron#1434 add e16ff31 METRON-2127 Update Maven repositories to https (justinleet via mmiklavc) closes apache/metron#1417 add a1487ec METRON-2153 ParserIntegrationTest should print failed messages (merrimanr) closes apache/metron#1438 add 5bd7e01 METRON-2102 [UI] Adding click-through navigation to Alerts table (tiborm via mmiklavc) closes apache/metron#1431 add 3c13173 METRON-2141 Cache REST API status update calls to the Storm UI (mmiklavc) closes apache/metron#1439 add 9621ec7 METRON-2092 [UI] Config UI does not require you to set a grok timestamp field by default (ruffle1986 via sardell) closes apache/metron#1393 add 38b8a78 METRON-2073 Create in-memory use case for enrichment with map type and flatfile summarizer (merrimanr) closes apache/metron#1399 add ee1b2c3 METRON-1253 Manual pasting of timestamps into the timestamp picker (ruffle1986 via sardell) closes apache/metron#1380 add 09bbdf3 METRON-2142 Install solar schema as metron user (MohanDV via nickwallen) closes apache/metron#1432 add a2a46e6 METRON-2156 Remove Storm dependency from metron-hbase (merrimanr) closes apache/metron#1441 new 11f9663 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: .github/PULL_REQUEST_TEMPLATE.md | 2 + .travis.yml | 2 +- README.md | 4 +- metron-analytics/metron-maas-common/pom.xml | 2 +- metron-analytics/metron-maas-service/pom.xml | 2 +- metron-analytics/metron-profiler-client/pom.xml | 6 +- .../metron/profiler/client/ProfileWriter.java | 2 +- metron-analytics/metron-profiler-common/pom.xml | 4 +- .../metron/profiler/hbase/ColumnBuilder.java | 2 +- .../profiler/hbase/ValueOnlyColumnBuilder.java | 2 +- metron-analytics/metron-profiler-repl/pom.xml | 2 +- metron-analytics/metron-profiler-spark/README.md | 61 +- metron-analytics/metron-profiler-spark/pom.xml | 12 +- .../profiler/spark/cli/BatchProfilerCLI.java | 126 ++- .../spark/cli/BatchProfilerCLIOptions.java | 15 +- .../src/main/scripts/start_batch_profiler.sh | 18 +- .../profiler/spark/cli/BatchProfilerCLITest.java | 28 +- .../spark/cli/BatchProfilerZKIntegrationTest.java | 82 ++ metron-analytics/metron-profiler-storm/pom.xml | 15 +- .../org/apache/metron/hbase/bolt/BatchHelper.java | 0 .../org/apache/metron/hbase/bolt/HBaseBolt.java | 2 +- .../metron/hbase/bolt/mapper/HBaseMapper.java | 1 + .../metron/profiler/storm/ProfileHBaseMapper.java | 2 +- .../apache/metron/hbase/bolt/HBaseBoltTest.java | 4 +- .../apache/metron/hbase/bolt/mapper}/Widget.java | 2 +- .../metron/hbase/bolt/mapper}/WidgetMapper.java | 5 +- metron-analytics/metron-statistics/pom.xml | 2 +- metron-analytics/pom.xml | 2 +- metron-contrib/metron-docker/pom.xml | 2 +- metron-contrib/metron-performance/pom.xml | 2 +- metron-contrib/pom.xml | 2 +- metron-deployment/amazon-ec2/conf/defaults.yml | 2 +- .../ansible/playbooks/docker_probe_install.yml | 2 +- .../ansible/roles/ambari_master/defaults/main.yml | 2 +- .../centos6/ansible/inventory/group_vars/all | 2 +- .../ubuntu14/ansible/inventory/group_vars/all | 2 +- .../packaging/ambari/elasticsearch-mpack/pom.xml | 4 +- .../packaging/ambari/metron-mpack/pom.xml | 10 +- .../CURRENT/configuration/metron-rest-env.xml | 13 +- .../common-services/METRON/CURRENT/metainfo.xml | 12 +- .../CURRENT/package/scripts/indexing_commands.py | 16 +- .../CURRENT/package/scripts/params/params_linux.py | 3 + .../package/templates/alerts-ui-app-config.json.j2 | 3 +- .../METRON/CURRENT/package/templates/metron.j2 | 3 + .../METRON/CURRENT/themes/metron_theme.json | 20 + .../metron-mpack/src/main/resources/mpack.json | 2 +- .../packaging/docker/deb-docker/README.md | 2 +- .../packaging/docker/deb-docker/pom.xml | 4 +- .../packaging/docker/rpm-docker/README.md | 4 +- .../packaging/docker/rpm-docker/SPECS/metron.spec | 124 ++- .../packaging/docker/rpm-docker/pom.xml | 22 +- metron-deployment/pom.xml | 2 +- metron-interface/metron-alerts/README.md | 4 + .../cypress/fixtures/context-menu.conf.json | 49 ++ .../integration/alert-list/context-menu.spec.js | 89 ++ .../cypress/integration/pcap/pcap.spec.js | 2 +- metron-interface/metron-alerts/package-lock.json | 2 +- metron-interface/metron-alerts/package.json | 2 +- metron-interface/metron-alerts/pom.xml | 2 +- .../metron-alerts/scripts/package.json | 2 +- .../alert-details/alert-details.component.html | 56 +- .../alert-details/alert-details.component.scss | 17 +- .../alert-details/alert-details.component.spec.ts | 63 ++ .../alert-details/alert-details.component.ts | 41 +- .../alerts/alerts-list/alerts-list.component.html | 12 +- .../alerts/alerts-list/alerts-list.component.ts | 64 +- .../table-view/table-view.component.html | 89 +- .../table-view/table-view.component.spec.ts | 2 + .../alerts-list/table-view/table-view.component.ts | 9 +- .../src/app/app.module.spec.ts} | 7 +- .../metron-alerts/src/app/model/alert-source.ts | 1 + .../src/app/service/app-config.service.spec.ts | 154 ++++ .../src/app/service/app-config.service.ts | 21 +- .../src/app/shared/context-menu/README.md | 203 +++++ .../context-menu.component.html} | 16 +- .../context-menu/context-menu.component.scss | 58 +- .../context-menu/context-menu.component.spec.ts | 281 +++++++ .../shared/context-menu/context-menu.component.ts | 164 ++++ .../context-menu/context-menu.module.spec.ts | 17 +- .../shared/context-menu/context-menu.module.ts} | 25 +- .../context-menu/context-menu.service.spec.ts | 229 ++++++ .../shared/context-menu/context-menu.service.ts | 94 +++ .../shared/context-menu/context-menu.util.spec.ts | 32 +- .../app/shared/context-menu/context-menu.util.ts} | 9 +- .../dynamic-item.model.spec.ts} | 37 +- .../app/shared/context-menu/dynamic-item.model.ts | 31 +- .../shared/date-picker/date-picker.component.html | 13 +- .../date-picker/date-picker.component.spec.ts | 39 + .../shared/date-picker/date-picker.component.ts | 56 +- .../metron-alerts/src/app/shared/shared.module.ts | 5 +- .../metron-alerts/src/assets/app-config.json | 3 +- .../src/assets/context-menu.conf.json | 49 ++ metron-interface/metron-alerts/src/slider.scss | 1 + metron-interface/metron-config/package-lock.json | 2 +- metron-interface/metron-config/package.json | 2 +- metron-interface/metron-config/pom.xml | 2 +- .../metron-config/scripts/package.json | 2 +- .../metron-config/src/app/model/risk-level-rule.ts | 8 +- .../src/app/model/sensor-parser-config.ts | 2 + ...sensor-parser-config-readonly.component.spec.ts | 8 +- .../sensor-parser-config.component.html | 8 +- .../sensor-parser-config.component.spec.ts | 19 +- .../sensor-parser-config.component.ts | 17 +- .../rule-editor/sensor-rule-editor.component.html | 50 +- .../rule-editor/sensor-rule-editor.component.scss | 21 + .../sensor-rule-editor.component.spec.ts | 90 ++- .../rule-editor/sensor-rule-editor.component.ts | 22 +- .../rule-editor/sensor-rule-editor.module.ts | 3 +- .../sensor-threat-triage.component.html | 42 +- .../sensor-threat-triage.component.scss | 63 +- .../sensor-threat-triage.component.spec.ts | 145 +--- .../sensor-threat-triage.component.ts | 105 +-- .../app/shared/ace-editor/ace-editor.component.ts | 24 +- .../src/assets/ace/mode-javascript.js | 1 + metron-interface/metron-rest-client/pom.xml | 4 +- .../apache/metron/rest/model/TopologySummary.java | 11 +- metron-interface/metron-rest/README.md | 24 +- metron-interface/metron-rest/pom.xml | 13 +- .../src/main/config/rest_application.yml | 4 + .../apache/metron/rest/MetronRestConstants.java | 2 + .../org/apache/metron/rest/config/StormConfig.java | 21 +- .../service/impl/CachedStormStatusServiceImpl.java | 127 +++ .../rest/service/impl/StormStatusServiceImpl.java | 14 +- .../metron-rest/src/main/resources/application.yml | 2 +- .../org/apache/metron/rest/config/TestConfig.java | 12 + .../impl/CachedStormStatusServiceImplTest.java | 158 ++++ metron-interface/pom.xml | 2 +- metron-platform/Performance-tuning-guide.md | 2 +- metron-platform/README.md | 2 +- metron-platform/elasticsearch-shaded/pom.xml | 2 +- .../metron-common-storm/pom.xml | 2 +- metron-platform/metron-common-streaming/pom.xml | 2 +- metron-platform/metron-common/README.md | 3 +- metron-platform/metron-common/pom.xml | 2 +- .../java/org/apache/metron/common/Constants.java | 6 +- .../configuration/IndexingConfigurations.java | 17 + .../writer/IndexingWriterConfiguration.java | 5 + .../configuration/writer/WriterConfiguration.java | 9 + .../apache/metron/common/error/MetronError.java | 4 + .../metron-common/src/main/scripts/cluster_info.py | 2 +- .../configuration/IndexingConfigurationsTest.java | 82 ++ metron-platform/metron-data-management/pom.xml | 6 +- metron-platform/metron-elasticsearch/README.md | 378 +-------- .../{ => metron-elasticsearch-common}/README.md | 0 .../metron-elasticsearch-common}/pom.xml | 229 ++---- .../elasticsearch/bulk/BulkDocumentWriter.java | 0 .../bulk/BulkDocumentWriterResults.java | 0 .../bulk/ElasticsearchBulkDocumentWriter.java | 2 +- .../bulk/ElasticsearchImportExport.java | 0 .../metron/elasticsearch/bulk/WriteFailure.java | 0 .../metron/elasticsearch/bulk/WriteSuccess.java | 0 .../elasticsearch/client/ElasticsearchClient.java | 0 .../client/ElasticsearchClientFactory.java | 0 .../config/ElasticsearchClientConfig.java | 0 .../config/ElasticsearchClientOptions.java | 0 .../dao/ElasticsearchColumnMetadataDao.java | 0 .../metron/elasticsearch/dao/ElasticsearchDao.java | 0 .../dao/ElasticsearchMetaAlertDao.java | 0 .../ElasticsearchMetaAlertRetrieveLatestDao.java | 0 .../dao/ElasticsearchMetaAlertSearchDao.java | 0 .../dao/ElasticsearchMetaAlertUpdateDao.java | 0 .../dao/ElasticsearchRequestSubmitter.java | 0 .../dao/ElasticsearchRetrieveLatestDao.java | 0 .../elasticsearch/dao/ElasticsearchSearchDao.java | 0 .../elasticsearch/dao/ElasticsearchUpdateDao.java | 0 .../elasticsearch/utils/ElasticsearchUtils.java | 0 .../metron/elasticsearch/utils/FieldMapping.java | 0 .../elasticsearch/utils/FieldProperties.java | 0 .../elasticsearch/writer/ElasticsearchWriter.java | 13 +- .../writer/MessageIdBasedDocument.java | 0 .../src/main/resources/META-INF/LICENSE | 0 .../src/main/resources/META-INF/NOTICE | 0 .../bulk/ElasticsearchBulkDocumentWriterTest.java | 0 .../bulk/ElasticsearchImportExportTest.java | 0 .../dao/ElasticsearchColumnMetadataDaoTest.java | 0 .../elasticsearch/dao/ElasticsearchDaoTest.java | 0 .../dao/ElasticsearchMetaAlertDaoTest.java | 0 .../dao/ElasticsearchRequestSubmitterTest.java | 0 .../dao/ElasticsearchUpdateDaoTest.java | 0 ...ticsearchBulkDocumentWriterIntegrationTest.java | 2 +- .../ElasticsearchMetaAlertIntegrationTest.java | 0 .../ElasticsearchSearchIntegrationTest.java | 10 +- .../ElasticsearchUpdateIntegrationTest.java | 0 .../components/ElasticSearchComponent.java | 18 +- .../writer/ElasticsearchWriterTest.java | 62 +- .../src/test/resources/log4j.properties | 0 .../metron-elasticsearch-storm/README.md | 20 + .../metron-elasticsearch-storm}/pom.xml | 176 ++-- .../src/main/assembly/assembly.xml | 0 .../src/main/config/elasticsearch.properties | 0 .../src/main/config/elasticsearch.properties.j2 | 0 .../main/scripts/start_elasticsearch_topology.sh | 0 .../ElasticsearchIndexingIntegrationTest.java | 6 +- metron-platform/metron-elasticsearch/pom.xml | 392 +-------- .../metron-enrichment-common/pom.xml | 2 +- .../metron/enrichment/cache/ObjectCache.java | 123 +++ .../metron/enrichment/cache/ObjectCacheConfig.java | 115 +++ .../enrichment/stellar/EnrichmentObjectGet.java | 101 +++ .../metron/enrichment/stellar/ObjectGet.java | 94 +-- .../ObjectCacheTest.java} | 63 +- .../integration/mock/MockHBaseConnector.java | 52 -- .../EnrichmentObjectGetIntegrationTest.java | 72 ++ .../stellar/EnrichmentObjectGetTest.java | 152 ++++ .../stellar/ObjectGetIntegrationTest.java | 70 ++ .../metron/enrichment/stellar/ObjectGetTest.java | 115 +-- .../metron-enrichment-storm/pom.xml | 2 +- metron-platform/metron-enrichment/pom.xml | 6 +- metron-platform/metron-hbase-client/pom.xml | 2 +- metron-platform/metron-hbase-server/pom.xml | 2 +- .../metron-hbase/{ => metron-hbase-common}/pom.xml | 71 +- .../java/org/apache/metron/hbase}/ColumnList.java | 2 +- .../metron/hbase}/HBaseProjectionCriteria.java | 2 +- .../org/apache/metron/hbase/HTableProvider.java | 0 .../java/org/apache/metron/hbase}/IColumn.java | 2 +- .../java/org/apache/metron/hbase}/ICounter.java | 2 +- .../java/org/apache/metron/hbase/TableConfig.java | 0 .../org/apache/metron/hbase/TableProvider.java | 0 .../apache/metron/hbase/client/HBaseClient.java | 4 +- .../metron/hbase/client/HBaseClientTest.java | 126 +-- .../metron/hbase/mock/MockHBaseTableProvider.java | 0 .../org/apache/metron/hbase/mock/MockHTable.java | 0 .../src/test/resources/log4j.properties | 0 metron-platform/metron-hbase/pom.xml | 285 +------ .../java/org/apache/metron/hbase/Connector.java | 36 - .../org/apache/metron/hbase/HTableConnector.java | 157 ---- .../org/apache/metron/hbase/TupleTableConfig.java | 275 ------- metron-platform/metron-indexing/README.md | 270 +------ .../{ => metron-indexing-common}/README.md | 81 +- .../{ => metron-indexing-common}/pom.xml | 27 +- .../src/main/assembly/assembly.xml | 19 - .../zeppelin/metron/metron-connection-report.json | 0 .../metron/metron-connection-volume-report.json | 0 .../config/zeppelin/metron/metron-ip-report.json | 0 .../zeppelin/metron/metron-yaf-telemetry.json | 0 .../src/main/config/zookeeper/indexing/asa.json | 0 .../src/main/config/zookeeper/indexing/bro.json | 0 .../src/main/config/zookeeper/indexing/error.json | 0 .../src/main/config/zookeeper/indexing/snort.json | 0 .../main/config/zookeeper/indexing/websphere.json | 0 .../src/main/config/zookeeper/indexing/yaf.json | 0 .../apache/metron/indexing/dao/AccessConfig.java | 0 .../metron/indexing/dao/ColumnMetadataDao.java | 0 .../org/apache/metron/indexing/dao/HBaseDao.java | 0 .../org/apache/metron/indexing/dao/IndexDao.java | 0 .../metron/indexing/dao/IndexDaoFactory.java | 0 .../metron/indexing/dao/IndexUpdateCallback.java | 0 .../apache/metron/indexing/dao/MultiIndexDao.java | 0 .../metron/indexing/dao/RetrieveLatestDao.java | 0 .../dao/metaalert/DeferredMetaAlertIndexDao.java | 0 .../dao/metaalert/MetaAlertAddRemoveRequest.java | 0 .../indexing/dao/metaalert/MetaAlertConfig.java | 0 .../indexing/dao/metaalert/MetaAlertConstants.java | 0 .../dao/metaalert/MetaAlertCreateRequest.java | 0 .../indexing/dao/metaalert/MetaAlertDao.java | 0 .../dao/metaalert/MetaAlertRetrieveLatestDao.java | 0 .../indexing/dao/metaalert/MetaAlertSearchDao.java | 0 .../indexing/dao/metaalert/MetaAlertStatus.java | 0 .../indexing/dao/metaalert/MetaAlertUpdateDao.java | 0 .../metron/indexing/dao/metaalert/MetaScores.java | 0 .../lucene/AbstractLuceneMetaAlertUpdateDao.java | 0 .../metron/indexing/dao/search/AlertComment.java | 0 .../metron/indexing/dao/search/FieldType.java | 0 .../metron/indexing/dao/search/GetRequest.java | 0 .../apache/metron/indexing/dao/search/Group.java | 0 .../metron/indexing/dao/search/GroupOrder.java | 0 .../metron/indexing/dao/search/GroupOrderType.java | 0 .../metron/indexing/dao/search/GroupRequest.java | 0 .../metron/indexing/dao/search/GroupResponse.java | 0 .../metron/indexing/dao/search/GroupResult.java | 0 .../dao/search/InvalidCreateException.java | 0 .../dao/search/InvalidSearchException.java | 0 .../metron/indexing/dao/search/SearchDao.java | 0 .../metron/indexing/dao/search/SearchRequest.java | 0 .../metron/indexing/dao/search/SearchResponse.java | 0 .../metron/indexing/dao/search/SearchResult.java | 0 .../metron/indexing/dao/search/SortField.java | 0 .../metron/indexing/dao/search/SortOrder.java | 0 .../dao/update/CommentAddRemoveRequest.java | 0 .../metron/indexing/dao/update/Document.java | 0 .../dao/update/OriginalNotFoundException.java | 0 .../metron/indexing/dao/update/PatchRequest.java | 0 .../metron/indexing/dao/update/UpdateDao.java | 0 .../metron/indexing/util/IndexingCacheUtil.java | 0 .../src/main/resources/META-INF/LICENSE | 0 .../src/main/resources/META-INF/NOTICE | 0 .../InMemoryMetaAlertRetrieveLatestDao.java | 0 .../apache/metron/indexing/dao/HBaseDaoTest.java | 0 .../apache/metron/indexing/dao/InMemoryDao.java | 0 .../metron/indexing/dao/InMemoryMetaAlertDao.java | 0 .../indexing/dao/InMemoryMetaAlertUpdateDao.java | 0 .../metron/indexing/dao/MultiIndexDaoTest.java | 0 .../metron/indexing/dao/SearchIntegrationTest.java | 0 .../apache/metron/indexing/dao/UpdateDaoTest.java | 0 .../metron/indexing/dao/UpdateIntegrationTest.java | 0 .../dao/metaalert/MetaAlertIntegrationTest.java | 0 .../indexing/dao/metaalert/MetaScoresTest.java | 0 .../AbstractLuceneMetaAlertUpdateDaoTest.java | 0 .../integration/HBaseDaoIntegrationTest.java | 0 .../indexing/util/IndexingCacheUtilTest.java | 0 .../src/test/resources/log4j.properties | 0 .../metron-indexing-storm/README.md | 79 ++ .../{ => metron-indexing-storm}/indexing_arch.png | Bin .../metron-indexing-storm}/pom.xml | 123 +-- .../src/main/assembly/assembly.xml | 0 .../src/main/config/hdfs.properties.j2 | 0 .../src/main/flux/indexing/batch/remote.yaml | 0 .../main/flux/indexing/random_access/remote.yaml | 0 .../src/main/scripts/start_hdfs_topology.sh | 2 +- .../integration/HDFSIndexingIntegrationTest.java | 7 +- .../integration/IndexingIntegrationTest.java | 9 +- metron-platform/metron-indexing/pom.xml | 292 +------ metron-platform/metron-integration-test/pom.xml | 2 +- .../apache/metron/integration/TestZKServer.java | 79 ++ .../data/jsonMapQuery/parsed/jsonMapExampleParsed | 20 +- .../parsed/jsonMapExampleParsed | 12 +- .../src/main/sample/data/leef/parsed/leefParsed | 4 + .../src/main/sample/data/leef/raw/leefOutput | 4 + metron-platform/metron-job/pom.xml | 2 +- metron-platform/metron-management/pom.xml | 2 +- metron-platform/metron-parsing/README.md | 20 +- .../metron-parsing/metron-parsers-common/pom.xml | 9 +- .../org/apache/metron/parsers/ParserComponent.java | 3 + .../apache/metron/parsers/ParserRunnerImpl.java | 2 + .../apache/metron/parsers/json/JSONMapParser.java | 21 +- .../org/apache/metron/parsers/utils/DateUtils.java | 9 + .../metron/parsers/ParserRunnerImplTest.java | 45 +- .../parsers/integration/ParserIntegrationTest.java | 3 +- .../parsers/json/JSONMapParserQueryTest.java | 61 +- .../metron/parsers/json/JSONMapParserTest.java | 14 +- .../json/JSONMapParserWrappedQueryTest.java | 12 +- .../metron-parsing/metron-parsers/pom.xml | 2 +- .../src/main/config/zookeeper/parsers/leef.json | 4 + .../org/apache/metron/parsers/cef/CEFParser.java | 97 ++- .../org/apache/metron/parsers/leef/LEEFParser.java | 287 +++++++ .../apache/metron/parsers/cef/CEFParserTest.java | 57 +- .../apache/metron/parsers/leef/LEEFParserTest.java | 243 ++++++ .../org/apache/metron/parsers/leef/sample.leef | 4 + .../org/apache/metron/parsers/leef/sample.schema | 27 + .../metron-parsing/metron-parsing-storm/README.md | 8 +- .../metron-parsing/metron-parsing-storm/pom.xml | 4 +- .../org/apache/metron/parsers/bolt/ParserBolt.java | 6 +- .../integration/validation/StormParserDriver.java | 13 + metron-platform/metron-parsing/pom.xml | 2 +- metron-platform/metron-pcap-backend/pom.xml | 2 +- .../src/main/scripts/pcap_zeppelin_run.sh | 2 +- metron-platform/metron-pcap/pom.xml | 4 +- metron-platform/metron-solr/README.md | 153 +--- .../metron-solr/{ => metron-solr-common}/README.md | 2 +- .../metron-solr/{ => metron-solr-common}/pom.xml | 124 ++- .../src/main/assembly/assembly.xml | 8 - .../src/main/config/schema/bro/schema.xml | 0 .../src/main/config/schema/bro}/solrconfig.xml | 0 .../src/main/config/schema/error/schema.xml | 0 .../src/main/config/schema/error}/solrconfig.xml | 0 .../src/main/config/schema/metaalert/schema.xml | 0 .../main/config/schema/metaalert}/solrconfig.xml | 0 .../src/main/config/schema/snort/schema.xml | 0 .../src/main/config/schema/snort}/solrconfig.xml | 0 .../src/main/config/schema/yaf/schema.xml | 0 .../src/main/config/schema/yaf}/solrconfig.xml | 0 .../java/org/apache/metron/solr/SolrConstants.java | 0 .../metron/solr/client/SolrClientFactory.java | 0 .../metron/solr/dao/SolrColumnMetadataDao.java | 0 .../java/org/apache/metron/solr/dao/SolrDao.java | 0 .../apache/metron/solr/dao/SolrMetaAlertDao.java | 0 .../solr/dao/SolrMetaAlertRetrieveLatestDao.java | 0 .../metron/solr/dao/SolrMetaAlertSearchDao.java | 0 .../metron/solr/dao/SolrMetaAlertUpdateDao.java | 0 .../metron/solr/dao/SolrRetrieveLatestDao.java | 0 .../org/apache/metron/solr/dao/SolrSearchDao.java | 0 .../org/apache/metron/solr/dao/SolrUpdateDao.java | 0 .../org/apache/metron/solr/dao/SolrUtilities.java | 0 .../org/apache/metron/solr/schema/FieldType.java | 0 .../metron/solr/schema/SchemaTranslator.java | 0 .../metron/solr/writer/MetronSolrClient.java | 0 .../org/apache/metron/solr/writer/SolrWriter.java | 0 .../src/main/scripts/create_collection.sh | 0 .../src/main/scripts/delete_collection.sh | 0 .../src/main/scripts/install_solr.sh | 0 .../src/main/scripts/start_solr.sh | 0 .../src/main/scripts/stop_solr.sh | 0 .../enrichment/integration/utils/SampleUtil.java | 6 +- .../metron/solr/client/SolrClientFactoryTest.java | 0 .../metron/solr/dao/SolrColumnMetadataTest.java | 0 .../org/apache/metron/solr/dao/SolrDaoTest.java | 0 .../metron/solr/dao/SolrMetaAlertDaoTest.java | 0 .../apache/metron/solr/dao/SolrSearchDaoTest.java | 0 .../apache/metron/solr/dao/SolrUpdateDaoTest.java | 0 .../apache/metron/solr/dao/SolrUtilitiesTest.java | 0 .../integration/SolrMetaAlertIntegrationTest.java | 4 +- .../SolrRetrieveLatestIntegrationTest.java | 4 +- .../integration/SolrSearchIntegrationTest.java | 4 +- .../integration/SolrUpdateIntegrationTest.java | 4 +- .../solr/integration/components/SolrComponent.java | 0 .../schema/SchemaValidationIntegrationTest.java | 0 .../solr/matcher/ModifiableSolrParamsMatcher.java | 0 .../solr/matcher/SolrInputDocumentListMatcher.java | 0 .../solr/matcher/SolrInputDocumentMatcher.java | 0 .../metron/solr/matcher/SolrQueryMatcher.java | 0 .../metron/solr/writer/MetronSolrClientTest.java | 0 .../apache/metron/solr/writer/SolrWriterTest.java | 0 .../test/resources/config/test/conf/managed-schema | 0 .../resources/config/test/conf}/solrconfig.xml | 0 .../src/test/resources/example_data/bro | 0 .../src/test/resources/example_data/error | 0 .../src/test/resources/example_data/snort | 0 .../src/test/resources/example_data/yaf | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/log4j2.xml | 0 .../test/resources/solr/conf/_rest_managed.json | 0 .../src/test/resources/solr/conf/currency.xml | 0 .../test/resources/solr/conf/lang/stopwords_en.txt | 0 .../src/test/resources/solr/conf/protwords.txt | 0 .../src/test/resources/solr/conf/schema.xml | 0 .../src/test/resources/solr/conf/solrconfig.xml | 0 .../src/test/resources/solr/conf/stopwords.txt | 0 .../src/test/resources/solr/conf/synonyms.txt | 0 .../src/test/resources/solr/solr.xml | 0 .../metron-solr/metron-solr-storm/README.md | 20 + .../metron-solr-storm}/pom.xml | 162 ++-- .../src/main/assembly/assembly.xml | 0 .../src/main/config/solr.properties | 0 .../src/main/config/solr.properties.j2 | 0 .../src/main/scripts/start_solr_topology.sh | 0 .../integration/SolrIndexingIntegrationTest.java | 15 +- metron-platform/metron-solr/pom.xml | 373 +-------- .../metron-storm-kafka-override/pom.xml | 2 +- metron-platform/metron-storm-kafka/pom.xml | 2 +- metron-platform/metron-test-utilities/pom.xml | 2 +- .../metron-writer/metron-writer-common/pom.xml | 4 +- .../apache/metron/writer/BatchTimeoutPolicy.java | 1 + .../metron-writer/metron-writer-storm/pom.xml | 2 +- metron-platform/metron-writer/pom.xml | 2 +- metron-platform/metron-zookeeper/pom.xml | 2 +- metron-platform/pom.xml | 2 +- metron-stellar/pom.xml | 2 +- metron-stellar/stellar-3rd-party-example/pom.xml | 2 +- metron-stellar/stellar-common/README.md | 8 +- metron-stellar/stellar-common/pom.xml | 2 +- .../stellar/dsl/functions/StringFunctions.java | 20 +- .../stellar/dsl/functions/BasicStellarTest.java | 2 + metron-stellar/stellar-zeppelin/README.md | 8 +- metron-stellar/stellar-zeppelin/pom.xml | 2 +- pom.xml | 6 +- site-book/pom.xml | 2 +- site/current-book/CONTRIBUTING.html | 12 +- site/current-book/Upgrading.html | 28 +- site/current-book/index.html | 14 +- site/current-book/metron-analytics/index.html | 12 +- .../metron-maas-service/index.html | 12 +- .../metron-profiler-client/index.html | 12 +- .../metron-profiler-common/index.html | 12 +- .../metron-profiler-repl/index.html | 12 +- .../metron-profiler-spark/index.html | 21 +- .../metron-profiler-storm/index.html | 12 +- .../metron-analytics/metron-statistics/HLLP.html | 12 +- .../metron-analytics/metron-statistics/index.html | 12 +- .../metron-contrib/metron-docker/index.html | 14 +- .../metron-contrib/metron-performance/index.html | 12 +- .../metron-deployment/Kerberos-ambari-setup.html | 12 +- .../metron-deployment/Kerberos-manual-setup.html | 56 +- .../metron-deployment/amazon-ec2/index.html | 12 +- .../metron-deployment/ansible/index.html | 12 +- .../metron-deployment/ansible/roles/index.html | 12 +- .../ansible/roles/opentaxii/index.html | 12 +- .../ansible/roles/pcap_replay/index.html | 12 +- .../ansible/roles/sensor-stubs/index.html | 12 +- .../ansible/roles/sensor-test-mode/index.html | 12 +- .../development/centos6/index.html | 12 +- .../development/fastcapa/index.html | 12 +- .../metron-deployment/development/index.html | 12 +- .../development/ubuntu14/index.html | 12 +- site/current-book/metron-deployment/index.html | 56 +- .../metron-deployment/other-examples/index.html | 12 +- .../manual-install/Manual_Install_CentOS6.html | 12 +- .../ambari/elasticsearch-mpack/index.html | 12 +- .../metron-deployment/packaging/ambari/index.html | 42 +- .../packaging/ambari/metron-mpack/index.html | 19 +- .../packaging/docker/ansible-docker/index.html | 12 +- .../packaging/docker/deb-docker/index.html | 12 +- .../packaging/docker/rpm-docker/index.html | 12 +- .../packaging/packer-build/index.html | 12 +- site/current-book/metron-interface/index.html | 232 ++++++ .../metron-interface/metron-alerts/index.html | 59 +- .../metron-interface/metron-config/index.html | 12 +- .../metron-interface/metron-rest/index.html | 439 +++++++--- .../metron-platform/Performance-tuning-guide.html | 25 +- site/current-book/metron-platform/index.html | 19 +- .../metron-platform/metron-common/index.html | 217 +++-- .../metron-data-management/index.html | 39 +- .../metron-elasticsearch/index.html | 25 +- .../metron-platform/metron-enrichment/index.html | 450 +---------- .../{ => metron-enrichment-common}/index.html | 259 ++---- .../{ => metron-enrichment-storm}/Performance.html | 82 +- .../metron-enrichment-storm/index.html | 261 ++++++ .../index.html} | 100 +-- .../metron-platform/metron-indexing/index.html | 15 +- .../metron-platform/metron-job/index.html | 15 +- .../metron-platform/metron-management/index.html | 896 ++++++++++++++------- .../metron-parsers/parser-testing.html | 208 ----- .../org/apache/metron/parsers/paloalto/index.html | 156 ---- .../{metron-parsers => metron-parsing}/index.html | 437 +++++----- .../metron-parsers-common}/3rdPartyParser.html | 93 ++- .../metron-parsers-common}/ParserChaining.html | 95 +-- .../metron-parsers-common}/index.html | 73 +- .../message-parser-implementation-notes.html | 91 ++- .../metron-parsers-common/parser-testing.html | 161 ++++ .../org/apache/metron/parsers/paloalto/index.html | 161 ++++ .../metron-parsing/metron-parsers}/index.html | 76 +- .../org/apache/metron/parsers/paloalto/index.html | 157 ++++ .../metron-parsing/metron-parsing-storm/index.html | 278 +++++++ .../metron-platform/metron-pcap-backend/index.html | 15 +- .../metron-platform/metron-solr/index.html | 19 +- .../metron-platform/metron-writer/index.html | 118 ++- .../metron-sensors/fastcapa/index.html | 12 +- site/current-book/metron-sensors/index.html | 12 +- site/current-book/metron-sensors/pycapa/index.html | 12 +- .../stellar-3rd-party-example/index.html | 12 +- .../stellar-common/3rdPartyStellar.html | 12 +- .../metron-stellar/stellar-common/index.html | 250 +++--- .../metron-stellar/stellar-zeppelin/index.html | 24 +- .../use-cases/forensic_clustering/index.html | 12 +- .../use-cases/geographic_login_outliers/index.html | 12 +- site/current-book/use-cases/index.html | 12 +- .../use-cases/parser_chaining/index.html | 12 +- .../use-cases/typosquat_detection/index.html | 12 +- site/documentation/index.md | 12 +- 527 files changed, 9405 insertions(+), 6963 deletions(-) create mode 100644 metron-analytics/metron-profiler-spark/src/test/java/org/apache/metron/profiler/spark/cli/BatchProfilerZKIntegrationTest.java rename {metron-platform/metron-hbase => metron-analytics/metron-profiler-storm}/src/main/java/org/apache/metron/hbase/bolt/BatchHelper.java (100%) rename {metron-platform/metron-hbase => metron-analytics/metron-profiler-storm}/src/main/java/org/apache/metron/hbase/bolt/HBaseBolt.java (99%) rename {metron-platform/metron-hbase => metron-analytics/metron-profiler-storm}/src/main/java/org/apache/metron/hbase/bolt/mapper/HBaseMapper.java (97%) rename {metron-platform/metron-hbase => metron-analytics/metron-profiler-storm}/src/test/java/org/apache/metron/hbase/bolt/HBaseBoltTest.java (97%) rename {metron-platform/metron-hbase/src/test/java/org/apache/metron/hbase => metron-analytics/metron-profiler-storm/src/test/java/org/apache/metron/hbase/bolt/mapper}/Widget.java (97%) rename {metron-platform/metron-hbase/src/test/java/org/apache/metron/hbase => metron-analytics/metron-profiler-storm/src/test/java/org/apache/metron/hbase/bolt/mapper}/WidgetMapper.java (93%) create mode 100644 metron-interface/metron-alerts/cypress/fixtures/context-menu.conf.json create mode 100644 metron-interface/metron-alerts/cypress/integration/alert-list/context-menu.spec.js copy metron-interface/{metron-config/src/app/model/risk-level-rule.ts => metron-alerts/src/app/app.module.spec.ts} (87%) create mode 100644 metron-interface/metron-alerts/src/app/service/app-config.service.spec.ts create mode 100644 metron-interface/metron-alerts/src/app/shared/context-menu/README.md copy metron-interface/metron-alerts/src/app/shared/{date-picker/date-picker.component.html => context-menu/context-menu.component.html} (50%) copy metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/bulk/WriteFailure.java => metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.component.scss (54%) create mode 100644 metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.component.spec.ts create mode 100644 metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.component.ts copy metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/IndexUpdateCallback.java => metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.module.spec.ts (72%) copy metron-interface/{metron-config/src/app/sensors/sensor-threat-triage/rule-editor/sensor-rule-editor.module.ts => metron-alerts/src/app/shared/context-menu/context-menu.module.ts} (67%) create mode 100644 metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.service.spec.ts create mode 100644 metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.service.ts copy metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/utils/FieldMapping.java => metron-interface/metron-alerts/src/app/shared/context-menu/context-menu.util.spec.ts (55%) copy metron-interface/{metron-config/src/app/model/risk-level-rule.ts => metron-alerts/src/app/shared/context-menu/context-menu.util.ts} (85%) copy metron-interface/metron-alerts/src/app/shared/{date-picker/date-picker.component.spec.ts => context-menu/dynamic-item.model.spec.ts} (50%) copy metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/search/SearchDao.java => metron-interface/metron-alerts/src/app/shared/context-menu/dynamic-item.model.ts (52%) create mode 100644 metron-interface/metron-alerts/src/assets/context-menu.conf.json create mode 100644 metron-interface/metron-config/src/assets/ace/mode-javascript.js create mode 100644 metron-interface/metron-rest/src/main/java/org/apache/metron/rest/service/impl/CachedStormStatusServiceImpl.java create mode 100644 metron-interface/metron-rest/src/test/java/org/apache/metron/rest/service/impl/CachedStormStatusServiceImplTest.java create mode 100644 metron-platform/metron-common/src/test/java/org/apache/metron/common/configuration/IndexingConfigurationsTest.java copy metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/README.md (100%) copy metron-platform/{metron-indexing => metron-elasticsearch/metron-elasticsearch-common}/pom.xml (56%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/bulk/BulkDocumentWriter.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/bulk/BulkDocumentWriterResults.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/bulk/ElasticsearchBulkDocumentWriter.java (98%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/bulk/ElasticsearchImportExport.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/bulk/WriteFailure.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/bulk/WriteSuccess.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/client/ElasticsearchClient.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/client/ElasticsearchClientFactory.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/config/ElasticsearchClientConfig.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/config/ElasticsearchClientOptions.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchColumnMetadataDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertRetrieveLatestDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertSearchDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertUpdateDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchRequestSubmitter.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchRetrieveLatestDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchSearchDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchUpdateDao.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/utils/ElasticsearchUtils.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/utils/FieldMapping.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/utils/FieldProperties.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/writer/ElasticsearchWriter.java (93%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/java/org/apache/metron/elasticsearch/writer/MessageIdBasedDocument.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/resources/META-INF/LICENSE (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/main/resources/META-INF/NOTICE (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/bulk/ElasticsearchBulkDocumentWriterTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/bulk/ElasticsearchImportExportTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchColumnMetadataDaoTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchDaoTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchRequestSubmitterTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchUpdateDaoTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchBulkDocumentWriterIntegrationTest.java (97%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchMetaAlertIntegrationTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchSearchIntegrationTest.java (95%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchUpdateIntegrationTest.java (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java (95%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-common}/src/test/java/org/apache/metron/elasticsearch/writer/ElasticsearchWriterTest.java (80%) rename metron-platform/{metron-solr => metron-elasticsearch/metron-elasticsearch-common}/src/test/resources/log4j.properties (100%) create mode 100644 metron-platform/metron-elasticsearch/metron-elasticsearch-storm/README.md copy metron-platform/{metron-enrichment/metron-enrichment-common => metron-elasticsearch/metron-elasticsearch-storm}/pom.xml (60%) copy metron-platform/metron-elasticsearch/{ => metron-elasticsearch-storm}/src/main/assembly/assembly.xml (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-storm}/src/main/config/elasticsearch.properties (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-storm}/src/main/config/elasticsearch.properties.j2 (100%) rename metron-platform/metron-elasticsearch/{ => metron-elasticsearch-storm}/src/main/scripts/start_elasticsearch_topology.sh (100%) rename metron-platform/metron-elasticsearch/{src/test/java/org/apache/metron/elasticsearch => metron-elasticsearch-storm/src/test/java/org/apache/metron/indexing}/integration/ElasticsearchIndexingIntegrationTest.java (96%) create mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/main/java/org/apache/metron/enrichment/cache/ObjectCache.java create mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/main/java/org/apache/metron/enrichment/cache/ObjectCacheConfig.java create mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/main/java/org/apache/metron/enrichment/stellar/EnrichmentObjectGet.java copy metron-platform/metron-enrichment/metron-enrichment-common/src/test/java/org/apache/metron/enrichment/{stellar/ObjectGetTest.java => cache/ObjectCacheTest.java} (54%) delete mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/test/java/org/apache/metron/enrichment/integration/mock/MockHBaseConnector.java create mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/test/java/org/apache/metron/enrichment/stellar/EnrichmentObjectGetIntegrationTest.java create mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/test/java/org/apache/metron/enrichment/stellar/EnrichmentObjectGetTest.java create mode 100644 metron-platform/metron-enrichment/metron-enrichment-common/src/test/java/org/apache/metron/enrichment/stellar/ObjectGetIntegrationTest.java copy metron-platform/metron-hbase/{ => metron-hbase-common}/pom.xml (73%) rename metron-platform/metron-hbase/{src/main/java/org/apache/metron/hbase/bolt/mapper => metron-hbase-common/src/main/java/org/apache/metron/hbase}/ColumnList.java (99%) rename metron-platform/metron-hbase/{src/main/java/org/apache/metron/hbase/bolt/mapper => metron-hbase-common/src/main/java/org/apache/metron/hbase}/HBaseProjectionCriteria.java (98%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/main/java/org/apache/metron/hbase/HTableProvider.java (100%) rename metron-platform/metron-hbase/{src/main/java/org/apache/metron/hbase/bolt/mapper => metron-hbase-common/src/main/java/org/apache/metron/hbase}/IColumn.java (96%) rename metron-platform/metron-hbase/{src/main/java/org/apache/metron/hbase/bolt/mapper => metron-hbase-common/src/main/java/org/apache/metron/hbase}/ICounter.java (96%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/main/java/org/apache/metron/hbase/TableConfig.java (100%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/main/java/org/apache/metron/hbase/TableProvider.java (100%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/main/java/org/apache/metron/hbase/client/HBaseClient.java (98%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/test/java/org/apache/metron/hbase/client/HBaseClientTest.java (70%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/test/java/org/apache/metron/hbase/mock/MockHBaseTableProvider.java (100%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/test/java/org/apache/metron/hbase/mock/MockHTable.java (100%) rename metron-platform/metron-hbase/{ => metron-hbase-common}/src/test/resources/log4j.properties (100%) delete mode 100644 metron-platform/metron-hbase/src/main/java/org/apache/metron/hbase/Connector.java delete mode 100644 metron-platform/metron-hbase/src/main/java/org/apache/metron/hbase/HTableConnector.java delete mode 100644 metron-platform/metron-hbase/src/main/java/org/apache/metron/hbase/TupleTableConfig.java copy metron-platform/metron-indexing/{ => metron-indexing-common}/README.md (75%) copy metron-platform/metron-indexing/{ => metron-indexing-common}/pom.xml (93%) rename metron-platform/{metron-elasticsearch => metron-indexing/metron-indexing-common}/src/main/assembly/assembly.xml (67%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zeppelin/metron/metron-connection-report.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zeppelin/metron/metron-connection-volume-report.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zeppelin/metron/metron-ip-report.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zeppelin/metron/metron-yaf-telemetry.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zookeeper/indexing/asa.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zookeeper/indexing/bro.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zookeeper/indexing/error.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zookeeper/indexing/snort.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zookeeper/indexing/websphere.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/config/zookeeper/indexing/yaf.json (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/AccessConfig.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/ColumnMetadataDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/HBaseDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/IndexDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/IndexDaoFactory.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/IndexUpdateCallback.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/MultiIndexDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/RetrieveLatestDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/DeferredMetaAlertIndexDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertAddRemoveRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertConfig.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertConstants.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertCreateRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertRetrieveLatestDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertSearchDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertStatus.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertUpdateDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaScores.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/metaalert/lucene/AbstractLuceneMetaAlertUpdateDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/AlertComment.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/FieldType.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/GetRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/Group.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/GroupOrder.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/GroupOrderType.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/GroupRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/GroupResponse.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/GroupResult.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/InvalidCreateException.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/InvalidSearchException.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/SearchDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/SearchRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/SearchResponse.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/SearchResult.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/SortField.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/search/SortOrder.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/update/CommentAddRemoveRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/update/Document.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/update/OriginalNotFoundException.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/update/PatchRequest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/dao/update/UpdateDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/java/org/apache/metron/indexing/util/IndexingCacheUtil.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/resources/META-INF/LICENSE (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/main/resources/META-INF/NOTICE (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/InMemoryMetaAlertRetrieveLatestDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/HBaseDaoTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/InMemoryDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/InMemoryMetaAlertDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/InMemoryMetaAlertUpdateDao.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/MultiIndexDaoTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/SearchIntegrationTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/UpdateDaoTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/UpdateIntegrationTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaAlertIntegrationTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaScoresTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/dao/metaalert/lucene/AbstractLuceneMetaAlertUpdateDaoTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/integration/HBaseDaoIntegrationTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/java/org/apache/metron/indexing/util/IndexingCacheUtilTest.java (100%) rename metron-platform/metron-indexing/{ => metron-indexing-common}/src/test/resources/log4j.properties (100%) create mode 100644 metron-platform/metron-indexing/metron-indexing-storm/README.md rename metron-platform/metron-indexing/{ => metron-indexing-storm}/indexing_arch.png (100%) copy metron-platform/{metron-storm-kafka => metron-indexing/metron-indexing-storm}/pom.xml (56%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/main/assembly/assembly.xml (100%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/main/config/hdfs.properties.j2 (100%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/main/flux/indexing/batch/remote.yaml (100%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/main/flux/indexing/random_access/remote.yaml (100%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/main/scripts/start_hdfs_topology.sh (94%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/test/java/org/apache/metron/indexing/integration/HDFSIndexingIntegrationTest.java (95%) rename metron-platform/metron-indexing/{ => metron-indexing-storm}/src/test/java/org/apache/metron/indexing/integration/IndexingIntegrationTest.java (96%) create mode 100644 metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/TestZKServer.java create mode 100644 metron-platform/metron-integration-test/src/main/sample/data/leef/parsed/leefParsed create mode 100644 metron-platform/metron-integration-test/src/main/sample/data/leef/raw/leefOutput create mode 100644 metron-platform/metron-parsing/metron-parsers/src/main/config/zookeeper/parsers/leef.json create mode 100644 metron-platform/metron-parsing/metron-parsers/src/main/java/org/apache/metron/parsers/leef/LEEFParser.java create mode 100644 metron-platform/metron-parsing/metron-parsers/src/test/java/org/apache/metron/parsers/leef/LEEFParserTest.java create mode 100644 metron-platform/metron-parsing/metron-parsers/src/test/resources/org/apache/metron/parsers/leef/sample.leef create mode 100644 metron-platform/metron-parsing/metron-parsers/src/test/resources/org/apache/metron/parsers/leef/sample.schema copy metron-platform/metron-solr/{ => metron-solr-common}/README.md (98%) copy metron-platform/metron-solr/{ => metron-solr-common}/pom.xml (83%) copy metron-platform/metron-solr/{ => metron-solr-common}/src/main/assembly/assembly.xml (86%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/config/schema/bro/schema.xml (100%) rename metron-platform/metron-solr/{src/test/resources/config/test/conf => metron-solr-common/src/main/config/schema/bro}/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/config/schema/error/schema.xml (100%) rename metron-platform/metron-solr/{src/main/config/schema/yaf => metron-solr-common/src/main/config/schema/error}/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/config/schema/metaalert/schema.xml (100%) rename metron-platform/metron-solr/{src/main/config/schema/snort => metron-solr-common/src/main/config/schema/metaalert}/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/config/schema/snort/schema.xml (100%) rename metron-platform/metron-solr/{src/main/config/schema/metaalert => metron-solr-common/src/main/config/schema/snort}/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/config/schema/yaf/schema.xml (100%) rename metron-platform/metron-solr/{src/main/config/schema/error => metron-solr-common/src/main/config/schema/yaf}/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/SolrConstants.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/client/SolrClientFactory.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrColumnMetadataDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrMetaAlertDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrMetaAlertRetrieveLatestDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrMetaAlertSearchDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrMetaAlertUpdateDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrRetrieveLatestDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrSearchDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrUpdateDao.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/dao/SolrUtilities.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/schema/FieldType.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/schema/SchemaTranslator.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/writer/MetronSolrClient.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/java/org/apache/metron/solr/writer/SolrWriter.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/scripts/create_collection.sh (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/scripts/delete_collection.sh (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/scripts/install_solr.sh (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/scripts/start_solr.sh (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/main/scripts/stop_solr.sh (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/enrichment/integration/utils/SampleUtil.java (93%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/client/SolrClientFactoryTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/dao/SolrColumnMetadataTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/dao/SolrDaoTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/dao/SolrMetaAlertDaoTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/dao/SolrSearchDaoTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/dao/SolrUpdateDaoTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/dao/SolrUtilitiesTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/integration/SolrMetaAlertIntegrationTest.java (98%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/integration/SolrRetrieveLatestIntegrationTest.java (97%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/integration/SolrSearchIntegrationTest.java (98%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/integration/SolrUpdateIntegrationTest.java (97%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/integration/components/SolrComponent.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/integration/schema/SchemaValidationIntegrationTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/matcher/ModifiableSolrParamsMatcher.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/matcher/SolrInputDocumentListMatcher.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/matcher/SolrInputDocumentMatcher.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/matcher/SolrQueryMatcher.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/writer/MetronSolrClientTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/java/org/apache/metron/solr/writer/SolrWriterTest.java (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/config/test/conf/managed-schema (100%) rename metron-platform/metron-solr/{src/main/config/schema/bro => metron-solr-common/src/test/resources/config/test/conf}/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/example_data/bro (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/example_data/error (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/example_data/snort (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/example_data/yaf (100%) rename metron-platform/{metron-elasticsearch => metron-solr/metron-solr-common}/src/test/resources/log4j.properties (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/log4j2.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/_rest_managed.json (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/currency.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/lang/stopwords_en.txt (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/protwords.txt (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/schema.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/solrconfig.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/stopwords.txt (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/conf/synonyms.txt (100%) rename metron-platform/metron-solr/{ => metron-solr-common}/src/test/resources/solr/solr.xml (100%) create mode 100644 metron-platform/metron-solr/metron-solr-storm/README.md copy metron-platform/{metron-enrichment/metron-enrichment-common => metron-solr/metron-solr-storm}/pom.xml (56%) rename metron-platform/metron-solr/{ => metron-solr-storm}/src/main/assembly/assembly.xml (100%) rename metron-platform/metron-solr/{ => metron-solr-storm}/src/main/config/solr.properties (100%) rename metron-platform/metron-solr/{ => metron-solr-storm}/src/main/config/solr.properties.j2 (100%) rename metron-platform/metron-solr/{ => metron-solr-storm}/src/main/scripts/start_solr_topology.sh (100%) rename metron-platform/metron-solr/{src/test/java/org/apache/metron/solr => metron-solr-storm/src/test/java/org/apache/metron/indexing}/integration/SolrIndexingIntegrationTest.java (91%) create mode 100644 site/current-book/metron-interface/index.html copy site/current-book/metron-platform/metron-enrichment/{ => metron-enrichment-common}/index.html (59%) rename site/current-book/metron-platform/metron-enrichment/{ => metron-enrichment-storm}/Performance.html (87%) create mode 100644 site/current-book/metron-platform/metron-enrichment/metron-enrichment-storm/index.html copy site/current-book/metron-platform/{metron-parsers/message-parser-implementation-notes.html => metron-hbase-server/index.html} (63%) delete mode 100644 site/current-book/metron-platform/metron-parsers/parser-testing.html delete mode 100644 site/current-book/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/index.html rename site/current-book/metron-platform/{metron-parsers => metron-parsing}/index.html (71%) rename site/current-book/metron-platform/{metron-parsers => metron-parsing/metron-parsers-common}/3rdPartyParser.html (76%) rename site/current-book/metron-platform/{metron-parsers => metron-parsing/metron-parsers-common}/ParserChaining.html (67%) copy site/current-book/{metron-deployment/ansible/roles => metron-platform/metron-parsing/metron-parsers-common}/index.html (56%) rename site/current-book/metron-platform/{metron-parsers => metron-parsing/metron-parsers-common}/message-parser-implementation-notes.html (50%) create mode 100644 site/current-book/metron-platform/metron-parsing/metron-parsers-common/parser-testing.html create mode 100644 site/current-book/metron-platform/metron-parsing/metron-parsers-common/src/test/java/org/apache/metron/parsers/paloalto/index.html copy site/current-book/{metron-deployment/ansible/roles => metron-platform/metron-parsing/metron-parsers}/index.html (61%) create mode 100644 site/current-book/metron-platform/metron-parsing/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/index.html create mode 100644 site/current-book/metron-platform/metron-parsing/metron-parsing-storm/index.html