Merge pull request elastic#470 from Shweta-Bhandare/removeUnusedUnRel…

…evantAttributes Remove unused un relevant attributes
harper-carroll · Feb 26, 2016 · bd7a027 · bd7a027
2 parents 88aa691 + e5c5e4c
commit bd7a027
Show file tree

Hide file tree

Showing 6 changed files with 1,971 additions and 1,865 deletions.
diff --git a/protofiles/DpiMsgLRproto.proto b/protofiles/DpiMsgLRproto.proto
diff --git a/resources/DpiMsgLRproto.protoheader b/resources/DpiMsgLRproto.protoheader
@@ -84,6 +84,7 @@ message DpiMsgLRproto
    repeated CustomField customFields = 50;
    optional uint64 RepeatedFieldCount = 51; 
    optional bool FlowClassified = 52;
+   optional uint32 VlanID = 53;
    // REMEMBER TO UPDATE resources/DpiMsgLRproto.protoheader as well
    // REMEMBER TO UPDATE resources/StaticFields.csv as well
 
diff --git a/resources/LuaProtoFieldsDesc.csv b/resources/LuaProtoFieldsDesc.csv
diff --git a/resources/NetMonFieldNames.csv b/resources/NetMonFieldNames.csv
@@ -851,7 +851,7 @@ HTTP,header_nameQ_PROTO_HTTP,header_name,HeaderName,Header Name,,,,,Complete,
 HTTP,header_rawQ_PROTO_HTTP,header_raw,HeaderRaw,Header Raw,,,,,Complete,
 HTTP,header_statuslineQ_PROTO_HTTP,header_statusline,HeaderStatusline,Header Statusline,,,,,Complete,
 HTTP,header_valueQ_PROTO_HTTP,header_value,HeaderValue,Header Value,,,,,Complete,
-HTTP,hostQ_PROTO_HTTP,host,Host,Host,dname,<group>,Group,,Complete,
+HTTP,hostQ_PROTO_HTTP,host,Host,Host,,,,,Complete,
 HTTP,host_start_offsetQ_PROTO_HTTP,host_start_offset,HostStartOffset,Host Start Offset,,,,,Complete,
 HTTP,image_heightQ_PROTO_HTTP,image_height,ImageHeight,Image Height,,,,,Complete,
 HTTP,image_typeQ_PROTO_HTTP,image_type,ImageType,Image Type,,,,,Complete,
@@ -884,7 +884,7 @@ HTTP,request_sizeQ_PROTO_HTTP,request_size,RequestSize,Request Size,,,,,Complete
 HTTP,request_tsQ_PROTO_HTTP,request_ts,RequestTS,Request TS,,,,,Complete,
 HTTP,response_tsQ_PROTO_HTTP,response_ts,ResponseTS,Response TS,,,,,Complete,
 HTTP,rttQ_PROTO_HTTP,rtt,RTT,RTT,,,,,Complete,
-HTTP,serverQ_PROTO_HTTP,server,Server,Server,,,,,Complete,
+HTTP,serverQ_PROTO_HTTP,server,Server,Server,dname,<group>,Group,,Complete,
 HTTP,server_agentQ_PROTO_HTTP,server_agent,ServerAgent,Server Agent,,,,,Complete,
 HTTP,set_cookieQ_PROTO_HTTP,set_cookie,SetCookie,Set Cookie,,,,,Complete,
 HTTP,smb_clientQ_PROTO_HTTP,smb_client,SMBClient,SMB Client,,,,,Complete,