Merge remote-tracking branch 'main/master' into 2.6.0_ixEngine

harper-carroll · Mar 5, 2015 · f504423 · f504423
2 parents 1cb7c5b + 72657c6
commit f504423
Show file tree

Hide file tree

Showing 58 changed files with 205 additions and 38 deletions.
diff --git a/protofiles/BaseConfMsg.proto b/protofiles/BaseConfMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "BaseConfMsg";
 
+import "GoProtoDefaults.proto";
+
 message BaseConf {
   optional string dpiThreads = 7;
   optional string pcapETimeout = 8;

diff --git a/protofiles/CarpenterConfig.proto b/protofiles/CarpenterConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "CarpenterConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message CarpenterConfig {
    optional int32 minutesToRest = 1;
    optional string remoteDB = 2;

diff --git a/protofiles/CassandraConfig.proto b/protofiles/CassandraConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "CassandraConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message CassandraConfig {
    optional string statsDBClusterName = 1;
    optional string statsDBUrl = 2;

diff --git a/protofiles/ColumboConfig.proto b/protofiles/ColumboConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ColumboConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message ColumboConfig {
    optional string requestQueue = 1;
    optional int32 resendTranslationTableIntervalInMS = 2;

diff --git a/protofiles/CommandReply.proto b/protofiles/CommandReply.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "CommandReplyMsg";
 
+import "GoProtoDefaults.proto";
+
 message CommandReply {
   required bool success = 1; 
   optional string result = 2; 

diff --git a/protofiles/CommandRequest.proto b/protofiles/CommandRequest.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "CommandRequestMsg";
 
+import "GoProtoDefaults.proto";
+
 message CommandRequest {
   enum CommandType {
      UPGRADE = 0;

diff --git a/protofiles/ConfTypeMsg.proto b/protofiles/ConfTypeMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ConfTypeMsg";
 
+import "GoProtoDefaults.proto";
+
 message ConfType {
   enum Type {
      BASE = 0;

diff --git a/protofiles/ConfigDefaults.proto b/protofiles/ConfigDefaults.proto
@@ -4,6 +4,8 @@ import "ConfTypeMsg.proto";
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ConfigDefaultsMsg";
 
+import "GoProtoDefaults.proto";
+
 message ConfigDefaults {
    message DefaultValues {
       optional ConfType.Type type = 1; 

diff --git a/protofiles/ConfigDefaultsRequest.proto b/protofiles/ConfigDefaultsRequest.proto
@@ -8,6 +8,8 @@ option java_outer_classname = "ConfigDefaultsRequestMsg";
 // For the ConfType request config parameters
 // The CommandReply will contain the ConfigDefaults.proto with
 // parameter name, default value, max, min
+import "GoProtoDefaults.proto";
+
 message ConfigDefaultsRequest {
    optional ConfType.Type type = 1; 
    repeated string requestedConfigParams = 2;

diff --git a/protofiles/ConfigReplyMsg.proto b/protofiles/ConfigReplyMsg.proto
@@ -4,6 +4,8 @@ option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigReplyMsg";
 import "ConfigType.proto";
 
+import "GoProtoDefaults.proto";
+
 message ConfigReply {
    enum ReplyType {
       SUCCESS = 0;

diff --git a/protofiles/ConfigRequestMsg.proto b/protofiles/ConfigRequestMsg.proto
@@ -4,6 +4,8 @@ option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigRequestMsg";
 import "ConfigType.proto";
 
+import "GoProtoDefaults.proto";
+
 message ConfigRequest {
    enum RequestType {
       READ = 0;

diff --git a/protofiles/ConfigServerConfigMsg.proto b/protofiles/ConfigServerConfigMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigServerConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message ConfigServerConfig {
    repeated string configRequestQueue = 1;
    optional string frontEndRelayQueue = 2;

diff --git a/protofiles/DispatchClientConfig.proto b/protofiles/DispatchClientConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "DispatchClientConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message DispatchClientConfig {
 
    optional string dataInsertQueue = 1;

diff --git a/protofiles/DispatchConfig.proto b/protofiles/DispatchConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "DispatchConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message DispatchConfig {
 
    message IndexerConfig {

diff --git a/protofiles/DpiMsgLRproto.proto b/protofiles/DpiMsgLRproto.proto
@@ -3,6 +3,8 @@ package networkMonitor;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "DPIMessageProtosProtos";
 
+import "GoProtoDefaults.proto";
+
 message DpiMsgLRproto 
 {
    enum Type {

diff --git a/protofiles/DriveInfo.proto b/protofiles/DriveInfo.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "DriveInfoMsg";
 
+import "GoProtoDefaults.proto";
+
 message DrivesInfo {
    message DriveInfo {
 

diff --git a/protofiles/ESDataCollectionMsg.proto b/protofiles/ESDataCollectionMsg.proto
@@ -4,6 +4,8 @@ option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ESDataCollectionMsg";
 import "ESDataMsg.proto";
 
+import "GoProtoDefaults.proto";
+
 message ESDataCollection {
    repeated ESData message = 1;
 }
diff --git a/protofiles/ESDataMsg.proto b/protofiles/ESDataMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ESDataMsg";
 
+import "GoProtoDefaults.proto";
+
 message ESData {
    enum RequestType {
       INSERT = 1;

diff --git a/protofiles/ESSearchResult.proto b/protofiles/ESSearchResult.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ESSearchResultMsg";
 
+import "GoProtoDefaults.proto";
+
 message ESSearchResult {
 
    enum ResultType {

diff --git a/protofiles/ElasticSearchClientConfig.proto b/protofiles/ElasticSearchClientConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ElasticSearchClientConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message ElasticSearchClientConfig {
    optional string elasticsearchClusterName = 1;
 }
diff --git a/protofiles/ForkerReply.proto b/protofiles/ForkerReply.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ForkerReplyMsg";
 
+import "GoProtoDefaults.proto";
+
 message ForkerReply {
    optional string output = 1;
    optional uint32 pid = 2;

diff --git a/protofiles/ForkerRequest.proto b/protofiles/ForkerRequest.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ForkerRequestMsg";
 
+import "GoProtoDefaults.proto";
+
 message ForkerRequest {
    optional string command = 1;
    repeated string args = 2;

diff --git a/protofiles/GoProtoDefaults.proto b/protofiles/GoProtoDefaults.proto
@@ -0,0 +1,18 @@
+package protoMsg;
+option java_package = "com.logrhythm.nm.message";
+option java_outer_classname = "GoProtoDefaults";
+
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+
+//go options that improve code generation
+option (gogoproto.gostring_all) = true;
+option (gogoproto.equal_all) = true;
+option (gogoproto.verbose_equal_all) = true;
+option (gogoproto.goproto_stringer_all) = false;
+option (gogoproto.stringer_all) =  true;
+option (gogoproto.populate_all) = true;
+option (gogoproto.testgen_all) = true;
+option (gogoproto.benchgen_all) = true;
+option (gogoproto.marshaler_all) = true;
+option (gogoproto.sizer_all) = true;
+option (gogoproto.unmarshaler_all) = true;
diff --git a/protofiles/HermesConfig.proto b/protofiles/HermesConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "HermesConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message HermesConfig {
    repeated string pollStatsQueue = 1;
    optional string pollStatsWorkerQueue = 2;

diff --git a/protofiles/HermesReply.proto b/protofiles/HermesReply.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "HermesReplyMsg";
 
+import "GoProtoDefaults.proto";
+
 message HermesReply {
    message ValueTuple {
       optional string key = 1;

diff --git a/protofiles/HermesRequest.proto b/protofiles/HermesRequest.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "HermesRequestMsg";
 
+import "GoProtoDefaults.proto";
+
 message HermesRequest {
   optional int32 beginTimeSeconds = 1;
   optional int32 endTimeSeconds = 2;

diff --git a/protofiles/IndexManagerConfig.proto b/protofiles/IndexManagerConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "IndexManagerConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message IndexManagerConfig {
 
    message IndexConfig {

diff --git a/protofiles/InfluxConfig.proto b/protofiles/InfluxConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "InfluxConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message InfluxConfig {
    optional string hostname = 1;
    optional string database = 2;

diff --git a/protofiles/InstallInfo.proto b/protofiles/InstallInfo.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "InstallInfoMsg";
 
+import "GoProtoDefaults.proto";
+
 message InstallInfo {
   optional uint64 installTime = 1;
   optional uint64 lastCheckedTime = 2;

diff --git a/protofiles/License.proto b/protofiles/License.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LicenseMsg";
 
+import "GoProtoDefaults.proto";
+
 message RawLicense {
   optional int32 bandwidthInMbps = 1; 
   optional int64 pcapFileSize = 2;

diff --git a/protofiles/LicenseReply.proto b/protofiles/LicenseReply.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LicenseReplyMsg";
 
+import "GoProtoDefaults.proto";
+
 message LicenseReply {
   repeated bytes encodedLicenses = 1;
 }

diff --git a/protofiles/LicenseRequest.proto b/protofiles/LicenseRequest.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LicenseRequestMsg";
 
+import "GoProtoDefaults.proto";
+
 message LicenseRequest {
   enum RequestType {
      AGGREGATE = 0;

diff --git a/protofiles/LicenseUpdate.proto b/protofiles/LicenseUpdate.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LicenseUpdateMsg";
 
+import "GoProtoDefaults.proto";
+
 message LicenseUpdate {
   enum LicenseType {
     UNLICENSED = 1;

diff --git a/protofiles/LicenseUpdateReply.proto b/protofiles/LicenseUpdateReply.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LicenseUpdateReplyMsg";
 
+import "GoProtoDefaults.proto";
+
 message LicenseUpdateReply {
   optional bool success = 1;
   optional string message = 2;

diff --git a/protofiles/LinkConfig.proto b/protofiles/LinkConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "LinkConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message LinkConfig {
    optional int64 webHeartbeatIntervalMs = 1;
    optional string searchInputQueue = 2;

diff --git a/protofiles/LogMessage.proto b/protofiles/LogMessage.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LogMessageMsg";
 
+import "GoProtoDefaults.proto";
+
 message LogMessage {
   enum LogType {
      NORMALIZED = 0;

diff --git a/protofiles/MaintenanceConfig.proto b/protofiles/MaintenanceConfig.proto
@@ -4,6 +4,8 @@ option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "MaintenanceConfigMsg";
 import "IndexManagerConfig.proto";
 
+import "GoProtoDefaults.proto";
+
 message MaintenanceConfig {
 
    optional bool runPcapStatReporter = 1;

diff --git a/protofiles/MetricsClientConfigMsg.proto b/protofiles/MetricsClientConfigMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "MetricsClientConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message MetricsClientConfig {
    optional string statsDestinationQueue = 1;
    optional string statsAggregatorDestinationQueue = 2;

diff --git a/protofiles/MetricsConfig.proto b/protofiles/MetricsConfig.proto
@@ -4,6 +4,8 @@ option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "MetricsConfigMsg";
 import "PortRange.proto";
 
+import "GoProtoDefaults.proto";
+
 message MetricsConfig {
    repeated string statsQueue = 1;
    repeated string statsAggregationQueue = 2;

diff --git a/protofiles/NetInterfaceMsg.proto b/protofiles/NetInterfaceMsg.proto
@@ -8,6 +8,8 @@ enum NetInterfaceMethod {
    STATICIP = 1; 
 }
 
+import "GoProtoDefaults.proto";
+
 message NetInterface {
    optional string interface = 1 [default = "eth0"];
    optional NetInterfaceMethod method = 2 [default = DHCP];

diff --git a/protofiles/NtpMsg.proto b/protofiles/NtpMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "NtpMsg";
 
+import "GoProtoDefaults.proto";
+
 message Ntp {
 
    // optional bool active = 1;  // Deprecated. Active is no longer used

diff --git a/protofiles/PcapDownloadMsg.proto b/protofiles/PcapDownloadMsg.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "PcapDownloadMsg";
 
+import "GoProtoDefaults.proto";
+
 message BulkPcapDownload {
 
 	message PcapDownload {

diff --git a/protofiles/PlaybackConfig.proto b/protofiles/PlaybackConfig.proto
@@ -3,6 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "PlaybackConfigMsg";
 
+import "GoProtoDefaults.proto";
+
 message PlaybackConfig {
 
    message DataReaderConfig {