Merge pull request elastic#326 from john-gress/merge_2.6.2

Merge 2.6.2 into 2.6.2.spikes

protofiles/Applications.proto

@@ -2510,4 +2510,24 @@ optional string vecer = 2508 [default = "Macedonian and Balkan news portal."];
 optional string elwatannews = 2509 [default = "Egyptian news portal."];
 optional string afreeca = 2510 [default = "This protocol plug-in classifies the http and TCP traffic to the host .afreeca.com. Note: In Basic-DPI Partial classification over http and TCP"];
 optional string eksisozluk = 2511 [default = "Turkish forum on various topics. Includes occasional video streaming."];
+optional string hirufm = 2512 [default = "Sri lankan radio website"];
+optional string gettyimages = 2513 [default = "Getty Images distributes still imagery video music and multimedia products as well as other forms of premium digital content"];
+optional string offnews = 2514 [default = "Bulgarian news portal"];
+optional string bomb01 = 2515 [default = "Website about hong kongese youth interest and lifestyle related content"];
+optional string alkawnnews = 2516 [default = "Jordanian news portal"];
+optional string lazada = 2517 [default = "Indonesian online shopping mall"];
+optional string laprensagrafica = 2518 [default = "El salvadorian news portal"];
+optional string myauto = 2519 [default = "Georgian classified ads website specialized in motor vehicles"];
+optional string gcs = 2520 [default = "Online file storage web service for applications by Google. This plug-in classifies unsecured Client-to-Google servers web communications only."];
+optional string yemennow = 2521 [default = "Yemeni news portal"];
+optional string inwi = 2522 [default = "Moroccan mobile operator website"];
+optional string biobiochile = 2523 [default = "Chilian news portal"];
+optional string anspress = 2524 [default = "Azerbadjani news portal"];
+optional string adaderana = 2525 [default = "Sri lankan news portal"];
+optional string _6alabat = 2526 [default = "Kuwaitian online restaurant ordering website"];
+optional string bjnp = 2527 [default = "BJNP refers to a printer protocol used by printers made by Canon."];
+optional string gcm = 2528 [default = "Data exchange service between 3rd party server applications and Android client applications. This plug-in only classifies the messages exchanged between the CCS 3rd party server and the GCM cloud servers and also the messages exchanged between the GCM cloud servers and the client Android device."];
+optional string point = 2529 [default = "Moldovian news portal"];
+optional string twoo = 2530 [default = "Twoo is a social networking website enabling users to connect to relatives friends or unknown people."];
+optional string punyumunyu = 2531 [default = "Japanese adult movie website. Note: In Basic-DPI Partial classification over http."];
 }

protofiles/BaseConfMsg.proto

@@ -45,10 +45,11 @@ message BaseConf {
   optional string pcapRecordsToClearPerCycle = 47;
   optional string flowReportInterval = 48;
   optional string esIndexerQueueSize = 49;
-  optional string syslogQueue = 50;
-  optional string diskpacketwriterQueueSize = 51;
-  optional string diskpacketwriterFeedbackQueueSize = 52;
-  optional string pCapFlushInterval = 53;
+  optional string maxRepeatedFieldCount = 50;
+  optional string syslogQueue = 51;
+  optional string diskpacketwriterQueueSize = 52;
+  optional string diskpacketwriterFeedbackQueueSize = 53;
+  optional string pCapFlushInterval = 54;
   optional string sizeOfPcapChunks = 55;
   optional string numberOfPcapChunks = 56;
   optional string pCapRemovalNotifyQueue = 57;

resources/Applications.csv

@@ -2503,3 +2503,23 @@ vecer,2508,"Macedonian and Balkan news portal."
 elwatannews,2509,"Egyptian news portal."
 afreeca,2510,"This protocol plug-in classifies the http and TCP traffic to the host .afreeca.com. Note: In Basic-DPI Partial classification over http and TCP"
 eksisozluk,2511,"Turkish forum on various topics. Includes occasional video streaming."
+hirufm,2512,"Sri lankan radio website"
+gettyimages,2513,"Getty Images distributes still imagery video music and multimedia products as well as other forms of premium digital content"
+offnews,2514,"Bulgarian news portal"
+bomb01,2515,"Website about hong kongese youth interest and lifestyle related content"
+alkawnnews,2516,"Jordanian news portal"
+lazada,2517,"Indonesian online shopping mall"
+laprensagrafica,2518,"El salvadorian news portal"
+myauto,2519,"Georgian classified ads website specialized in motor vehicles"
+gcs,2520,"Online file storage web service for applications by Google. This plug-in classifies unsecured Client-to-Google servers web communications only."
+yemennow,2521,"Yemeni news portal"
+inwi,2522,"Moroccan mobile operator website"
+biobiochile,2523,"Chilian news portal"
+anspress,2524,"Azerbadjani news portal"
+adaderana,2525,"Sri lankan news portal"
+_6alabat,2526,"Kuwaitian online restaurant ordering website"
+bjnp,2527,"BJNP refers to a printer protocol used by printers made by Canon."
+gcm,2528,"Data exchange service between 3rd party server applications and Android client applications. This plug-in only classifies the messages exchanged between the CCS 3rd party server and the GCM cloud servers and also the messages exchanged between the GCM cloud servers and the client Android device."
+point,2529,"Moldovian news portal"
+twoo,2530,"Twoo is a social networking website enabling users to connect to relatives friends or unknown people."
+punyumunyu,2531,"Japanese adult movie website. Note: In Basic-DPI Partial classification over http."

resources/DpiMsgLRproto.protoheader

@@ -65,5 +65,7 @@ message DpiMsgLRproto
    optional uint64 TimeEnd = 44;
    optional bool HeaderWritten = 45;
    optional bool ConnectionEstablished = 46;
+   optional uint32 MaxRepeatedFieldCount = 47;
+   optional uint32 FieldCountIndexed = 48;
    // REMEMBER TO UPDATE resources/DpiMsgLRproto.protoheader as well