http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/bro/parsed/BroExampleParsed
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/bro/parsed/BroExampleParsed
 
b/metron-platform/metron-integration-test/src/main/sample/data/bro/parsed/BroExampleParsed
deleted file mode 100644
index b1d3102..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/bro/parsed/BroExampleParsed
+++ /dev/null
@@ -1,27 +0,0 @@
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"CTo78A11g7CYbbOHvj","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:CTo78A11g7CYbbOHvj resp_mime_types:[\"text\\\/html\"] 
trans_depth:1 host:www.cisco.com status_msg:OK id.orig_h:192.249.113.37 
response_body_len:25523 user_agent:curl\/7.22.0 (x86_64-pc-linux-gnu) 
libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 librtmp\/2.3 
ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"www.cisco.com","status_msg":"OK","response_body_len":25523,"ip_src_addr":"192.249.113.37","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 
libidn\/1.23 librtmp\/2.3","resp_fuids":["FJDyMC15l
 
xUn5ngPfd"],"timestamp":1402307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"TTLs":[3600.0,289.0,14.0],"qclass_name":"C_INTERNET","bro_timestamp":"1402308259.609","qtype_name":"AAAA","ip_dst_port":53,"qtype":28,"rejected":false,"answers":["www.cisco.com.akadns.net","origin-www.cisco.com","2001:420:1201:2::a"],"trans_id":62418,"uid":"CuJT272SKaJSuqO0Ia","protocol":"dns","original_string":"DNS
 | AA:true TTLs:[3600.0,289.0,14.0] qclass_name:C_INTERNET id.orig_p:33976 
qtype_name:AAAA qtype:28 rejected:false id.resp_p:53 query:www.cisco.com 
answers:[\"www.cisco.com.akadns.net\",\"origin-www.cisco.com\",\"2001:420:1201:2::a\"]
 trans_id:62418 rcode:0 rcode_name:NOERROR TC:false RA:true 
uid:CuJT272SKaJSuqO0Ia RD:true proto:udp id.orig_h:10.122.196.204 Z:0 qclass:1 
ts:1402308259.609 
id.resp_h:144.254.71.184","ip_dst_addr":"144.254.71.184","Z":0,"ip_src_addr":"10.122.196.204","qclass":1,"timestamp":1402308259609,"AA":true,"query":"www.cisco.com","rcode":0,"rcode_name":"NOERROR","TC":false,"RA":true,"source.type":"bro","RD":true,"ip_src_port":33976,"proto":"udp","gui
 d":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"KIRAN","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:KIRAN resp_mime_types:[\"text\\\/html\"] trans_depth:1 
host:www.cisco.com status_msg:OK id.orig_h:10.122.196.204 
response_body_len:25523 user_agent:curl\/7.22.0 (x86_64-pc-linux-gnu) 
libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 librtmp\/2.3 
ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"www.cisco.com","status_msg":"OK","response_body_len":25523,"ip_src_addr":"10.122.196.204","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 
libidn\/1.23 librtmp\/2.3","resp_fuids":["FJDyMC15lxUn5ngPfd"],"timestamp":14
 02307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"KIRAN12312312","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:KIRAN12312312 resp_mime_types:[\"text\\\/html\"] 
trans_depth:1 host:www.cisco.com status_msg:OK id.orig_h:192.249.113.37 
response_body_len:25523 user_agent:curl\/7.22.0 (x86_64-pc-linux-gnu) 
libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 librtmp\/2.3 
ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"www.cisco.com","status_msg":"OK","response_body_len":25523,"ip_src_addr":"192.249.113.37","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 
libidn\/1.23 librtmp\/2.3","resp_fuids":["FJDyMC15lxUn5ngPfd"
 ],"timestamp":1402307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"KIRAN12312312","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:KIRAN12312312 resp_mime_types:[\"text\\\/html\"] 
trans_depth:1 host:www.cisco.com status_msg:OK id.orig_h:192.249.113.37 
response_body_len:25523 user_agent:curl\/7.22.0 (x86_64-pc-linux-gnu) 
libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 librtmp\/2.3 
ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"www.cisco.com","status_msg":"OK","response_body_len":25523,"ip_src_addr":"192.249.113.37","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 
libidn\/1.23 librtmp\/2.3","resp_fuids":["FJDyMC15lxUn5ngPfd"
 ],"timestamp":1402307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"CTo78A11g7CYbbOHvj","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:CTo78A11g7CYbbOHvj resp_mime_types:[\"text\\\/html\"] 
