metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject [26/26] incubator-metron git commit: Merge branch 'master' of github.com:charlesporter/incubator-metron
Date Thu, 17 Dec 2015 20:46:28 GMT
Merge branch 'master' of github.com:charlesporter/incubator-metron

METRON-3 - replace opensoc-streaming version 0.4BETA with 0.6BETA


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/70e84c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/70e84c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/70e84c03

Branch: refs/heads/master
Commit: 70e84c0318f76190d85a84ec2bdc1f5f1f78fbd0
Parents: 34faa30 a919cc1
Author: cstella <cestella@gmail.com>
Authored: Thu Dec 17 15:43:49 2015 -0500
Committer: cstella <cestella@gmail.com>
Committed: Thu Dec 17 15:43:49 2015 -0500

----------------------------------------------------------------------
 opensoc-streaming/.gitignore                    |   15 -
 opensoc-streaming/.travis.yml                   |   14 -
 opensoc-streaming/OpenSOC-Alerts/pom.xml        |   61 +-
 opensoc-streaming/OpenSOC-Alerts/readme.md      |  104 +
 .../com/opensoc/alerts/AbstractAlertBolt.java   |   13 +-
 .../com/opensoc/alerts/TelemetryAlertsBolt.java |   31 +-
 .../alerts/adapters/AbstractAlertAdapter.java   |    8 +-
 .../alerts/adapters/AllAlertAdapter.java        |  249 +-
 .../alerts/adapters/CIFAlertsAdapter.java       |  311 +
 .../adapters/HbaseWhiteAndBlacklistAdapter.java |  130 +-
 .../alerts/adapters/KeywordsAlertAdapter.java   |  274 +
 .../opensoc/alerts/adapters/RangeChecker.java   |   23 +
 .../alerts/adapters/ThreatAlertsAdapter.java    |  311 +
 .../src/main/resources/hbase-site.xml           |  221 +-
 .../alerts/adapters/AllAlertAdapterTest.java    |  166 +
 .../resources/AllAlertAdapterTest.properties    |    1 +
 .../TestSchemas/AllAlertAdapterSchema.json      |   42 +
 .../resources/config/AllAlertAdapterTest.config |    8 +
 opensoc-streaming/OpenSOC-Common/.gitignore     |    1 +
 opensoc-streaming/OpenSOC-Common/pom.xml        |   48 +-
 .../configuration/ConfigurationManager.java     |  119 +
 .../dataloads/interfaces/ThreatIntelSource.java |   11 +
 .../main/java/com/opensoc/hbase/HBaseBolt.java  |   14 +-
 .../helpers/services/PcapServiceCli.java        |  110 +
 .../java/com/opensoc/helpers/topology/Cli.java  |  186 +
 .../helpers/topology/ErrorGenerator.java        |   37 +
 .../helpers/topology/SettingsLoader.java        |  149 +
 .../opensoc/index/interfaces/IndexAdapter.java  |    6 +-
 .../java/com/opensoc/ise/parser/ISEParser.java  |   45 +-
 .../ise/parser/ISEParserTokenManager.java       |    3 -
 .../json/serialization/JSONEncoderHelper.java   |    2 +
 .../json/serialization/JSONKafkaSerializer.java |   18 +-
 .../parser/interfaces/MessageParser.java        |    1 +
 .../main/java/com/opensoc/pcap/PacketInfo.java  |   73 +-
 .../com/opensoc/pcap/PcapByteOutputStream.java  |  288 +
 .../main/java/com/opensoc/pcap/PcapMerger.java  |  245 +
 .../com/opensoc/pcap/PcapPacketComparator.java  |   22 +
 .../main/java/com/opensoc/pcap/PcapParser.java  |  183 +
 .../main/java/com/opensoc/pcap/PcapUtils.java   |   27 +
 .../src/main/java/com/opensoc/pcap/asdf.java    |    5 -
 .../com/opensoc/test/AbstractConfigTest.java    |  299 +
 .../com/opensoc/test/AbstractSchemaTest.java    |  198 +
 .../com/opensoc/test/AbstractTestContext.java   |    2 +-
 .../java/com/opensoc/test/ISEParserTest.java    |   27 -
 .../opensoc/tldextractor/BasicTldExtractor.java |  137 +
 .../test/BasicTldExtractorTest.java             |  125 +
 .../java/com/opensoc/topologyhelpers/Cli.java   |  186 -
 .../opensoc/topologyhelpers/ErrorGenerator.java |   27 -
 .../opensoc/topologyhelpers/SettingsLoader.java |  118 -
 .../config/BasicTldExtractorTest.config         |    2 +
 .../src/test/resources/effective_tld_names.dat  | 9719 ++++++++++++++++++
 opensoc-streaming/OpenSOC-DataLoads/README.md   |   50 +
 .../dependency-reduced-pom.xml                  |  145 -
 opensoc-streaming/OpenSOC-DataLoads/pom.xml     |   22 +-
 .../opensoc/dataloads/cif/HBaseTableLoad.java   |  122 -
 .../OpenSOC-DataLoads/src/hbase-site.xml        |  100 -
 .../opensoc/dataloads/ThreatIntelLoader.java    |  174 +
 .../opensoc/dataloads/cif/HBaseTableLoad.java   |  238 +
 .../src/main/resources/hbase-site.xml           |  100 +
 .../OpenSOC-DataServices/README.md              |    1 +
 opensoc-streaming/OpenSOC-DataServices/pom.xml  |  232 +-
 .../alerts/server/AlertsProcessingServer.java   |    1 -
 .../opensoc/alerts/server/AlertsSearcher.java   |    2 -
 .../dataservices/kafkaclient/KafkaClient.java   |   10 +-
 .../dataservices/kafkaclient/KafkaConsumer.java |    8 +-
 .../modules/guice/DefaultServletModule.java     |    1 -
 .../modules/guice/RestEasyModule.java           |    5 +-
 .../modules/guice/ServiceModule.java            |    1 -
 .../opensoc/dataservices/rest/RestServices.java |    2 -
 .../dataservices/servlet/LogoutServlet.java     |    8 -
 .../websocket/KafkaMessageSenderServlet.java    |    1 -
 .../websocket/KafkaMessageSenderSocket.java     |    2 -
 .../websocket/KafkaWebSocketCreator.java        |    1 -
 .../pcapservice/CellTimestampComparator.java    |   23 +
 .../opensoc/pcapservice/ConfigurationUtil.java  |  269 +
 .../pcapservice/HBaseConfigConstants.java       |   40 +
 .../pcapservice/HBaseConfigurationUtil.java     |  165 +
 .../com/opensoc/pcapservice/IPcapGetter.java    |   88 +
 .../com/opensoc/pcapservice/IPcapScanner.java   |   49 +
 .../pcapservice/PcapGetterHBaseImpl.java        |  809 ++
 .../com/opensoc/pcapservice/PcapHelper.java     |  205 +
 .../pcapservice/PcapReceiverImplRestEasy.java   |  256 +
 .../pcapservice/PcapScannerHBaseImpl.java       |  302 +
 .../com/opensoc/pcapservice/PcapsResponse.java  |  153 +
 .../opensoc/pcapservice/RestTestingUtil.java    |  238 +
 .../pcapservice/rest/JettyServiceRunner.java    |   26 +
 .../opensoc/pcapservice/rest/PcapService.java   |   34 +
 .../ElasticSearch_KafkaAlertsService.java       |    1 -
 .../main/resources/config-definition-hbase.xml  |   34 +
 .../resources/hbase-config-default.properties   |   40 +
 .../src/main/resources/hbase-site.xml           |  127 +
 .../CellTimestampComparatorTest.java            |   92 +
 .../OpenSOC-EnrichmentAdapters/pom.xml          |  138 +-
 .../OpenSOC-EnrichmentAdapters/readme.md        |  125 +
 .../adapters/geo/GeoMysqlAdapter.java           |    5 +-
 .../host/HostFromPropertiesFileAdapter.java     |    4 +-
 .../adapters/threat/AbstractThreatAdapter.java  |   36 +
 .../adapters/threat/ThreatHbaseAdapter.java     |  129 +
 .../adapters/whois/WhoisHBaseAdapter.java       |   23 +-
 .../common/AbstractEnrichmentBolt.java          |   16 +-
 .../common/GenericEnrichmentBolt.java           |   21 +-
 .../src/main/resources/hbase-site.xml           |  221 +-
 .../adapters/cif/CIFHbaseAdapterTest.java       |   27 +
 .../adapters/geo/GeoMysqlAdapterTest.java       |   46 +-
 .../adapters/whois/WhoisHBaseAdapterTest.java   |   31 +-
 .../resources/CIFHbaseAdapterTest.properties    |    8 +-
 .../resources/GeoMysqlAdapterTest.properties    |    8 +-
 .../resources/TestSchemas/CIFHbaseSchema.json   |    0
 .../resources/TestSchemas/GeoMySqlSchema.json   |   42 +
 .../resources/TestSchemas/WhoisHbaseSchema.json |    0
 .../resources/WhoisHbaseAdapterTest.properties  |    8 +-
 opensoc-streaming/OpenSOC-Indexing/pom.xml      |   16 +-
 opensoc-streaming/OpenSOC-Indexing/readme.md    |   61 +
 .../opensoc/indexing/TelemetryIndexingBolt.java |   26 +-
 .../indexing/adapters/AbstractIndexAdapter.java |    2 +-
 .../indexing/adapters/ESBaseBulkAdapter.java    |   12 +-
 .../adapters/ESBulkRotatingAdapter.java         |   18 +-
 .../adapters/ESTimedRotatingAdapter.java        |   49 +-
 .../OpenSOC-MessageParsers/pom.xml              |   30 +-
 .../OpenSOC-MessageParsers/readme.md            |   82 +
 .../com/opensoc/parsing/AbstractParserBolt.java |   33 +-
 .../com/opensoc/parsing/PcapParserBolt.java     |   83 +-
 .../opensoc/parsing/TelemetryParserBolt.java    |    9 +-
 .../opensoc/parsing/parsers/AbstractParser.java |    8 +-
 .../opensoc/parsing/parsers/BasicBroParser.java |  101 +-
 .../parsing/parsers/BasicFireEyeParser.java     |  234 +
 .../opensoc/parsing/parsers/BasicIseParser.java |    2 +
 .../parsing/parsers/BasicLancopeParser.java     |    2 +
 .../parsing/parsers/BasicLogstashParser.java    |   65 +
 .../parsers/BasicPaloAltoFirewallParser.java    |  184 +
 .../parsing/parsers/BasicSourcefireParser.java  |   25 +-
 .../opensoc/parsing/parsers/GrokAsaParser.java  |  269 +
 .../parsing/parsers/GrokSourcefireParser.java   |    2 +
 .../com/opensoc/parsing/parsers/GrokUtils.java  |   26 +
 .../parsing/parsers/OpenSOCConverter.java       |  183 +
 .../opensoc/parsing/parsers/OpenSOCGarbage.java |  130 +
 .../opensoc/parsing/parsers/OpenSOCGrok.java    |  367 +
 .../opensoc/parsing/parsers/OpenSOCMatch.java   |  280 +
 .../opensoc/parsing/parsers/ParserUtils.java    |   23 +
 .../src/main/resources/patterns/asa             |  176 +
 .../src/main/resources/patterns/fireeye         |    9 +
 .../src/main/resources/patterns/sourcefire      |   30 +
 .../src/main/resources/patters/sourcefire       |   30 -
 .../parsing/test/BasicBroParserTest.java        |  103 +
 .../parsing/test/BasicFireEyeParserTest.java    |  141 +
 .../parsing/test/BasicIseParserTest.java        |  149 +-
 .../parsing/test/BasicLancopeParserTest.java    |  144 +-
 .../test/BasicPaloAltoFirewallParserTest.java   |  136 +
 .../parsing/test/BasicSourcefireParserTest.java |  103 +-
 .../com/opensoc/parsing/test/BroParserTest.java |  120 +-
 .../opensoc/parsing/test/GrokAsaParserTest.java |  149 +
 .../src/test/resources/BroParserTest.log        |    3 +
 .../src/test/resources/FireEyeParserTest.log    |    8 +
 .../src/test/resources/GrokParserTest.log       |   12 +
 .../src/test/resources/IseParserTest.log        |  308 +
 .../src/test/resources/IseSample.log            |  308 -
 .../src/test/resources/LancopeParserTest.log    |    1 +
 .../resources/PaloAltoFirewallParserTest.log    |    2 +
 .../src/test/resources/SourceFireTest.log       |    3 +
 .../test/resources/TestSchemas/BroSchema.json   |   28 +
 .../resources/TestSchemas/LancopeSchema.json    |   14 +-
 .../resources/TestSchemas/SourcefireSchema.json |   20 +-
 .../config/BasicFireEyeParserTest.config        |    2 +
 .../resources/config/BasicIseParserTest.config  |    2 +
 .../config/BasicLancopeParserTest.config        |    2 +
 .../BasicPaloAltoFirewallParserTest.config      |    2 +
 .../config/BasicSourcefireParserTest.config     |    2 +
 .../test/resources/config/BroParserTest.config  |    2 +
 .../resources/config/GrokAsaParserTest.config   |    2 +
 .../src/test/resources/effective_tld_names.dat  | 9719 ++++++++++++++++++
 .../OpenSOC-PCAP_Reconstruction/hbase/.pmd      | 1262 ---
 .../hbase/README.txt                            |   16 -
 .../hbase/dependency-reduced-pom.xml            |  230 -
 .../OpenSOC-PCAP_Reconstruction/hbase/pom.xml   |  137 -
 .../hbase/client/CellTimestampComparator.java   |   23 -
 .../opensoc/hbase/client/ConfigurationUtil.java |  267 -
 .../hbase/client/HBaseConfigConstants.java      |   40 -
 .../hbase/client/HBaseConfigurationUtil.java    |  165 -
 .../cisco/opensoc/hbase/client/IPcapGetter.java |   88 -
 .../opensoc/hbase/client/IPcapReceiver.java     |  109 -
 .../opensoc/hbase/client/IPcapScanner.java      |   49 -
 .../hbase/client/PcapGetterHBaseImpl.java       |  790 --
 .../cisco/opensoc/hbase/client/PcapHelper.java  |  205 -
 .../opensoc/hbase/client/PcapReceiverImpl.java  |  212 -
 .../hbase/client/PcapScannerHBaseImpl.java      |  302 -
 .../opensoc/hbase/client/PcapsResponse.java     |  151 -
 .../opensoc/hbase/client/RestTestingUtil.java   |  238 -
 .../main/resources/config-definition-hbase.xml  |   34 -
 .../resources/hbase-config-default.properties   |   40 -
 .../hbase/src/main/resources/log4j.properties   |   21 -
 .../client/CellTimestampComparatorTest.java     |   92 -
 .../hbase/client/ConfigurationUtilTest.java     |   50 -
 .../client/HBaseConfigurationUtilTest.java      |   52 -
 .../hbase/client/HBaseIntegrationTest.java      |   74 -
 .../hbase/client/PcapGetterHBaseImplTest.java   |  536 -
 .../opensoc/hbase/client/PcapHelperTest.java    |  321 -
 .../hbase/client/PcapReceiverImplTest.java      |  232 -
 .../hbase/client/PcapScannerHBaseImplTest.java  |  234 -
 .../src/test/resources/hbase-config.properties  |   40 -
 .../src/test/resources/test-tcp-packet.pcap     |  Bin 144 -> 0 bytes
 .../OpenSOC-PCAP_Reconstruction/service/.pmd    | 1190 ---
 .../service/README.txt                          |   10 -
 .../OpenSOC-PCAP_Reconstruction/service/pom.xml |   52 -
 .../service/src/main/resources/log4j.properties |   10 -
 .../src/main/webapp/META-INF/MANIFEST.MF        |    3 -
 .../src/main/webapp/WEB-INF/ipcap-config.xml    |    7 -
 .../service/src/main/webapp/WEB-INF/web.xml     |   17 -
 .../OpenSOC-Pcap_Service/README.txt             |   16 +
 opensoc-streaming/OpenSOC-Pcap_Service/pom.xml  |  267 +
 .../OpenSOC-Pcap_Service/pom.xml.versionsBackup |  268 +
 .../pcapservice/CellTimestampComparator.java    |   23 +
 .../opensoc/pcapservice/ConfigurationUtil.java  |  269 +
 .../pcapservice/HBaseConfigConstants.java       |   40 +
 .../pcapservice/HBaseConfigurationUtil.java     |  165 +
 .../com/opensoc/pcapservice/IPcapGetter.java    |   88 +
 .../com/opensoc/pcapservice/IPcapScanner.java   |   49 +
 .../pcapservice/PcapGetterHBaseImpl.java        |  809 ++
 .../com/opensoc/pcapservice/PcapHelper.java     |  205 +
 .../pcapservice/PcapReceiverImplRestEasy.java   |  250 +
 .../pcapservice/PcapScannerHBaseImpl.java       |  302 +
 .../com/opensoc/pcapservice/PcapsResponse.java  |  153 +
 .../opensoc/pcapservice/RestTestingUtil.java    |  238 +
 .../pcapservice/rest/JettyServiceRunner.java    |   26 +
 .../opensoc/pcapservice/rest/PcapService.java   |   34 +
 .../OnlyDeleteExpiredFilesCompactionPolicy.java |   37 +
 .../main/resources/config-definition-hbase.xml  |   34 +
 .../resources/hbase-config-default.properties   |   40 +
 .../src/main/resources/hbase-site.xml           |  127 +
 .../src/main/resources/log4j.properties         |   21 +
 .../CellTimestampComparatorTest.java            |   92 +
 .../pcapservice/ConfigurationUtilTest.java      |   50 +
 .../pcapservice/HBaseConfigurationUtilTest.java |   52 +
 .../pcapservice/HBaseIntegrationTest.java       |   74 +
 .../pcapservice/PcapGetterHBaseImplTest.java    |  536 +
 .../com/opensoc/pcapservice/PcapHelperTest.java |  321 +
 .../pcapservice/PcapScannerHBaseImplTest.java   |  232 +
 .../src/test/resources/hbase-config.properties  |   40 +
 .../src/test/resources/test-tcp-packet.pcap     |  Bin 0 -> 144 bytes
 opensoc-streaming/OpenSOC-Topologies/pom.xml    |  188 +
 opensoc-streaming/OpenSOC-Topologies/readme.md  |   47 +
 .../src/main/java/com/opensoc/topology/Asa.java |   40 +
 .../main/java/com/opensoc/topology/FireEye.java |   21 +
 .../src/main/java/com/opensoc/topology/Ise.java |    4 +
 .../main/java/com/opensoc/topology/Lancope.java |    5 +
 .../com/opensoc/topology/PaloAltoFirewall.java  |   41 +
 .../main/java/com/opensoc/topology/Pcap.java    |    6 +
 .../com/opensoc/topology/runner/AsaRunner.java  |   94 +
 .../com/opensoc/topology/runner/BroRunner.java  |   15 +-
 .../opensoc/topology/runner/FireEyeRunner.java  |   77 +
 .../com/opensoc/topology/runner/ISERunner.java  |   17 +-
 .../opensoc/topology/runner/LancopeRunner.java  |   15 +-
 .../topology/runner/PaloAltoFirewallRunner.java |   95 +
 .../com/opensoc/topology/runner/PcapRunner.java |    4 +-
 .../topology/runner/SourcefireRunner.java       |   17 +-
 .../opensoc/topology/runner/TopologyRunner.java |  205 +-
 .../topologies/asa/features_enabled.conf        |  113 +
 .../OpenSOC_Configs/topologies/asa/metrics.conf |   26 +
 .../topologies/asa/topology.conf                |  110 +
 .../topologies/asa/topology_identifier.conf     |    4 +
 .../topologies/bro/features_enabled.conf        |   14 +-
 .../topologies/bro/topology.conf                |   71 +-
 .../topologies/fireeye/features_enabled.conf    |  113 +
 .../topologies/fireeye/metrics.conf             |   26 +
 .../topologies/fireeye/topology.conf            |  110 +
 .../topologies/fireeye/topology_identifier.conf |    4 +
 .../topologies/ise/features_enabled.conf        |   10 +-
 .../topologies/ise/topology.conf                |   39 +-
 .../topologies/lancope/features_enabled.conf    |   10 +-
 .../topologies/lancope/topology.conf            |   39 +-
 .../topologies/paloalto/features_enabled.conf   |  113 +
 .../topologies/paloalto/metrics.conf            |   26 +
 .../topologies/paloalto/topology.conf           |  113 +
 .../paloalto/topology_identifier.conf           |    4 +
 .../topologies/pcap/features_enabled.conf       |   10 +-
 .../topologies/pcap/topology.conf               |   64 +-
 .../topologies/sourcefire/features_enabled.conf |   10 +-
 .../topologies/sourcefire/topology.conf         |   48 +-
 .../src/main/resources/SampleInput/AsaOutput    |  100 +
 .../resources/SampleInput/FireeyeExampleOutput  |   90 +
 .../main/resources/SampleInput/ISESampleOutput  |  314 +-
 .../main/resources/SampleInput/PaloaltoOutput   |  100 +
 .../resources/TopologyConfigs_old/lancope.conf  |   16 +-
 .../src/main/resources/effective_tld_names.dat  | 9719 ++++++++++++++++++
 .../src/main/resources/hbase-site.xml           |  131 +
 opensoc-streaming/pom.xml                       |   15 +-
 opensoc-streaming/readme.md                     |  136 +-
 286 files changed, 48498 insertions(+), 9780 deletions(-)
----------------------------------------------------------------------



Mime
View raw message