From 5994731d68593ad07db79850a521480340e5178b Mon Sep 17 00:00:00 2001 From: "Ben.Aldrich" Date: Fri, 2 May 2014 11:27:11 -0600 Subject: [PATCH 1/3] add missing ipv6 info from fields --- resources/NetMonFieldNames.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/NetMonFieldNames.csv b/resources/NetMonFieldNames.csv index 9ff790562d925..cc9b1f41e612d 100644 --- a/resources/NetMonFieldNames.csv +++ b/resources/NetMonFieldNames.csv @@ -10,6 +10,7 @@ _n/a, _n/a,   optional uint64 BytesDest = 16;,,DestBytes,Destination Bytes,csv,,Impacted Host KB Received,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 BytesDestDelta = 21;,,DestBytesDelta,Destination Bytes Delta,n/a,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 IPDest = 5;,,DestIP,Destination IP,csv,,Impacted IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +_n/a,   optional string IPDest6 = 5;,,DestIP6,Destination IP6,csv,,Impacted IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 MACDest = 3;,,DestMAC,Destination MAC,csv,,Impacted MAC Address,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 PortDest = 9;,,DestPort,Destination Port,csv,,Impacted Port,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 Duration = 31;,,Duration,Duration,n/a,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -27,6 +28,7 @@ _n/a, optional string SessionID = 1;,,Session,Session,csv,,Session,,C _n/a,   optional uint64 BytesSource = 17;,,SrcBytes,Source Bytes,csv,,Impacted Host KB Sent,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 BytesSourceDelta = 22;,,SrcBytesDelta,Source Bytes Delta,n/a,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 IPSource = 4;,,SrcIP,Source IP,csv,,Origin IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +_n/a,   optional string IPSource6 = 42;,,SrcIP6,Source IP6,csv,,Origin IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 MACSource = 2;,,SrcMAC,Source MAC,csv,,Origin MAC Address,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 PortSource = 8;,,SrcPort,Source Port,csv,,Origin Port,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 ThreadID = 33;,,ThreadID,Thread ID,n/a,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, From 82a4ff608b28537089ad430c5380f21510ec6289 Mon Sep 17 00:00:00 2001 From: "Ben.Aldrich" Date: Fri, 2 May 2014 11:29:42 -0600 Subject: [PATCH 2/3] fix number --- resources/NetMonFieldNames.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/NetMonFieldNames.csv b/resources/NetMonFieldNames.csv index cc9b1f41e612d..0d1a9fa28cd38 100644 --- a/resources/NetMonFieldNames.csv +++ b/resources/NetMonFieldNames.csv @@ -10,7 +10,7 @@ _n/a, _n/a,   optional uint64 BytesDest = 16;,,DestBytes,Destination Bytes,csv,,Impacted Host KB Received,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 BytesDestDelta = 21;,,DestBytesDelta,Destination Bytes Delta,n/a,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 IPDest = 5;,,DestIP,Destination IP,csv,,Impacted IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -_n/a,   optional string IPDest6 = 5;,,DestIP6,Destination IP6,csv,,Impacted IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +_n/a,   optional string IPDest6 = 43;,,DestIP6,Destination IP6,csv,,Impacted IP,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 MACDest = 3;,,DestMAC,Destination MAC,csv,,Impacted MAC Address,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint32 PortDest = 9;,,DestPort,Destination Port,csv,,Impacted Port,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, _n/a,   optional uint64 Duration = 31;,,Duration,Duration,n/a,,,,Complete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, From 990987adb4e5346af7b21e2ab5ba3834d8d4d49c Mon Sep 17 00:00:00 2001 From: "Ben.Aldrich" Date: Mon, 5 May 2014 11:31:00 -0600 Subject: [PATCH 3/3] remove captureKey from json --- scripts/buildESTemplate.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/buildESTemplate.pl b/scripts/buildESTemplate.pl index 58a3c093b6985..4c0d23819daf0 100644 --- a/scripts/buildESTemplate.pl +++ b/scripts/buildESTemplate.pl @@ -53,6 +53,7 @@ sub ReadProtoFile { print "\"Captured\" : { \"type\": \"string\", \"null_value\": \"false\"},\n"; print "\"Session\" : {\"type\": \"string\", \"index\" : \"not_analyzed\"},\n"; print "\"SrcMAC\" : {\"type\" : \"string\", \"index\" : \"not_analyzed\", \"ignore_malformed\" : true},\n"; +print "\"CaptureKey\" : {\"type\" : \"string\", \"index\" : \"no\", \"store\" : false, \"ignore_malformed\" : true},\n"; for $app ( keys %typeHash ) {