Merge pull request elastic#404 from Logrhythm/2.7.1

Merge 2.7.1 to master
harper-carroll · Aug 31, 2015 · d236e55 · d236e55
2 parents 7dc9415 + bbdab61
commit d236e55
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 7 deletions.
diff --git a/protofiles/BaseConfMsg.proto b/protofiles/BaseConfMsg.proto
@@ -31,8 +31,8 @@ message BaseConf {
   optional string statsAggregationQueue = 32;
   optional string commandQueue = 33;
   optional string enableIntermediateFlows = 34;
-  optional string enablePacketCapture = 35;
-//  optional string captureLocation = 36;
+  //optional string enablePacketCapture = 35;
+  //optional string captureLocation = 36;
   //optional string captureFileLimit = 37;
   optional string captureSizeLimit = 38;
   optional string captureMemoryLimit = 39;

diff --git a/protofiles/CommandRequest.proto b/protofiles/CommandRequest.proto
@@ -24,11 +24,10 @@ message CommandRequest {
      LUA_SAVE = 13;
      GET_LUA_USER_RULES = 14;
      LUA_DELETE = 15;
+     RESTART_SERVICES = 16;
   }
-  required CommandType type = 1; 
+  required CommandType type = 1;
   optional string stringArgOne = 2;
   optional string stringArgTwo = 3;
   optional bool async = 4;
 }
-
-
diff --git a/protofiles/DpiMsgLRproto.proto b/protofiles/DpiMsgLRproto.proto
@@ -82,6 +82,7 @@ message DpiMsgLRproto
    optional uint32 FieldCountIndexed = 48;
    repeated EmailAttach emailAttachments = 49;
    repeated CustomField customFields = 50;
+   optional uint64 RepeatedFieldCount = 51; 
    // REMEMBER TO UPDATE resources/DpiMsgLRproto.protoheader as well
    // REMEMBER TO UPDATE resources/StaticFields.csv as well
 
@@ -3410,7 +3411,7 @@ optional uint32 seg_buffered_sizeQ_PROTO_TCP = 3594; // QOSMOS:Q_PROTO_TCP,Q_TCP
 //repeated bytes contentQ_PROTO_ZIMBRA_STANDARD = 3705; // QOSMOS:Q_PROTO_ZIMBRA_STANDARD,Q_MPA_CONTENT
 //optional bool emailQ_PROTO_ZIMBRA_STANDARD = 3706; // QOSMOS:Q_PROTO_ZIMBRA_STANDARD,Q_MPA_EMAIL
 //optional bool contact_entryQ_PROTO_ZIMBRA_STANDARD = 3707; // QOSMOS:Q_PROTO_ZIMBRA_STANDARD,Q_MPA_CONTACT_ENTRY
-optional Void endQ_PROTO_0ZZ0 = 3708; // QOSMOS:Q_PROTO_0ZZ0,Q_MPA_END
+//optional Void endQ_PROTO_0ZZ0 = 3708; // QOSMOS:Q_PROTO_0ZZ0,Q_MPA_END
 //optional Void endQ_PROTO_ADC = 3709; // QOSMOS:Q_PROTO_ADC,Q_MPA_END
 //optional Void endQ_PROTO_ADOBE_UPDATE = 3710; // QOSMOS:Q_PROTO_ADOBE_UPDATE,Q_MPA_END
 //optional Void endQ_PROTO_AIM = 3711; // QOSMOS:Q_PROTO_AIM,Q_MPA_END

diff --git a/protofiles/LogMessage.proto b/protofiles/LogMessage.proto
@@ -15,6 +15,7 @@ message LogMessage {
      SYSTEM = 4;
      EVENT = 5;
      DEEP_SCRIPT_ALARM = 10;
+     HEARTBEAT = 100;
   }
   enum SourceType {
      DPIMSG = 0;

diff --git a/protofiles/SyslogConfMsg.proto b/protofiles/SyslogConfMsg.proto
@@ -15,5 +15,6 @@ message SyslogConf {
   optional string siemLogging = 6;
 //  optional string debugSiemLogging = 7;
   optional string scrubPasswords = 8;
+  optional string heartbeatReportTimeSeconds = 9;
 //  optional string reportEverything = 99;
 }
diff --git a/resources/DpiMsgLRproto.protoheader b/resources/DpiMsgLRproto.protoheader
@@ -82,6 +82,7 @@ message DpiMsgLRproto
    optional uint32 FieldCountIndexed = 48;
    repeated EmailAttach emailAttachments = 49;
    repeated CustomField customFields = 50;
+   optional uint64 RepeatedFieldCount = 51; 
    // 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
@@ -49,6 +49,7 @@ Internal, Internal, maxrepeatedfieldcount, MaxRepeatedFieldCount, uint32, "Maxim
 Internal, Internal, fieldcountindexed, FieldCountIndexed, uint32, "Field count indexed by ElasticSearch."
 Internal, Internal, emailAttachments, EmailAttachments, EmailAttach, "Email attachment structure."
 Internal, Internal, customfields, CustomFields, CustomField, "Custom Fields."
+Internal, Internal, repeatedfieldcount, RepeatedFieldCount, uint64, "Total repeated fields in DPI message."
 0zz0, 0zz0.com, login, loginq_proto_0zz0, bytes, "User's login string."
 0zz0, 0zz0.com, password, passwordq_proto_0zz0, bytes, "User's password string."
 0zz0, 0zz0.com, action, actionq_proto_0zz0, bytes, "Indicates the action executed by the user."

diff --git a/resources/ProtocolFilters b/resources/ProtocolFilters
@@ -782,7 +782,7 @@
 ![,:]Q_PROTO_ZIMBRA_STANDARD.*,Q_MPA_RECEIVER_ENTRY[,\n]|
 ![,:]Q_PROTO_ZIMBRA_STANDARD.*,Q_MPA_ATTACH[,\n]|
 ![,:]Q_PROTO_ZIMBRA_STANDARD.*,Q_MPA_EMAIL[,\n]|
-![,:]Q_PROTO_ZIMBRA_STANDARD.*,Q_MPA_CONTACT_ENTRY[,\n]
+![,:]Q_PROTO_ZIMBRA_STANDARD.*,Q_MPA_CONTACT_ENTRY[,\n]|
 ![,:]Q_PROTO_0ZZ0.*,Q_MPA_END[,\n]|
 ![,:]Q_PROTO_ADC.*,Q_MPA_END[,\n]|
 ![,:]Q_PROTO_ADOBE_UPDATE.*,Q_MPA_END[,\n]|

diff --git a/resources/StaticFields.csv b/resources/StaticFields.csv
@@ -48,3 +48,4 @@ Internal, Internal, maxrepeatedfieldcount, MaxRepeatedFieldCount, uint32, "Maxim
 Internal, Internal, fieldcountindexed, FieldCountIndexed, uint32, "Field count indexed by ElasticSearch."
 Internal, Internal, emailAttachments, EmailAttachments, EmailAttach, "Email attachment structure."
 Internal, Internal, customfields, CustomFields, CustomField, "Custom Fields."
+Internal, Internal, repeatedfieldcount, RepeatedFieldCount, uint64, "Total repeated fields in DPI message."