trans_depth:1 host:gabacentre.pw status_msg:OK id.orig_h:10.122.196.204 
response_body_len:25523 email:abul...@mail.csuchico.edu user_agent:curl\/7.22.0 
(x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 
librtmp\/2.3 ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"gabacentre.pw","status_msg":"OK","response_body_len":25523,"ip_src_addr":"10.122.196.204","email":"abul...@mail.csuchico.edu","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0
 .1 zlib\/1.2.3.4 libidn\/1.23 
librtmp\/2.3","resp_fuids":["FJDyMC15lxUn5ngPfd"],"timestamp":1402307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"TTLs":[3600.0,289.0,14.0],"qclass_name":"C_INTERNET","bro_timestamp":"1402308259.609","qtype_name":"AAAA","ip_dst_port":53,"qtype":28,"rejected":false,"answers":["gabacentre.pw","www.cisco.com.akadns.net","origin-www.cisco.com","2001:420:1201:2::a"],"trans_id":62418,"uid":"CYbbOHvj","protocol":"dns","original_string":"DNS
 | AA:true TTLs:[3600.0,289.0,14.0] qclass_name:C_INTERNET id.orig_p:33976 
qtype_name:AAAA qtype:28 rejected:false id.resp_p:53 query:www.cisco.com 
answers:[\"gabacentre.pw\",\"www.cisco.com.akadns.net\",\"origin-www.cisco.com\",\"2001:420:1201:2::a\"]
 trans_id:62418 rcode:0 rcode_name:NOERROR TC:false RA:true uid:CYbbOHvj 
RD:true proto:udp id.orig_h:93.188.160.43 Z:0 qclass:1 ts:1402308259.609 
id.resp_h:144.254.71.184","ip_dst_addr":"144.254.71.184","Z":0,"ip_src_addr":"93.188.160.43","qclass":1,"timestamp":1402308259609,"AA":true,"query":"www.cisco.com","rcode":0,"rcode_name":"NOERROR","TC":false,"RA":true,"source.type":"bro","RD":true,"ip_src_port":33976,"proto
 ":"udp","guid":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"CTo78A11g7CYbbOHvj","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:CTo78A11g7CYbbOHvj resp_mime_types:[\"text\\\/html\"] 
trans_depth:1 host:www.cisco.com status_msg:OK id.orig_h:192.249.113.37 
response_body_len:25523 user_agent:curl\/7.22.0 (x86_64-pc-linux-gnu) 
libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 librtmp\/2.3 
ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"www.cisco.com","status_msg":"OK","response_body_len":25523,"ip_src_addr":"192.249.113.37","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 
libidn\/1.23 librtmp\/2.3","resp_fuids":["FJDyMC15l
 
xUn5ngPfd"],"timestamp":1402307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"TTLs":[3600.0,289.0,14.0],"qclass_name":"C_INTERNET","bro_timestamp":"1402308259.609","qtype_name":"AAAA","ip_dst_port":53,"qtype":28,"rejected":false,"answers":["www.cisco.com.akadns.net","origin-www.cisco.com","2001:420:1201:2::a"],"trans_id":62418,"uid":"CuJT272SKaJSuqO0Ia","protocol":"dns","original_string":"DNS
 | AA:true TTLs:[3600.0,289.0,14.0] qclass_name:C_INTERNET id.orig_p:33976 
qtype_name:AAAA qtype:28 rejected:false id.resp_p:53 query:www.cisco.com 
answers:[\"www.cisco.com.akadns.net\",\"origin-www.cisco.com\",\"2001:420:1201:2::a\"]
 trans_id:62418 rcode:0 rcode_name:NOERROR TC:false RA:true 
uid:CuJT272SKaJSuqO0Ia RD:true proto:udp id.orig_h:10.122.196.204 Z:0 qclass:1 
ts:1402308259.609 
id.resp_h:144.254.71.184","ip_dst_addr":"144.254.71.184","Z":0,"ip_src_addr":"10.122.196.204","qclass":1,"timestamp":1402308259609,"AA":true,"query":"www.cisco.com","rcode":0,"rcode_name":"NOERROR","TC":false,"RA":true,"source.type":"bro","RD":true,"ip_src_port":33976,"proto":"udp","gui
 d":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1402307733.473","status_code":200,"method":"GET","ip_dst_port":80,"request_body_len":0,"uri":"\/","tags":[],"source.type":"bro","uid":"KIRAN","resp_mime_types":["text\/html"],"trans_depth":1,"protocol":"http","original_string":"HTTP
 | id.orig_p:58808 status_code:200 method:GET request_body_len:0 id.resp_p:80 
uri:\/ tags:[] uid:KIRAN resp_mime_types:[\"text\\\/html\"] trans_depth:1 
host:www.cisco.com status_msg:OK id.orig_h:10.122.196.204 
response_body_len:25523 user_agent:curl\/7.22.0 (x86_64-pc-linux-gnu) 
libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 libidn\/1.23 librtmp\/2.3 
ts:1402307733.473 id.resp_h:72.163.4.161 
resp_fuids:[\"FJDyMC15lxUn5ngPfd\"]","ip_dst_addr":"72.163.4.161","ip_src_port":58808,"host":"www.cisco.com","status_msg":"OK","response_body_len":25523,"ip_src_addr":"10.122.196.204","user_agent":"curl\/7.22.0
 (x86_64-pc-linux-gnu) libcurl\/7.22.0 OpenSSL\/1.0.1 zlib\/1.2.3.4 
libidn\/1.23 librtmp\/2.3","resp_fuids":["FJDyMC15lxUn5ngPfd"],"timestamp":14
 02307733473,"guid":"this-is-random-uuid-will-be-36-chars"}
-{"bro_timestamp":"1440447880.931272","resp_pkts":1,"resp_ip_bytes":48,"ip_dst_port":1812,"orig_bytes":75,"orig_ip_bytes":103,"orig_pkts":1,"missed_bytes":0,"history":"Dd","tunnel_parents":[],"source.type":"bro","duration":1.001459,"uid":"CWxtRHnBTbldHnmGh","protocol":"conn","resp_bytes":20,"original_string":"CONN
 | id.orig_p:52178 resp_pkts:1 resp_ip_bytes:48 orig_bytes:75 id.resp_p:1812 
orig_ip_bytes:103 orig_pkts:1 missed_bytes:0 history:Dd tunnel_parents:[] 
duration:1.001459 uid:CWxtRHnBTbldHnmGh resp_bytes:20 service:radius 
conn_state:SF proto:udp id.orig_h:127.0.0.1 ts:1440447880.931272 
id.resp_h:127.0.0.1","ip_dst_addr":"127.0.0.1","ip_src_port":52178,"service":"radius","conn_state":"SF","proto":"udp","guid":"4a92fe07-8f9d-4092-83c3-0d4e37c92d29","ip_src_addr":"127.0.0.1","timestamp":1440447880931}
-{"bro_timestamp":"1440447904.122012","resp_pkts":0,"resp_ip_bytes":0,"ip_dst_port":1812,"orig_bytes":225,"orig_ip_bytes":309,"orig_pkts":3,"missed_bytes":0,"history":"D","tunnel_parents":[],"source.type":"bro","duration":10.008839,"uid":"CK2Oivhlh0ovRcYx","protocol":"conn","resp_bytes":0,"original_string":"CONN
 | id.orig_p:62956 resp_pkts:0 resp_ip_bytes:0 orig_bytes:225 id.resp_p:1812 
orig_ip_bytes:309 orig_pkts:3 missed_bytes:0 history:D tunnel_parents:[] 
duration:10.008839 uid:CK2Oivhlh0ovRcYx resp_bytes:0 service:radius 
conn_state:S0 proto:udp id.orig_h:127.0.0.1 ts:1440447904.122012 
id.resp_h:127.0.0.1","ip_dst_addr":"127.0.0.1","ip_src_port":62956,"service":"radius","conn_state":"S0","proto":"udp","guid":"9e4952e0-6dd3-4487-b5fa-299b9433c381","ip_src_addr":"127.0.0.1","timestamp":1440447904122}
-{"bro_timestamp":"1440448190.335333","resp_pkts":1,"resp_ip_bytes":99,"ip_dst_port":1812,"orig_bytes":75,"orig_ip_bytes":103,"orig_pkts":1,"missed_bytes":0,"history":"Dd","tunnel_parents":[],"source.type":"bro","duration":5.17E-4,"uid":"CX6mcO38sO7dkDxK55","protocol":"conn","resp_bytes":71,"original_string":"CONN
 | id.orig_p:53127 resp_pkts:1 resp_ip_bytes:99 orig_bytes:75 id.resp_p:1812 
orig_ip_bytes:103 orig_pkts:1 missed_bytes:0 history:Dd tunnel_parents:[] 
duration:0.000517 uid:CX6mcO38sO7dkDxK55 resp_bytes:71 service:radius 
conn_state:SF proto:udp id.orig_h:127.0.0.1 ts:1440448190.335333 
id.resp_h:127.0.0.1","ip_dst_addr":"127.0.0.1","ip_src_port":53127,"service":"radius","conn_state":"SF","proto":"udp","guid":"bc1af1bf-5b1c-4829-b574-3243670fd448","ip_src_addr":"127.0.0.1","timestamp":1440448190335}
-{"bro_timestamp":"1216702277.477596","ip_dst_port":80,"failure_reason":"not a 
http reply 
line","source.type":"bro","uid":"C4O50B3WAUCb2Yw29j","protocol":"dpd","original_string":"DPD
 | uid:C4O50B3WAUCb2Yw29j id.orig_p:33348 analyzer:HTTP id.resp_p:80 proto:tcp 
id.orig_h:192.168.15.4 failure_reason:not a http reply line 
ts:1216702277.477596 
id.resp_h:66.33.212.43","ip_dst_addr":"66.33.212.43","ip_src_port":33348,"analyzer":"HTTP","proto":"tcp","guid":"b03d9d34-4a39-4e68-8b21-08bdd532ae07","ip_src_addr":"192.168.15.4","timestamp":1216702277477}
-{"bro_timestamp":"1166289883.160785","ip_dst_port":21,"reply_msg":"Entering 
Passive Mode 
(192,168,0,193,28,86)","data_channel.orig_h":"192.168.0.114","data_channel.passive":true,"data_channel.resp_p":7254,"command":"PASV","source.type":"bro","uid":"ClOsCM3BUs3saPsD2c","password":"<hidden>","protocol":"ftp","original_string":"FTP
 | id.orig_p:1137 id.resp_p:21 reply_msg:Entering Passive Mode 
(192,168,0,193,28,86) data_channel.orig_h:192.168.0.114 
data_channel.passive:true data_channel.resp_p:7254 command:PASV 
uid:ClOsCM3BUs3saPsD2c password:<hidden> data_channel.resp_h:192.168.0.193 
id.orig_h:192.168.0.114 user:csanders reply_code:227 ts:1166289883.160785 
id.resp_h:192.168.0.193","ip_dst_addr":"192.168.0.193","ip_src_port":1137,"data_channel.resp_h":"192.168.0.193","guid":"4b0c4cda-28ee-404e-b966-036bc7f638ff","user":"csanders","ip_src_addr":"192.168.0.114","reply_code":227,"timestamp":1166289883160}
-{"bro_timestamp":"1216706983.387664","timedout":true,"source":"HTTP","is_orig":false,"overflow_bytes":0,"source.type":"bro","duration":30.701792,"protocol":"files","depth":0,"original_string":"FILES
 | timedout:true rx_hosts:[\"192.168.15.4\"] source:HTTP is_orig:false 
tx_hosts:[\"216.113.185.92\"] overflow_bytes:0 duration:30.701792 depth:0 
analyzers:[\"MD5\",\"SHA1\"] fuid:FnEYba9VPOcC41c1 
conn_uids:[\"CLWqoN1IA9MB8Ru9i3\"] seen_bytes:0 missing_bytes:3384 
ts:1216706983.387664","ip_dst_addr":"192.168.15.4","analyzers":["MD5","SHA1"],"guid":"7b7148a0-f484-4450-97a3-29493e1c7360","fuid":"FnEYba9VPOcC41c1","conn_uids":["CLWqoN1IA9MB8Ru9i3"],"seen_bytes":0,"missing_bytes":3384,"ip_src_addr":"216.113.185.92","timestamp":1216706983387}
-{"bro_timestamp":"1216706999.34818","protocol":"known_certs","original_string":"KNOWN_CERTS
 | issuer_subject:CN=VeriSign Class 3 Secure Server CA,OU=Terms of use at 
https:\/\/www.verisign.com\/rpa (c)05,OU=VeriSign Trust Network,O=VeriSign\\, 
Inc.,C=US serial:24A2DD82DC52358E7F0C6AF6135F3B32 
subject:CN=nexus.passport.com,OU=MSN 
Passport,O=Microsoft,L=Redmond,ST=Washington,C=US port_num:443 
host:65.54.179.216 ts:1216706999.34818","issuer_subject":"CN=VeriSign Class 3 
Secure Server CA,OU=Terms of use at https:\/\/www.verisign.com\/rpa 
(c)05,OU=VeriSign Trust Network,O=VeriSign\\, 
Inc.,C=US","serial":"24A2DD82DC52358E7F0C6AF6135F3B32","subject":"CN=nexus.passport.com,OU=MSN
 
Passport,O=Microsoft,L=Redmond,ST=Washington,C=US","port_num":443,"host":"65.54.179.216","guid":"76fe881c-3ed7-4477-a870-f5381577e4ae","timestamp":1216706999348,"source.type":"bro"}
-{"bro_timestamp":"1258568036.57884","ip_dst_port":25,"source.type":"bro","helo":"M57Terry","uid":"ChR6254RrWbrxiGsd7","path":["192.168.1.1","192.168.1.105"],"trans_depth":1,"protocol":"smtp","original_string":"SMTP
 | id.orig_p:49353 id.resp_p:25 helo:M57Terry uid:ChR6254RrWbrxiGsd7 
path:[\"192.168.1.1\",\"192.168.1.105\"] trans_depth:1 is_webmail:false 
last_reply:220 2.0.0 Ready to start TLS id.orig_h:192.168.1.105 tls:true 
fuids:[] ts:1258568036.57884 
id.resp_h:192.168.1.1","ip_dst_addr":"192.168.1.1","ip_src_port":49353,"is_webmail":false,"last_reply":"220
 2.0.0 Ready to start 
TLS","guid":"9a3d1e86-7d25-4426-b2af-6ab5be1e607f","tls":true,"fuids":[],"ip_src_addr":"192.168.1.105","timestamp":1258568036578}
-{"cipher":"TLS_RSA_WITH_RC4_128_MD5","established":true,"server_name":"login.live.com","bro_timestamp":"1216706999.444925","client_cert_chain_fuids":[],"ip_dst_port":443,"subject":"CN=login.live.com,OU=MSN-Passport,O=Microsoft
 Corporation,street=One Microsoft 
Way,L=Redmond,ST=Washington,postalCode=98052,C=US,serialNumber=600413485,businessCategory=V1.0\\,
 Clause 
5.(b),1.3.6.1.4.1.311.60.2.1.2=#130A57617368696E67746F6E,1.3.6.1.4.1.311.60.2.1.3=#13025553","cert_chain_fuids":["FkYBO41LPAXxh44KFk","FPrzYN1SuBqHflXZId","FZ71xF13r5XVSam1z1"],"version":"TLSv10","issuer":"CN=VeriSign
 Class 3 Extended Validation SSL CA,OU=Terms of use at 
https:\/\/www.verisign.com\/rpa (c)06,OU=VeriSign Trust Network,O=VeriSign\\, 
Inc.,C=US","source.type":"bro","uid":"CVrS2IBW8gukBClA8","protocol":"ssl","original_string":"SSL
 | cipher:TLS_RSA_WITH_RC4_128_MD5 established:true server_name:login.live.com 
id.orig_p:36532 client_cert_chain_fuids:[] 
subject:CN=login.live.com,OU=MSN-Passport,O=Microsoft Corporatio
 n,street=One Microsoft 
Way,L=Redmond,ST=Washington,postalCode=98052,C=US,serialNumber=600413485,businessCategory=V1.0\\,
 Clause 
5.(b),1.3.6.1.4.1.311.60.2.1.2=#130A57617368696E67746F6E,1.3.6.1.4.1.311.60.2.1.3=#13025553
 id.resp_p:443 
cert_chain_fuids:[\"FkYBO41LPAXxh44KFk\",\"FPrzYN1SuBqHflXZId\",\"FZ71xF13r5XVSam1z1\"]
 version:TLSv10 issuer:CN=VeriSign Class 3 Extended Validation SSL CA,OU=Terms 
of use at https:\/\/www.verisign.com\/rpa (c)06,OU=VeriSign Trust 
Network,O=VeriSign\\, Inc.,C=US uid:CVrS2IBW8gukBClA8 id.orig_h:192.168.15.4 
validation_status:unable to get local issuer certificate resumed:false 
ts:1216706999.444925 
id.resp_h:65.54.186.47","ip_dst_addr":"65.54.186.47","ip_src_port":36532,"guid":"1bff79d0-7b86-43de-b5ec-132bb62f4339","validation_status":"unable
 to get local issuer 
certificate","resumed":false,"ip_src_addr":"192.168.15.4","timestamp":1216706999444}
-{"bro_timestamp":"1216706981.177382","ip_dst_port":80,"source.type":"bro","uid":"Cfxxnt3m0v9SEf5XQ7","protocol":"weird","original_string":"WEIRD
 | uid:Cfxxnt3m0v9SEf5XQ7 id.orig_p:36446 peer:bro id.resp_p:80 
name:unescaped_special_URI_char id.orig_h:192.168.15.4 ts:1216706981.177382 
id.resp_h:66.151.146.194 
notice:false","ip_dst_addr":"66.151.146.194","ip_src_port":36446,"peer":"bro","name":"unescaped_special_URI_char","guid":"fa2d1068-ca33-4962-b9ab-902605ea3e14","ip_src_addr":"192.168.15.4","notice":false,"timestamp":1216706981177}
-{"msg":"SSL certificate validation failed with (unable to get local issuer 
certificate)","suppress_for":3600.0,"note":"SSL::Invalid_Server_Cert","sub":"CN=www.google.com,O=Google
 Inc,L=Mountain 
View,ST=California,C=US","bro_timestamp":"1216706377.196728","dst":"74.125.19.104","ip_dst_port":443,"src":"192.168.15.4","dropped":false,"peer_descr":"bro","source.type":"bro","p":443,"uid":"CNHQmp1mNiZHdAf5Ce","protocol":"notice","original_string":"NOTICE
 | msg:SSL certificate validation failed with (unable to get local issuer 
certificate) suppress_for:3600.0 note:SSL::Invalid_Server_Cert 
sub:CN=www.google.com,O=Google Inc,L=Mountain View,ST=California,C=US 
id.orig_p:35736 dst:74.125.19.104 src:192.168.15.4 id.resp_p:443 dropped:false 
peer_descr:bro p:443 uid:CNHQmp1mNiZHdAf5Ce proto:tcp id.orig_h:192.168.15.4 
actions:[\"Notice::ACTION_LOG\"] ts:1216706377.196728 
id.resp_h:74.125.19.104","ip_dst_addr":"74.125.19.104","ip_src_port":35736,"proto":"tcp","guid":"31e56b6a-48fd-4605-81ec-b0586006
 
f7d7","actions":["Notice::ACTION_LOG"],"ip_src_addr":"192.168.15.4","timestamp":1216706377196}
-{"bro_timestamp":"1258567562.944638","ip_dst_port":67,"trans_id":418901490,"assigned_ip":"192.168.1.103","mac":"00:0b:db:63:5b:d4","source.type":"bro","uid":"CSiO9f3y8Uyu0XprAi","protocol":"dhcp","original_string":"DHCP
 | uid:CSiO9f3y8Uyu0XprAi id.orig_p:68 lease_time:3564.0 id.resp_p:67 
id.orig_h:192.168.1.103 trans_id:418901490 assigned_ip:192.168.1.103 
mac:00:0b:db:63:5b:d4 ts:1258567562.944638 
id.resp_h:192.168.1.1","ip_dst_addr":"192.168.1.1","ip_src_port":68,"lease_time":3564.0,"guid":"0d2ed5dc-f44c-4d37-b286-7b9f40da420a","ip_src_addr":"192.168.1.103","timestamp":1258567562944}
-{"kex_alg":"diffie-hellman-group-exchange-sha256","server":"SSH-2.0-OpenSSH_5.8p1
 
Debian-7ubuntu1","mac_alg":"hmac-md5","bro_timestamp":"1320435930.914196","auth_success":false,"ip_dst_port":22,"host_key_alg":"ssh-rsa","compression_alg":"none","version":2,"source.type":"bro","uid":"CyrWKo1E1rRywjbOAk","host_key":"87:11:46:da:89:c5:2b:d9:6b:ee:e0:44:7e:73:80:f8","protocol":"ssh","original_string":"SSH
 | kex_alg:diffie-hellman-group-exchange-sha256 server:SSH-2.0-OpenSSH_5.8p1 
Debian-7ubuntu1 mac_alg:hmac-md5 id.orig_p:58435 auth_success:false 
id.resp_p:22 host_key_alg:ssh-rsa compression_alg:none version:2 
uid:CyrWKo1E1rRywjbOAk host_key:87:11:46:da:89:c5:2b:d9:6b:ee:e0:44:7e:73:80:f8 
cipher_alg:aes128-ctr client:SSH-2.0-OpenSSH_5.6 id.orig_h:172.16.238.1 
ts:1320435930.914196 
id.resp_h:172.16.238.136","ip_dst_addr":"172.16.238.136","ip_src_port":58435,"cipher_alg":"aes128-ctr","client":"SSH-2.0-OpenSSH_5.6","guid":"8aebc887-4090-4807-8d65-e841f52b6177","ip_src_addr":"172.16.238.1","t
 imestamp":1320435930914}
-{"bro_timestamp":"1320435464.768382","software_type":"SSH::SERVER","source.type":"bro","unparsed_version":"OpenSSH_5.3","protocol":"software","host_p":22,"original_string":"SOFTWARE
 | unparsed_version:OpenSSH_5.3 host_p:22 host:172.16.238.168 name:OpenSSH 
software_type:SSH::SERVER version.major:5 version.minor:3 
ts:1320435464.768382","host":"172.16.238.168","name":"OpenSSH","guid":"ad3d1b4b-ffad-4416-be0f-7df08587ccb5","version.major":5,"version.minor":3,"timestamp":1320435464768}
-{"bro_timestamp":"1440447766.441298","ip_dst_port":1812,"source.type":"bro","result":"failed","uid":"CqF4zGzBOXFjTWqHh","protocol":"radius","original_string":"RADIUS
 | result:failed uid:CqF4zGzBOXFjTWqHh id.orig_p:53031 id.resp_p:1812 
id.orig_h:127.0.0.1 ts:1440447766.441298 id.resp_h:127.0.0.1 
username:steve","ip_dst_addr":"127.0.0.1","ip_src_port":53031,"guid":"b029735a-3e98-45a0-b8da-232967a34085","ip_src_addr":"127.0.0.1","username":"steve","timestamp":1440447766441}
-{"certificate.key_length":1024,"bro_timestamp":"1216706999.661483","certificate.sig_alg":"sha1WithRSAEncryption","certificate.not_valid_before":1.2138336E9,"certificate.key_type":"rsa","basic_constraints.ca":false,"certificate.key_alg":"rsaEncryption","certificate.exponent":"65537","source.type":"bro","protocol":"x509","original_string":"X509
 | certificate.key_length:1024 certificate.sig_alg:sha1WithRSAEncryption 
certificate.not_valid_before:1213833600.0 certificate.key_type:rsa 
basic_constraints.ca:false certificate.key_alg:rsaEncryption 
certificate.exponent:65537 certificate.version:3 
certificate.subject:CN=login.live.com,OU=MSN-Passport,O=Microsoft 
Corporation,street=One Microsoft 
Way,L=Redmond,ST=Washington,postalCode=98052,C=US,serialNumber=600413485,businessCategory=V1.0\\,
 Clause 
5.(b),1.3.6.1.4.1.311.60.2.1.2=#130A57617368696E67746F6E,1.3.6.1.4.1.311.60.2.1.3=#13025553
 id:FkYBO41LPAXxh44KFk certificate.not_valid_after:1248134399.0 
certificate.serial:6905C4A47CFDBF9DBC98DACE3
 8835FB8 certificate.issuer:CN=VeriSign Class 3 Extended Validation SSL 
CA,OU=Terms of use at https:\/\/www.verisign.com\/rpa (c)06,OU=VeriSign Trust 
Network,O=VeriSign\\, Inc.,C=US 
ts:1216706999.661483","certificate.version":3,"certificate.subject":"CN=login.live.com,OU=MSN-Passport,O=Microsoft
 Corporation,street=One Microsoft 
Way,L=Redmond,ST=Washington,postalCode=98052,C=US,serialNumber=600413485,businessCategory=V1.0\\,
 Clause 
5.(b),1.3.6.1.4.1.311.60.2.1.2=#130A57617368696E67746F6E,1.3.6.1.4.1.311.60.2.1.3=#13025553","guid":"578eac04-9024-49ab-828d-e25f01c33c82","id":"FkYBO41LPAXxh44KFk","certificate.not_valid_after":1.248134399E9,"certificate.serial":"6905C4A47CFDBF9DBC98DACE38835FB8","certificate.issuer":"CN=VeriSign
 Class 3 Extended Validation SSL CA,OU=Terms of use at 
https:\/\/www.verisign.com\/rpa (c)06,OU=VeriSign Trust Network,O=VeriSign\\, 
Inc.,C=US","timestamp":1216706999661}
-{"bro_timestamp":"1258531221.486539","protocol":"known_devices","original_string":"KNOWN_DEVICES
 | dhcp_host_name:m57-jo mac:00:0b:db:63:58:a6 
ts:1258531221.486539","dhcp_host_name":"m57-jo","guid":"e7a216d8-3623-4dea-af78-01da8c5e0bc5","mac":"00:0b:db:63:58:a6","timestamp":1258531221486,"source.type":"bro"}

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput
 
b/metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput
deleted file mode 100644
index 5c88714..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/bro/raw/BroExampleOutput
+++ /dev/null
@@ -1,27 +0,0 @@
-{"http":{"ts":1402307733.473,"uid":"CTo78A11g7CYbbOHvj","id.orig_h":"192.249.113.37","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"method":"GET","host":"www.cisco.com","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"dns":{"ts":1402308259.609,"uid":"CuJT272SKaJSuqO0Ia","id.orig_h":"10.122.196.204","id.orig_p":33976,"id.resp_h":"144.254.71.184","id.resp_p":53,"proto":"udp","trans_id":62418,"query":"www.cisco.com","qclass":1,"qclass_name":"C_INTERNET","qtype":28,"qtype_name":"AAAA","rcode":0,"rcode_name":"NOERROR","AA":true,"TC":false,"RD":true,"RA":true,"Z":0,"answers":["www.cisco.com.akadns.net","origin-www.cisco.com","2001:420:1201:2::a"],"TTLs":[3600.0,289.0,14.0],"rejected":false}}
-{"http":{"ts":1402307733.473,"uid":"KIRAN","id.orig_h":"10.122.196.204","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"method":"GET","host":"www.cisco.com","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"http":{"ts":1402307733.473,"uid":"KIRAN12312312","id.orig_h":"192.249.113.37","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"method":"GET","host":"www.cisco.com","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"http":{"ts":1402307733.473,"uid":"KIRAN12312312","id.orig_h":"192.249.113.37","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"method":"GET","host":"www.cisco.com","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"http":{"ts":1402307733.473,"uid":"CTo78A11g7CYbbOHvj","id.orig_h":"10.122.196.204","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"email":"abul...@mail.csuchico.edu","method":"GET","host":"gabacentre.pw","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"dns":{"ts":1402308259.609,"uid":"CYbbOHvj","id.orig_h":"93.188.160.43","id.orig_p":33976,"id.resp_h":"144.254.71.184","id.resp_p":53,"proto":"udp","trans_id":62418,"query":"www.cisco.com","qclass":1,"qclass_name":"C_INTERNET","qtype":28,"qtype_name":"AAAA","rcode":0,"rcode_name":"NOERROR","AA":true,"TC":false,"RD":true,"RA":true,"Z":0,"answers":["gabacentre.pw","www.cisco.com.akadns.net","origin-www.cisco.com","2001:420:1201:2::a"],"TTLs":[3600.0,289.0,14.0],"rejected":false}}
-{"http":{"ts":1402307733.473,"uid":"CTo78A11g7CYbbOHvj","id.orig_h":"192.249.113.37","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"method":"GET","host":"www.cisco.com","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"dns":{"ts":1402308259.609,"uid":"CuJT272SKaJSuqO0Ia","id.orig_h":"10.122.196.204","id.orig_p":33976,"id.resp_h":"144.254.71.184","id.resp_p":53,"proto":"udp","trans_id":62418,"query":"www.cisco.com","qclass":1,"qclass_name":"C_INTERNET","qtype":28,"qtype_name":"AAAA","rcode":0,"rcode_name":"NOERROR","AA":true,"TC":false,"RD":true,"RA":true,"Z":0,"answers":["www.cisco.com.akadns.net","origin-www.cisco.com","2001:420:1201:2::a"],"TTLs":[3600.0,289.0,14.0],"rejected":false}}
-{"http":{"ts":1402307733.473,"uid":"KIRAN","id.orig_h":"10.122.196.204","id.orig_p":58808,"id.resp_h":"72.163.4.161","id.resp_p":80,"trans_depth":1,"method":"GET","host":"www.cisco.com","uri":"/","user_agent":"curl/7.22.0
 (x86_64-pc-linux-gnu) libcurl/7.22.0 OpenSSL/1.0.1 zlib/1.2.3.4 libidn/1.23 
librtmp/2.3","request_body_len":0,"response_body_len":25523,"status_code":200,"status_msg":"OK","tags":[],"resp_fuids":["FJDyMC15lxUn5ngPfd"],"resp_mime_types":["text/html"]}}
-{"conn": 
{"ts":1440447880.931272,"uid":"CWxtRHnBTbldHnmGh","id.orig_h":"127.0.0.1","id.orig_p":52178,"id.resp_h":"127.0.0.1","id.resp_p":1812,"proto":"udp","service":"radius","duration":1.001459,"orig_bytes":75,"resp_bytes":20,"conn_state":"SF","missed_bytes":0,"history":"Dd","orig_pkts":1,"orig_ip_bytes":103,"resp_pkts":1,"resp_ip_bytes":48,"tunnel_parents":[]}}
-{"conn": 
{"ts":1440447904.122012,"uid":"CK2Oivhlh0ovRcYx","id.orig_h":"127.0.0.1","id.orig_p":62956,"id.resp_h":"127.0.0.1","id.resp_p":1812,"proto":"udp","service":"radius","duration":10.008839,"orig_bytes":225,"resp_bytes":0,"conn_state":"S0","missed_bytes":0,"history":"D","orig_pkts":3,"orig_ip_bytes":309,"resp_pkts":0,"resp_ip_bytes":0,"tunnel_parents":[]}}
-{"conn": 
{"ts":1440448190.335333,"uid":"CX6mcO38sO7dkDxK55","id.orig_h":"127.0.0.1","id.orig_p":53127,"id.resp_h":"127.0.0.1","id.resp_p":1812,"proto":"udp","service":"radius","duration":0.000517,"orig_bytes":75,"resp_bytes":71,"conn_state":"SF","missed_bytes":0,"history":"Dd","orig_pkts":1,"orig_ip_bytes":103,"resp_pkts":1,"resp_ip_bytes":99,"tunnel_parents":[]}}
-{"dpd": 
{"ts":1216702277.477596,"uid":"C4O50B3WAUCb2Yw29j","id.orig_h":"192.168.15.4","id.orig_p":33348,"id.resp_h":"66.33.212.43","id.resp_p":80,"proto":"tcp","analyzer":"HTTP","failure_reason":"not
 a http reply line"}}
-{"ftp": 
{"ts":1166289883.160785,"uid":"ClOsCM3BUs3saPsD2c","id.orig_h":"192.168.0.114","id.orig_p":1137,"id.resp_h":"192.168.0.193","id.resp_p":21,"user":"csanders","password":"<hidden>","command":"PASV","reply_code":227,"reply_msg":"Entering
 Passive Mode 
(192,168,0,193,28,86)","data_channel.passive":true,"data_channel.orig_h":"192.168.0.114","data_channel.resp_h":"192.168.0.193","data_channel.resp_p":7254}}
-{"files": 
{"ts":1216706983.387664,"fuid":"FnEYba9VPOcC41c1","tx_hosts":["216.113.185.92"],"rx_hosts":["192.168.15.4"],"conn_uids":["CLWqoN1IA9MB8Ru9i3"],"source":"HTTP","depth":0,"analyzers":["MD5","SHA1"],"duration":30.701792,"is_orig":false,"seen_bytes":0,"missing_bytes":3384,"overflow_bytes":0,"timedout":true}}
-{"known_certs": 
{"ts":1216706999.34818,"host":"65.54.179.216","port_num":443,"subject":"CN=nexus.passport.com,OU=MSN
 
Passport,O=Microsoft,L=Redmond,ST=Washington,C=US","issuer_subject":"CN=VeriSign
 Class 3 Secure Server CA,OU=Terms of use at https://www.verisign.com/rpa 
(c)05,OU=VeriSign Trust Network,O=VeriSign\u005c, 
Inc.,C=US","serial":"24A2DD82DC52358E7F0C6AF6135F3B32"}}
-{"smtp": 
{"ts":1258568036.57884,"uid":"ChR6254RrWbrxiGsd7","id.orig_h":"192.168.1.105","id.orig_p":49353,"id.resp_h":"192.168.1.1","id.resp_p":25,"trans_depth":1,"helo":"M57Terry","last_reply":"220
 2.0.0 Ready to start 
TLS","path":["192.168.1.1","192.168.1.105"],"tls":true,"fuids":[],"is_webmail":false}}
-{"ssl": 
{"ts":1216706999.444925,"uid":"CVrS2IBW8gukBClA8","id.orig_h":"192.168.15.4","id.orig_p":36532,"id.resp_h":"65.54.186.47","id.resp_p":443,"version":"TLSv10","cipher":"TLS_RSA_WITH_RC4_128_MD5","server_name":"login.live.com","resumed":false,"established":true,"cert_chain_fuids":["FkYBO41LPAXxh44KFk","FPrzYN1SuBqHflXZId","FZ71xF13r5XVSam1z1"],"client_cert_chain_fuids":[],"subject":"CN=login.live.com,OU=MSN-Passport,O=Microsoft
 Corporation,street=One Microsoft 
Way,L=Redmond,ST=Washington,postalCode=98052,C=US,serialNumber=600413485,businessCategory=V1.0\u005c,
 Clause 
5.(b),1.3.6.1.4.1.311.60.2.1.2=#130A57617368696E67746F6E,1.3.6.1.4.1.311.60.2.1.3=#13025553","issuer":"CN=VeriSign
 Class 3 Extended Validation SSL CA,OU=Terms of use at 
https://www.verisign.com/rpa (c)06,OU=VeriSign Trust Network,O=VeriSign\u005c, 
Inc.,C=US","validation_status":"unable to get local issuer certificate"}}
-{"weird": 
{"ts":1216706981.177382,"uid":"Cfxxnt3m0v9SEf5XQ7","id.orig_h":"192.168.15.4","id.orig_p":36446,"id.resp_h":"66.151.146.194","id.resp_p":80,"name":"unescaped_special_URI_char","notice":false,"peer":"bro"}}
-{"notice": 
{"ts":1216706377.196728,"uid":"CNHQmp1mNiZHdAf5Ce","id.orig_h":"192.168.15.4","id.orig_p":35736,"id.resp_h":"74.125.19.104","id.resp_p":443,"proto":"tcp","note":"SSL::Invalid_Server_Cert","msg":"SSL
 certificate validation failed with (unable to get local issuer 
certificate)","sub":"CN=www.google.com,O=Google Inc,L=Mountain 
View,ST=California,C=US","src":"192.168.15.4","dst":"74.125.19.104","p":443,"peer_descr":"bro","actions":["Notice::ACTION_LOG"],"suppress_for":3600.0,"dropped":false}}
-{"dhcp": 
{"ts":1258567562.944638,"uid":"CSiO9f3y8Uyu0XprAi","id.orig_h":"192.168.1.103","id.orig_p":68,"id.resp_h":"192.168.1.1","id.resp_p":67,"mac":"00:0b:db:63:5b:d4","assigned_ip":"192.168.1.103","lease_time":3564.0,"trans_id":418901490}}
-{"ssh": 
{"ts":1320435930.914196,"uid":"CyrWKo1E1rRywjbOAk","id.orig_h":"172.16.238.1","id.orig_p":58435,"id.resp_h":"172.16.238.136","id.resp_p":22,"version":2,"auth_success":false,"client":"SSH-2.0-OpenSSH_5.6","server":"SSH-2.0-OpenSSH_5.8p1
 
Debian-7ubuntu1","cipher_alg":"aes128-ctr","mac_alg":"hmac-md5","compression_alg":"none","kex_alg":"diffie-hellman-group-exchange-sha256","host_key_alg":"ssh-rsa","host_key":"87:11:46:da:89:c5:2b:d9:6b:ee:e0:44:7e:73:80:f8"}}
-{"software": 
{"ts":1320435464.768382,"host":"172.16.238.168","host_p":22,"software_type":"SSH::SERVER","name":"OpenSSH","version.major":5,"version.minor":3,"unparsed_version":"OpenSSH_5.3"}}
-{"radius": 
{"ts":1440447766.441298,"uid":"CqF4zGzBOXFjTWqHh","id.orig_h":"127.0.0.1","id.orig_p":53031,"id.resp_h":"127.0.0.1","id.resp_p":1812,"username":"steve","result":"failed"}}
-{"x509": 
{"ts":1216706999.661483,"id":"FkYBO41LPAXxh44KFk","certificate.version":3,"certificate.serial":"6905C4A47CFDBF9DBC98DACE38835FB8","certificate.subject":"CN=login.live.com,OU=MSN-Passport,O=Microsoft
 Corporation,street=One Microsoft 
Way,L=Redmond,ST=Washington,postalCode=98052,C=US,serialNumber=600413485,businessCategory=V1.0\u005c,
 Clause 
5.(b),1.3.6.1.4.1.311.60.2.1.2=#130A57617368696E67746F6E,1.3.6.1.4.1.311.60.2.1.3=#13025553","certificate.issuer":"CN=VeriSign
 Class 3 Extended Validation SSL CA,OU=Terms of use at 
https://www.verisign.com/rpa (c)06,OU=VeriSign Trust Network,O=VeriSign\u005c, 
Inc.,C=US","certificate.not_valid_before":1213833600.0,"certificate.not_valid_after":1248134399.0,"certificate.key_alg":"rsaEncryption","certificate.sig_alg":"sha1WithRSAEncryption","certificate.key_type":"rsa","certificate.key_length":1024,"certificate.exponent":"65537","basic_constraints.ca":false}}
-{"known_devices": 
{"ts":1258531221.486539,"mac":"00:0b:db:63:58:a6","dhcp_host_name":"m57-jo"}}

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/snort/parsed/SnortParsed
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/snort/parsed/SnortParsed
 
b/metron-platform/metron-integration-test/src/main/sample/data/snort/parsed/SnortParsed
deleted file mode 100644
index 02d519e..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/snort/parsed/SnortParsed
+++ /dev/null
@@ -1,3 +0,0 @@
-{"msg":"Consecutive TCP small segments exceeding 
threshold","sig_rev":"1","ip_dst_addr":"10.0.2.15","ip_dst_port":"22","ethsrc":"52:54:00:12:35:02","tcpseq":"0x9AFF3D7","dgmlen":"64","icmpid":"","tcplen":"","tcpwindow":"0xFFFF","icmpseq":"","tcpack":"0xC8761D52","original_string":"01\/27\/16-16:01:04.877970
 ,129,12,1,\"Consecutive TCP small segments exceeding 
threshold\",TCP,10.0.2.2,56642,10.0.2.15,22,52:54:00:12:35:02,08:00:27:7F:93:2D,0x4E,***AP***,0x9AFF3D7,0xC8761D52,,0xFFFF,64,0,59677,64,65536,,,,","icmpcode":"","tos":"0","id":"59677","timestamp":1453932941970,"ethdst":"08:00:27:7F:93:2D","ip_src_addr":"10.0.2.2","ttl":"64","source.type":"snort","ethlen":"0x4E","iplen":"65536","icmptype":"","protocol":"TCP","ip_src_port":"56642","tcpflags":"***AP***","sig_id":"12","sig_generator":"129",
 "is_alert" : "true","guid":"this-is-random-uuid-will-be-36-chars"}
-{"msg":"Consecutive TCP small segments exceeding 
threshold","sig_rev":"1","ip_dst_addr":"10.0.2.15","ip_dst_port":"50895","ethsrc":"52:54:00:12:35:02","tcpseq":"0xDB45F7A","dgmlen":"96","icmpid":"","tcplen":"","tcpwindow":"0xFFFF","icmpseq":"","tcpack":"0x7701DD5B","original_string":"02\/22\/16-15:56:48.612494
 ,129,12,1,\"Consecutive TCP small segments exceeding 
threshold\",TCP,96.44.142.5,80,10.0.2.15,50895,52:54:00:12:35:02,08:00:27:7F:93:2D,0x6E,***AP***,0xDB45F7A,0x7701DD5B,,0xFFFF,64,0,16785,96,98304,,,,","icmpcode":"","tos":"0","id":"16785","timestamp":1456178820494,"ethdst":"08:00:27:7F:93:2D","ip_src_addr":"96.44.142.5","ttl":"64","source.type":"snort","ethlen":"0x6E","iplen":"98304","icmptype":"","protocol":"TCP","ip_src_port":"80","tcpflags":"***AP***","sig_id":"12","sig_generator":"129",
 "is_alert" : "true","guid":"this-is-random-uuid-will-be-36-chars"}
-{"msg":"Consecutive TCP small segments exceeding 
threshold","sig_rev":"1","ip_dst_addr":"10.0.2.15","ip_dst_port":"50895","ethsrc":"52:54:00:12:35:02","tcpseq":"0xDB508F2","dgmlen":"152","icmpid":"","tcplen":"","tcpwindow":"0xFFFF","icmpseq":"","tcpack":"0x7701DD5B","original_string":"02\/22\/16-15:56:48.616775
 ,129,12,1,\"Consecutive TCP small segments exceeding 
threshold\",TCP,96.44.142.5,80,10.0.2.15,50895,52:54:00:12:35:02,08:00:27:7F:93:2D,0xA6,***AP***,0xDB508F2,0x7701DD5B,,0xFFFF,64,0,16824,152,155648,,,,","icmpcode":"","tos":"0","id":"16824","timestamp":1456178824775,"ethdst":"08:00:27:7F:93:2D","ip_src_addr":"96.44.142.5","ttl":"64","source.type":"snort","ethlen":"0xA6","iplen":"155648","icmptype":"","protocol":"TCP","ip_src_port":"80","tcpflags":"***AP***","sig_id":"12","sig_generator":"129",
 "is_alert" : "true","guid":"this-is-random-uuid-will-be-36-chars"}

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/snort/raw/SnortOutput
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/snort/raw/SnortOutput
 
b/metron-platform/metron-integration-test/src/main/sample/data/snort/raw/SnortOutput
deleted file mode 100644
index 702f179..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/snort/raw/SnortOutput
+++ /dev/null
@@ -1,3 +0,0 @@
-01/27/16-16:01:04.877970 ,129,12,1,"Consecutive TCP small segments exceeding 
threshold",TCP,10.0.2.2,56642,10.0.2.15,22,52:54:00:12:35:02,08:00:27:7F:93:2D,0x4E,***AP***,0x9AFF3D7,0xC8761D52,,0xFFFF,64,0,59677,64,65536,,,,
-02/22/16-15:56:48.612494 ,129,12,1,"Consecutive TCP small segments exceeding 
threshold",TCP,96.44.142.5,80,10.0.2.15,50895,52:54:00:12:35:02,08:00:27:7F:93:2D,0x6E,***AP***,0xDB45F7A,0x7701DD5B,,0xFFFF,64,0,16785,96,98304,,,,
-02/22/16-15:56:48.616775 ,129,12,1,"Consecutive TCP small segments exceeding 
threshold",TCP,96.44.142.5,80,10.0.2.15,50895,52:54:00:12:35:02,08:00:27:7F:93:2D,0xA6,***AP***,0xDB508F2,0x7701DD5B,,0xFFFF,64,0,16824,152,155648,,,,

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/squid/parsed/SquidExampleParsed
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/squid/parsed/SquidExampleParsed
 
b/metron-platform/metron-integration-test/src/main/sample/data/squid/parsed/SquidExampleParsed
deleted file mode 100644
index aad1f9f..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/squid/parsed/SquidExampleParsed
+++ /dev/null
@@ -1,2 +0,0 @@
-{"elapsed":161,"code":200,"ip_dst_addr":"199.27.79.73","original_string":"1461576382.642
    161 127.0.0.1 TCP_MISS\/200 103701 GET http:\/\/www.cnn.com\/ - 
DIRECT\/199.27.79.73 
text\/html","method":"GET","bytes":103701,"action":"TCP_MISS","ip_src_addr":"127.0.0.1","url":"http://www.cnn.com/","full_hostname":"www.cnn.com";,
 "domain_without_subdomains": "cnn.com", 
"timestamp":1461576382642,"source.type":"squid","guid":"this-is-random-uuid-will-be-36-chars"}
-{"elapsed":159,"code":200,"ip_dst_addr":"66.210.41.9","original_string":"1461576442.228
    159 127.0.0.1 TCP_MISS\/200 137183 GET http:\/\/www.nba.com\/ - 
DIRECT\/66.210.41.9 
text\/html","method":"GET","bytes":137183,"action":"TCP_MISS","ip_src_addr":"127.0.0.1","url":"http://www.nba.com/";,
 "full_hostname":"www.nba.com", "domain_without_subdomains" : "nba.com", 
"timestamp":1461576442228,"source.type":"squid","guid":"this-is-random-uuid-will-be-36-chars"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/squid/raw/SquidExampleOutput
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/squid/raw/SquidExampleOutput
 
b/metron-platform/metron-integration-test/src/main/sample/data/squid/raw/SquidExampleOutput
deleted file mode 100644
index ae70fb9..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/squid/raw/SquidExampleOutput
+++ /dev/null
@@ -1,2 +0,0 @@
-1461576382.642    161 127.0.0.1 TCP_MISS/200 103701 GET http://www.cnn.com/ - 
DIRECT/199.27.79.73 text/html
-1461576442.228    159 127.0.0.1 TCP_MISS/200 137183 GET http://www.nba.com/ - 
DIRECT/66.210.41.9 text/html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/websphere/parsed/WebsphereParsed
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/websphere/parsed/WebsphereParsed
 
b/metron-platform/metron-integration-test/src/main/sample/data/websphere/parsed/WebsphereParsed
deleted file mode 100644
index 0f5b0fc..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/websphere/parsed/WebsphereParsed
+++ /dev/null
@@ -1,5 +0,0 @@
-{"severity":"notice","hostname":"ABCXML1413","event_type":"auth","original_string":"<133>Apr
 15 17:47:28 ABCXML1413 [rojOut][0x81000033][auth][notice] user(rick007): 
[120.43.200.6]: User logged into 
'cohlOut'.","event_code":"0x81000033","security_domain":"rojOut","event_subtype":"login","priority":133,"ip_src_addr":"120.43.200.6","timestamp":1460742448000,"username":"rick007","source.type":"websphere","guid":"this-is-random-uuid-will-be-36-chars"}
-{"severity":"info","hostname":"PHIXML3RWD","event_type":"auth","original_string":"<134>Apr
 15 18:02:27 PHIXML3RWD [0x81000019][auth][info] [14.122.2.201]: User 
'hjpotter' logged out from 
'default'.","event_code":"0x81000019","security_domain":"default","event_subtype":"logout","priority":134,"ip_src_addr":"14.122.2.201","timestamp":1460743347000,"username":"hjpotter","source.type":"websphere","guid":"this-is-random-uuid-will-be-36-chars"}
-{"severity":"error","hostname":"ROBXML3QRS","process":"rbm","event_type":"auth","original_string":"<131>Apr
 15 17:36:35 ROBXML3QRS [0x80800018][auth][error] rbm(RBM-Settings): 
trans(3502888135)[request] gtid(3502888135): RBM: Resource access 
denied.","event_code":"0x80800018","message":"trans(3502888135)[request] 
gtid(3502888135): RBM: Resource access 
denied.","priority":131,"timestamp":1460741795000,"source.type":"websphere","guid":"this-is-random-uuid-will-be-36-chars"}
-{"severity":"info","hostname":"SAGPXMLQA333","process":"trans","event_type":"audit","original_string":"<134>Apr
 15 17:17:34 SAGPXMLQA333 [0x8240001c][audit][info] trans(191): 
(admin:default:system:*): ntp-service 'NTP Service' - Operational state 
down","event_code":"0x8240001c","message":"(admin:default:system:*): 
ntp-service 'NTP Service' - Operational state 
down","priority":134,"timestamp":1460740654000,"source.type":"websphere","guid":"this-is-random-uuid-will-be-36-chars"}
-{"severity":"info","hostname":"DOMXML3PUZ","event_type":"auth","original_string":"<134>Apr
 15 17:46:52 DOMXML3PUZ [0x8100448e][auth][info] CLI timeout 
occurred.","event_code":"0x8100448e","message":"CLI timeout 
occurred.","priority":134,"timestamp":1460742412000,"source.type":"websphere","guid":"this-is-random-uuid-will-be-36-chars"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/websphere/raw/WebsphereOutput.txt
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/websphere/raw/WebsphereOutput.txt
 
b/metron-platform/metron-integration-test/src/main/sample/data/websphere/raw/WebsphereOutput.txt
deleted file mode 100644
index 9003548..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/websphere/raw/WebsphereOutput.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<133>Apr 15 17:47:28 ABCXML1413 [rojOut][0x81000033][auth][notice] 
user(rick007): [120.43.200.6]: User logged into 'cohlOut'.
-<134>Apr 15 18:02:27 PHIXML3RWD [0x81000019][auth][info] [14.122.2.201]: User 
'hjpotter' logged out from 'default'.
-<131>Apr 15 17:36:35 ROBXML3QRS [0x80800018][auth][error] rbm(RBM-Settings): 
trans(3502888135)[request] gtid(3502888135): RBM: Resource access denied.
-<134>Apr 15 17:17:34 SAGPXMLQA333 [0x8240001c][audit][info] trans(191): 
(admin:default:system:*): ntp-service 'NTP Service' - Operational state down
-<134>Apr 15 17:46:52 DOMXML3PUZ [0x8100448e][auth][info] CLI timeout occurred.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/yaf/indexed/YafIndexed
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/yaf/indexed/YafIndexed
 
b/metron-platform/metron-integration-test/src/main/sample/data/yaf/indexed/YafIndexed
deleted file mode 100644
index d48fa46..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/yaf/indexed/YafIndexed
+++ /dev/null
@@ -1,10 +0,0 @@
-{"adapter.threatinteladapter.end.ts":"1457102731219","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","isn":"22efa001","index.elasticsearchwriter.ts":"1457102731220","dip":"10.0.2.15","dp":39468,"rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
      216.21.170.221|   80|                               10.0.2.15|39468|      
AS|       0|       0|       0|22efa001|00000000|000|000|       1|      44|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichmentjoinbolt.joiner.ts":"1457102731206","adapter.hostfromjsonlistadapter.begin.ts":"1457102731185","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":44,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731185","threatintelsplitterbolt.splitter.ts":"1457102731207","enrichments.geo.dip.postalCode":"test
 postalCode","start_time":1453994988512,
 
"adapter.threatinteladapter.begin.ts":"1457102731210","riflags":0,"proto":6,"enrichments.host.dip.known_info.local":"YES","enrichments.geo.dip.longitude":"test
 
longitude","iflags":"AS","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731198","adapter.hostfromjsonlistadapter.end.ts":"1457102731197","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731220","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"216.21.170.221","rtag":0,"sp":80,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test 
latitude","timestamp":1453994988512,"risn":0,"enrichments.host.dip.known_info.type":"printer","end_time":1453994988512,"enrichments.ho
 st.dip.known_info.asset_value":"important","source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731221","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","enrichments.host.sip.known_info.asset_value":"important","isn":10000000,"index.elasticsearchwriter.ts":"1457102731221","dip":"10.0.2.3","dp":53,"rpkt":0,"original_string":"2016-01-28
 15:29:48.502|2016-01-28 15:29:48.502|   0.000|   0.000| 17|                    
           10.0.2.15|37299|                                10.0.2.3|   53|      
 A|       0|       0|       0|10000000|00000000|000|000|       1|      56|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichments.host.sip.known_info.type":"printer","enrichmentjoinbolt.joiner.ts":"1457102731208","adapter.hostfromjsonlistadapter.begin.ts":"1457102731197","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":56,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731198","threatintelsplitterbolt.splitt
 er.ts":"1457102731210","enrichments.geo.dip.postalCode":"test 
postalCode","start_time":1453994988502,"adapter.threatinteladapter.begin.ts":"1457102731219","riflags":0,"proto":17,"enrichments.geo.dip.longitude":"test
 
longitude","iflags":"A","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731198","adapter.hostfromjsonlistadapter.end.ts":"1457102731197","enrichments.host.sip.known_info.local":"YES","threatintels.ip.dip.ip_threat_intel":"alert","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731221","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.15","rtag":0,"sp":37299,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latit
 ude":"test 
latitude","timestamp":1453994988502,"risn":0,"end_time":1453994988502,"is_alert":"true","source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731221","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","isn":0,"index.elasticsearchwriter.ts":"1457102731222","dip":"10.0.2.15","dp":37299,"rpkt":0,"original_string":"2016-01-28
 15:29:48.504|2016-01-28 15:29:48.504|   0.000|   0.000| 17|                    
            10.0.2.3|   53|                               10.0.2.15|37299|      
 A|       0|       0|       0|00000000|00000000|000|000|       1|     312|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichmentjoinbolt.joiner.ts":"1457102731209","adapter.hostfromjsonlistadapter.begin.ts":"1457102731197","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":312,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731198","threatintelsplitterbolt.splitter.ts":"1457102731210","enrichments.geo.dip.postalCode":"test
 postalCode","start_time":1453994988504,"adapter
 
.threatinteladapter.begin.ts":"1457102731221","riflags":0,"proto":17,"enrichments.host.dip.known_info.local":"YES","enrichments.geo.dip.longitude":"test
 
longitude","iflags":"A","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731222","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.3","rtag":0,"sp":53,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test 
latitude","timestamp":1453994988504,"risn":0,"enrichments.host.dip.known_info.type":"printer","end_time":1453994988504,"enrichments.host.dip.known_i
 
nfo.asset_value":"important","is_alert":"true","source.type":"yaf","threatintels.ip.sip.ip_threat_intel":"alert","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731222","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","enrichments.host.sip.known_info.asset_value":"important","isn":0,"index.elasticsearchwriter.ts":"1457102731222","dip":"10.0.2.3","dp":53,"rpkt":0,"original_string":"2016-01-28
 15:29:48.504|2016-01-28 15:29:48.504|   0.000|   0.000| 17|                    
           10.0.2.15|56303|                                10.0.2.3|   53|      
 A|       0|       0|       0|00000000|00000000|000|000|       1|      56|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichments.host.sip.known_info.type":"printer","enrichmentjoinbolt.joiner.ts":"1457102731209","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":56,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitterbolt.splitter.ts":
 "1457102731211","enrichments.geo.dip.postalCode":"test 
postalCode","start_time":1453994988504,"adapter.threatinteladapter.begin.ts":"1457102731221","riflags":0,"proto":17,"enrichments.geo.dip.longitude":"test
 
longitude","iflags":"A","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.host.sip.known_info.local":"YES","threatintels.ip.dip.ip_threat_intel":"alert","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731222","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.15","rtag":0,"sp":56303,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"t
 est 
latitude","timestamp":1453994988504,"risn":0,"end_time":1453994988504,"is_alert":"true","source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731222","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","isn":0,"index.elasticsearchwriter.ts":"1457102731222","dip":"10.0.2.15","dp":56303,"rpkt":0,"original_string":"2016-01-28
 15:29:48.506|2016-01-28 15:29:48.506|   0.000|   0.000| 17|                    
            10.0.2.3|   53|                               10.0.2.15|56303|      
 A|       0|       0|       0|00000000|00000000|000|000|       1|      84|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichmentjoinbolt.joiner.ts":"1457102731210","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":84,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitterbolt.splitter.ts":"1457102731212","enrichments.geo.dip.postalCode":"test
 postalCode","start_time":1453994988506,"adapter.
 
threatinteladapter.begin.ts":"1457102731222","riflags":0,"proto":17,"enrichments.host.dip.known_info.local":"YES","enrichments.geo.dip.longitude":"test
 
longitude","iflags":"A","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731222","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.3","rtag":0,"sp":53,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test 
latitude","timestamp":1453994988506,"risn":0,"enrichments.host.dip.known_info.type":"printer","end_time":1453994988506,"enrichments.host.dip.known_in
 
fo.asset_value":"important","is_alert":"true","source.type":"yaf","threatintels.ip.sip.ip_threat_intel":"alert","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731222","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","enrichments.host.sip.known_info.asset_value":"important","isn":"58c52fca","index.elasticsearchwriter.ts":"1457102732038","dip":"216.21.170.221","dp":80,"rpkt":0,"original_string":"2016-01-28
 15:29:48.508|2016-01-28 15:29:48.508|   0.000|   0.000|  6|                    
           10.0.2.15|39468|                          216.21.170.221|   80|      
 S|       0|       0|       0|58c52fca|00000000|000|000|       1|      60|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichments.host.sip.known_info.type":"printer","enrichmentjoinbolt.joiner.ts":"1457102731210","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":60,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitterbol
 t.splitter.ts":"1457102731212","enrichments.geo.dip.postalCode":"test 
postalCode","start_time":1453994988508,"adapter.threatinteladapter.begin.ts":"1457102731222","riflags":0,"proto":6,"enrichments.geo.dip.longitude":"test
 
longitude","iflags":"S","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.host.sip.known_info.local":"YES","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731223","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.15","rtag":0,"sp":39468,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test latitude","timestamp":145399
 4988508,"risn":0,"end_time":1453994988508,"source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731223","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","enrichments.host.sip.known_info.asset_value":"important","isn":"58c52fcb","index.elasticsearchwriter.ts":"1457102732038","dip":"216.21.170.221","dp":80,"rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
           10.0.2.15|39468|                          216.21.170.221|   80|      
 A|       0|       0|       0|58c52fcb|00000000|000|000|       1|      40|      
 0|       0|    0|idle 
","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichments.host.sip.known_info.type":"printer","enrichmentjoinbolt.joiner.ts":"1457102731210","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 dmaCode","app":0,"oct":40,"end_reason":"idle 
","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitterb
 olt.splitter.ts":"1457102731212","enrichments.geo.dip.postalCode":"test 
postalCode","start_time":1453994988512,"adapter.threatinteladapter.begin.ts":"1457102731223","riflags":0,"proto":6,"enrichments.geo.dip.longitude":"test
 
longitude","iflags":"A","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.host.sip.known_info.local":"YES","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731223","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.15","rtag":0,"sp":39468,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test latitude","timestamp":1453
 994988512,"risn":0,"end_time":1453994988512,"source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731223","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","enrichments.host.sip.known_info.asset_value":"important","isn":"58c52fcb","index.elasticsearchwriter.ts":"1457102732038","dip":"216.21.170.221","dp":80,"rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
           10.0.2.15|39468|                          216.21.170.221|   80|      
AP|       0|       0|       0|58c52fcb|00000000|000|000|       1|     148|      
 0|       0|    0|idle 
","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichments.host.sip.known_info.type":"printer","enrichmentjoinbolt.joiner.ts":"1457102731210","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 dmaCode","app":0,"oct":148,"end_reason":"idle 
","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitter
 bolt.splitter.ts":"1457102731212","enrichments.geo.dip.postalCode":"test 
postalCode","start_time":1453994988512,"adapter.threatinteladapter.begin.ts":"1457102731223","riflags":0,"proto":6,"enrichments.geo.dip.longitude":"test
 
longitude","iflags":"AP","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.host.sip.known_info.local":"YES","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731225","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"10.0.2.15","rtag":0,"sp":39468,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test latitude","timestamp":14
 
53994988512,"risn":0,"end_time":1453994988512,"source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731225","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","isn":"22efa002","index.elasticsearchwriter.ts":"1457102732038","dip":"10.0.2.15","dp":39468,"rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
      216.21.170.221|   80|                               10.0.2.15|39468|      
 A|       0|       0|       0|22efa002|00000000|000|000|       1|      40|      
 0|       0|    0|idle 
","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichmentjoinbolt.joiner.ts":"1457102731211","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 dmaCode","app":0,"oct":40,"end_reason":"idle 
","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitterbolt.splitter.ts":"1457102731212","enrichments.geo.dip.postalCode":"test
 postalCode","start_time":145399498851
 
2,"adapter.threatinteladapter.begin.ts":"1457102731223","riflags":0,"proto":6,"enrichments.host.dip.known_info.local":"YES","enrichments.geo.dip.longitude":"test
 
longitude","iflags":"A","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731225","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"216.21.170.221","rtag":0,"sp":80,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test 
latitude","timestamp":1453994988512,"risn":0,"enrichments.host.dip.known_info.type":"printer","end_time":1453994988512,"enrichments.h
 ost.dip.known_info.asset_value":"important","source.type":"yaf","rtt":"0.000"}
-{"adapter.threatinteladapter.end.ts":"1457102731226","enrichments.geo.dip.location_point":"test
 latitude,test 
longitude","isn":"22efa002","index.elasticsearchwriter.ts":"1457102732038","dip":"10.0.2.15","dp":39468,"rpkt":0,"original_string":"2016-01-28
 15:29:48.562|2016-01-28 15:29:48.562|   0.000|   0.000|  6|                    
      216.21.170.221|   80|                               10.0.2.15|39468|      
AP|       0|       0|       0|22efa002|00000000|000|000|       1|     604|      
 0|       0|    
0|idle","enrichments.geo.dip.locID":"1","enrichments.geo.sip.city":"test 
city","enrichmentjoinbolt.joiner.ts":"1457102731211","adapter.hostfromjsonlistadapter.begin.ts":"1457102731198","tag":0,"enrichments.geo.dip.dmaCode":"test
 
dmaCode","app":0,"oct":604,"end_reason":"idle","enrichments.geo.sip.locID":"1","adapter.mockgeoadapter.begin.ts":"1457102731199","threatintelsplitterbolt.splitter.ts":"1457102731213","enrichments.geo.dip.postalCode":"test
 postalCode","start_time":1453994988562
 
,"adapter.threatinteladapter.begin.ts":"1457102731226","riflags":0,"proto":6,"enrichments.host.dip.known_info.local":"YES","enrichments.geo.dip.longitude":"test
 
longitude","iflags":"AP","uflags":0,"adapter.mockgeoadapter.end.ts":"1457102731199","adapter.hostfromjsonlistadapter.end.ts":"1457102731198","enrichments.geo.sip.postalCode":"test
 postalCode","duration":"0.000","enrichments.geo.dip.country":"test 
country","threatinteljoinbolt.joiner.ts":"1457102731226","enrichments.geo.dip.latitude":"test
 latitude","enrichments.geo.sip.country":"test 
country","enrichments.geo.dip.city":"test 
city","enrichments.geo.sip.dmaCode":"test 
dmaCode","pkt":1,"enrichments.geo.sip.location_point":"test latitude,test 
longitude","ruflags":0,"roct":0,"sip":"216.21.170.221","rtag":0,"sp":80,"enrichments.geo.sip.longitude":"test
 longitude","enrichments.geo.sip.latitude":"test 
latitude","timestamp":1453994988562,"risn":0,"enrichments.host.dip.known_info.type":"printer","end_time":1453994988562,"enrichments.h
 ost.dip.known_info.asset_value":"important","source.type":"yaf","rtt":"0.000"}

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/yaf/parsed/YafExampleParsed
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/yaf/parsed/YafExampleParsed
 
b/metron-platform/metron-integration-test/src/main/sample/data/yaf/parsed/YafExampleParsed
deleted file mode 100644
index 6ee2b2f..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/yaf/parsed/YafExampleParsed
+++ /dev/null
@@ -1,10 +0,0 @@
-{"iflags":"AS","uflags":0,"isn":"22efa001","ip_dst_addr":"10.0.2.15","ip_dst_port":39468,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
      216.21.170.221|   80|                               10.0.2.15|39468|      
AS|       0|       0|       0|22efa001|00000000|000|000|       1|      44|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"216.21.170.221","tag":0,"rtag":0,"ip_src_port":80,"timestamp":1453994988512,"app":0,"oct":44,"end_reason":"idle","risn":0,"end_time":1453994988512,"source.type":"yaf","start_time":1453994988512,"riflags":0,"rtt":"0.000","protocol":"TCP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"A","uflags":0,"isn":10000000,"ip_dst_addr":"10.0.2.3","ip_dst_port":53,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.502|2016-01-28 15:29:48.502|   0.000|   0.000| 17|                    
           10.0.2.15|37299|                                10.0.2.3|   53|      
 A|       0|       0|       0|10000000|00000000|000|000|       1|      56|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.15","tag":0,"rtag":0,"ip_src_port":37299,"timestamp":1453994988502,"app":0,"oct":56,"end_reason":"idle","risn":0,"end_time":1453994988502,"source.type":"yaf","start_time":1453994988502,"riflags":0,"rtt":"0.000","protocol":"UDP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"A","uflags":0,"isn":0,"ip_dst_addr":"10.0.2.15","ip_dst_port":37299,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.504|2016-01-28 15:29:48.504|   0.000|   0.000| 17|                    
            10.0.2.3|   53|                               10.0.2.15|37299|      
 A|       0|       0|       0|00000000|00000000|000|000|       1|     312|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.3","tag":0,"rtag":0,"ip_src_port":53,"timestamp":1453994988504,"app":0,"oct":312,"end_reason":"idle","risn":0,"end_time":1453994988504,"source.type":"yaf","start_time":1453994988504,"riflags":0,"rtt":"0.000","protocol":"UDP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"A","uflags":0,"isn":0,"ip_dst_addr":"10.0.2.3","ip_dst_port":53,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.504|2016-01-28 15:29:48.504|   0.000|   0.000| 17|                    
           10.0.2.15|56303|                                10.0.2.3|   53|      
 A|       0|       0|       0|00000000|00000000|000|000|       1|      56|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.15","tag":0,"rtag":0,"ip_src_port":56303,"timestamp":1453994988504,"app":0,"oct":56,"end_reason":"idle","risn":0,"end_time":1453994988504,"source.type":"yaf","start_time":1453994988504,"riflags":0,"rtt":"0.000","protocol":"UDP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"A","uflags":0,"isn":0,"ip_dst_addr":"10.0.2.15","ip_dst_port":56303,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.506|2016-01-28 15:29:48.506|   0.000|   0.000| 17|                    
            10.0.2.3|   53|                               10.0.2.15|56303|      
 A|       0|       0|       0|00000000|00000000|000|000|       1|      84|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.3","tag":0,"rtag":0,"ip_src_port":53,"timestamp":1453994988506,"app":0,"oct":84,"end_reason":"idle","risn":0,"end_time":1453994988506,"source.type":"yaf","start_time":1453994988506,"riflags":0,"rtt":"0.000","protocol":"UDP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"S","uflags":0,"isn":"58c52fca","ip_dst_addr":"216.21.170.221","ip_dst_port":80,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.508|2016-01-28 15:29:48.508|   0.000|   0.000|  6|                    
           10.0.2.15|39468|                          216.21.170.221|   80|      
 S|       0|       0|       0|58c52fca|00000000|000|000|       1|      60|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.15","tag":0,"rtag":0,"ip_src_port":39468,"timestamp":1453994988508,"app":0,"oct":60,"end_reason":"idle","risn":0,"end_time":1453994988508,"source.type":"yaf","start_time":1453994988508,"riflags":0,"rtt":"0.000","protocol":"TCP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"A","uflags":0,"isn":"58c52fcb","ip_dst_addr":"216.21.170.221","ip_dst_port":80,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
           10.0.2.15|39468|                          216.21.170.221|   80|      
 A|       0|       0|       0|58c52fcb|00000000|000|000|       1|      40|      
 0|       0|    0|idle 
","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.15","tag":0,"rtag":0,"ip_src_port":39468,"timestamp":1453994988512,"app":0,"oct":40,"end_reason":"idle
 
","risn":0,"end_time":1453994988512,"source.type":"yaf","start_time":1453994988512,"riflags":0,"rtt":"0.000","protocol":"TCP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"AP","uflags":0,"isn":"58c52fcb","ip_dst_addr":"216.21.170.221","ip_dst_port":80,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
           10.0.2.15|39468|                          216.21.170.221|   80|      
AP|       0|       0|       0|58c52fcb|00000000|000|000|       1|     148|      
 0|       0|    0|idle 
","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"10.0.2.15","tag":0,"rtag":0,"ip_src_port":39468,"timestamp":1453994988512,"app":0,"oct":148,"end_reason":"idle
 
","risn":0,"end_time":1453994988512,"source.type":"yaf","start_time":1453994988512,"riflags":0,"rtt":"0.000","protocol":"TCP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"A","uflags":0,"isn":"22efa002","ip_dst_addr":"10.0.2.15","ip_dst_port":39468,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|                    
      216.21.170.221|   80|                               10.0.2.15|39468|      
 A|       0|       0|       0|22efa002|00000000|000|000|       1|      40|      
 0|       0|    0|idle 
","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"216.21.170.221","tag":0,"rtag":0,"ip_src_port":80,"timestamp":1453994988512,"app":0,"oct":40,"end_reason":"idle
 
","risn":0,"end_time":1453994988512,"source.type":"yaf","start_time":1453994988512,"riflags":0,"rtt":"0.000","protocol":"TCP","guid":"this-is-random-uuid-will-be-36-chars"}
-{"iflags":"AP","uflags":0,"isn":"22efa002","ip_dst_addr":"10.0.2.15","ip_dst_port":39468,"duration":"0.000","rpkt":0,"original_string":"2016-01-28
 15:29:48.562|2016-01-28 15:29:48.562|   0.000|   0.000|  6|                    
      216.21.170.221|   80|                               10.0.2.15|39468|      
AP|       0|       0|       0|22efa002|00000000|000|000|       1|     604|      
 0|       0|    
0|idle","pkt":1,"ruflags":0,"roct":0,"ip_src_addr":"216.21.170.221","tag":0,"rtag":0,"ip_src_port":80,"timestamp":1453994988562,"app":0,"oct":604,"end_reason":"idle","risn":0,"end_time":1453994988562,"source.type":"yaf","start_time":1453994988562,"riflags":0,"rtt":"0.000","protocol":"TCP","guid":"this-is-random-uuid-will-be-36-chars"}

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-integration-test/src/main/sample/data/yaf/raw/YafExampleOutput
----------------------------------------------------------------------
diff --git 
a/metron-platform/metron-integration-test/src/main/sample/data/yaf/raw/YafExampleOutput
 
b/metron-platform/metron-integration-test/src/main/sample/data/yaf/raw/YafExampleOutput
deleted file mode 100644
index 8f3ff44..0000000
--- 
a/metron-platform/metron-integration-test/src/main/sample/data/yaf/raw/YafExampleOutput
+++ /dev/null
@@ -1,10 +0,0 @@
-2016-01-28 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|         
                 216.21.170.221|   80|                               
10.0.2.15|39468|      AS|       0|       0|       0|22efa001|00000000|000|000|  
     1|      44|       0|       0|    0|idle
-2016-01-28 15:29:48.502|2016-01-28 15:29:48.502|   0.000|   0.000| 17|         
                      10.0.2.15|37299|                                10.0.2.3| 
  53|       A|       0|       0|       0|10000000|00000000|000|000|       1|    
  56|       0|       0|    0|idle
-2016-01-28 15:29:48.504|2016-01-28 15:29:48.504|   0.000|   0.000| 17|         
                       10.0.2.3|   53|                               
10.0.2.15|37299|       A|       0|       0|       0|00000000|00000000|000|000|  
     1|     312|       0|       0|    0|idle
-2016-01-28 15:29:48.504|2016-01-28 15:29:48.504|   0.000|   0.000| 17|         
                      10.0.2.15|56303|                                10.0.2.3| 
  53|       A|       0|       0|       0|00000000|00000000|000|000|       1|    
  56|       0|       0|    0|idle
-2016-01-28 15:29:48.506|2016-01-28 15:29:48.506|   0.000|   0.000| 17|         
                       10.0.2.3|   53|                               
10.0.2.15|56303|       A|       0|       0|       0|00000000|00000000|000|000|  
     1|      84|       0|       0|    0|idle
-2016-01-28 15:29:48.508|2016-01-28 15:29:48.508|   0.000|   0.000|  6|         
                      10.0.2.15|39468|                          216.21.170.221| 
  80|       S|       0|       0|       0|58c52fca|00000000|000|000|       1|    
  60|       0|       0|    0|idle
-2016-01-28 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|         
                      10.0.2.15|39468|                          216.21.170.221| 
  80|       A|       0|       0|       0|58c52fcb|00000000|000|000|       1|    
  40|       0|       0|    0|idle 
-2016-01-28 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|         
                      10.0.2.15|39468|                          216.21.170.221| 
  80|      AP|       0|       0|       0|58c52fcb|00000000|000|000|       1|    
 148|       0|       0|    0|idle 
-2016-01-28 15:29:48.512|2016-01-28 15:29:48.512|   0.000|   0.000|  6|         
                 216.21.170.221|   80|                               
10.0.2.15|39468|       A|       0|       0|       0|22efa002|00000000|000|000|  
     1|      40|       0|       0|    0|idle 
-2016-01-28 15:29:48.562|2016-01-28 15:29:48.562|   0.000|   0.000|  6|         
                 216.21.170.221|   80|                               
10.0.2.15|39468|      AP|       0|       0|       0|22efa002|00000000|000|000|  
     1|     604|       0|       0|    0|idle
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/metron/blob/5f7454e4/metron-platform/metron-management/README.md
----------------------------------------------------------------------
diff --git a/metron-platform/metron-management/README.md 
b/metron-platform/metron-management/README.md
index 07c6908..24794ab 100644
--- a/metron-platform/metron-management/README.md
+++ b/metron-platform/metron-management/README.md
@@ -133,7 +133,7 @@ The functions are split roughly into a few sections:
 * `CONFIG_GET`
   * Description: Retrieve a Metron configuration from zookeeper.
   * Input:
-    * type - One of ENRICHMENT, INDEXING, PARSER, GLOBAL, PROFILER
+    * type - One of ENRICHMENT, INDEXING, PARSER, PARSER_EXTENSION, GLOBAL, 
PROFILER
     * sensor - Sensor to retrieve (required for enrichment and parser, not 
used for profiler and global)
     * emptyIfNotPresent - If true, then return an empty, minimally viable 
config
   * Returns: The String representation of the config in zookeeper
@@ -359,7 +359,7 @@ Functions loaded, you may refer to functions now...
 [Stellar]>>> #Just to make sure it looks right, we can view the JSON
 [Stellar]>>> squid_parser_config
 {
-  "parserClassName": "org.apache.metron.parsers.GrokParser",
+  "parserClassName": "org.apache.metron.parsers.grok.GrokParser",
   "sensorTopic": "squid",
   "parserConfig": {
     "grokPath": "/patterns/squid",
@@ -389,7 +389,7 @@ Functions loaded, you may refer to functions now...
 ╠
═══════════════════════════╪═══════════════════════════════════════════╪═════════════════════════════════════╣
 ║ squid_parser_config       │ {                                         
│ CONFIG_GET('PARSER', 'squid')       ║
 ║                           │   "parserClassName":                      
│                                     ║
-║                           │ "org.apache.metron.parsers.GrokParser",   
│                                     ║
+║                           │ "org.apache.metron.parsers.grok.GrokParser", 
  │                                     ║
 ║                           │                                           
│                                     ║
 ║                           │ "sensorTopic": "squid",                   
│                                     ║
 ║                           │                                           
│                                     ║
@@ -498,7 +498,7 @@ Returns: The String representation of the config in 
zookeeper
 [Stellar]>>> #It should be just as we started the exercise
 [Stellar]>>> CONFIG_GET('PARSER', 'squid')
 {
-  "parserClassName" : "org.apache.metron.parsers.GrokParser",
+  "parserClassName" : "org.apache.metron.parsers.grok.GrokParser",
   "sensorTopic" : "squid",
   "parserConfig" : {
     "grokPath" : "/patterns/squid",

Reply via email to