Skip to content

Commit

Permalink
Merge pull request elastic#322 from john-gress/parent_blacklist
Browse files Browse the repository at this point in the history 
Add parent metadata for OWA, POP3, IMAP, and SMTP. Blacklist all other parent attributes.
  • Loading branch information
John Gress committed Apr 16, 2015
2 parents 87e5ad1 + 9933445 commit 251c70b
Show file tree
Hide file tree
Showing 6 changed files with 1,329 additions and 140 deletions.
557 changes: 555 additions & 2 deletions protofiles/DpiMsgLRproto.proto
View file

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions resources/NetMonFieldNames.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,14 @@ IMAP,subjectQ_PROTO_IMAP,subject,Subject,Subject,subject,<subject>,Subject,,1st
IMAP,user_agentQ_PROTO_IMAP,user_agent,UserAgent,User Agent,object,<object>,Object,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,xmailerQ_PROTO_IMAP,xmailer,Xmailer,Xmailer,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,file_typeQ_PROTO_IMAP,file_type,FileType,FileType,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,requestQ_PROTO_IMAP,request,Request,Request,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,msglist_entryQ_PROTO_IMAP,msglist_entry,MsglistEntry,Msglist Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,attachQ_PROTO_IMAP,attach,Attach,Attach,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,sender_entryQ_PROTO_IMAP,sender_entry,SenderEntry,Sender Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,receiver_entryQ_PROTO_IMAP,receiver_entry,ReceiverEntry,Receiver Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,msglist_sender_entryQ_PROTO_IMAP,msglist_sender_entry,MsglistSenderEntry,Msglist Sender Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,msglist_receiver_entryQ_PROTO_IMAP,msglist_receiver_entry,MsglistReceiverEntry,Msglist Receiver Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMAP,receivedQ_PROTO_IMAP,received,Received,Received,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMP,actionQ_PROTO_IMP,action,Action,Action,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMP,attach_idQ_PROTO_IMP,attach_id,AttachID,Attach ID,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
IMP,attach_sizeQ_PROTO_IMP,attach_size,AttachSize,Attach Size,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Expand Down Expand Up @@ -1675,6 +1683,13 @@ OWA,sender_aliasQ_PROTO_OWA,sender_alias,SenderAlias,Sender Alias,,,,,1st Review
OWA,sender_emailQ_PROTO_OWA,sender_email,SenderEmail,Sender Email,sender,<sender>,Sender,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,session_idQ_PROTO_OWA,session_id,SessionID,Session ID,object,<object>,Object,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,subjectQ_PROTO_OWA,subject,Subject,Subject,subject,<subject>,Subject,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,msglist_receiver_entryQ_PROTO_OWA,msglist_receiver_entry,MsglistReceiverEntry,Msglist Receiver Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,contact_entryQ_PROTO_OWA,contact_entry,ContactEntry,Contact Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,receiver_entryQ_PROTO_OWA,receiver_entry,ReceiverEntry,Receiver Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,sender_entryQ_PROTO_OWA,sender_entry,SenderEntry,Sender Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,msglist_sender_entryQ_PROTO_OWA,msglist_sender_entry,MsglistSenderEntry,Msglist Sender Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,msglist_entryQ_PROTO_OWA,msglist_entry,MsglistEntry,Msglist Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
OWA,attachQ_PROTO_OWA,attach,Attach,Attach,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
PALTALK,call_durationQ_PROTO_PALTALK,call_duration,CallDuration,Call Duration,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
PALTALK,calleeQ_PROTO_PALTALK,callee,Callee,Callee,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
PALTALK,callee_addrQ_PROTO_PALTALK,callee_addr,CalleeAddr,Callee Address,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Expand Down Expand Up @@ -1749,6 +1764,11 @@ POP3,server_responseQ_PROTO_POP3,server_response,ServerResp,Server Response,,,,,
POP3,subjectQ_PROTO_POP3,subject,Subject,Subject,subject,<subject>,Subject,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,user_agentQ_PROTO_POP3,user_agent,UserAgent,User Agent,object,<object>,Object,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,xmailerQ_PROTO_POP3,xmailer,Xmailer,Xmailer,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,sender_entryQ_PROTO_POP3,sender_entry,SenderEntry,Sender Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,receiver_entryQ_PROTO_POP3,receiver_entry,ReceiverEntry,Receiver Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,requestQ_PROTO_POP3,request,Request,Request,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,attachQ_PROTO_POP3,attach,Attach,Attach,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POP3,receivedQ_PROTO_POP3,received,Received,Received,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POSTGRES,authentification_typeQ_PROTO_POSTGRES,authentification_type,AuthType,Authentication Type,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POSTGRES,baseQ_PROTO_POSTGRES,base,Base,Base,object,<object>,Object,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
POSTGRES,errorQ_PROTO_POSTGRES,error,Err,Error,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Expand Down Expand Up @@ -2200,6 +2220,13 @@ SMTP,stop_timeQ_PROTO_SMTP,stop_time,StopTime,Stop Time,,,,,1st Review,,,,,,,,,,
SMTP,subjectQ_PROTO_SMTP,subject,Subject,Subject,subject,<subject>,Subject,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,user_agentQ_PROTO_SMTP,user_agent,UserAgent,User Agent,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,xmailerQ_PROTO_SMTP,xmailer,Xmailer,Xmailer,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,sender_entryQ_PROTO_SMTP,sender_entry,SenderEntry,Sender Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,mailfromQ_PROTO_SMTP,mailfrom,Mailfrom,Mailfrom,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,rcpttoQ_PROTO_SMTP,rcptto,Rcptto,Rcptto,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,receiver_entryQ_PROTO_SMTP,receiver_entry,ReceiverEntry,Receiver Entry,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,requestQ_PROTO_SMTP,request,Request,Request,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,attachQ_PROTO_SMTP,attach,Attach,Attach,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SMTP,receivedQ_PROTO_SMTP,received,Received,Received,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SNMP,communityQ_PROTO_SNMP,community,Community,Community,,,,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SNMP,methodQ_PROTO_SNMP,method,Method,Method,command,<command>,Command,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
SNMP,nameQ_PROTO_SNMP,name,Name,Name,subject,<subject>,Subject,,1st Review,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Expand Down
Loading

0 comments on commit 251c70b

Please sign in to comment.