Merge pull request elastic#281 from john-gress/merge_master_2.6.0_ixE…

…ngine Merge master 2.6.0 ix engine
harper-carroll · Mar 6, 2015 · c16d2e3 · c16d2e3
2 parents 6ae9d1f + 83bc3fe
commit c16d2e3
Show file tree

Hide file tree

Showing 58 changed files with 200 additions and 119 deletions.
diff --git a/protofiles/BaseConfMsg.proto b/protofiles/BaseConfMsg.proto
@@ -3,7 +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;

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

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

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

diff --git a/protofiles/CommandReply.proto b/protofiles/CommandReply.proto
@@ -3,7 +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; 

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

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

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

diff --git a/protofiles/ConfigDefaultsRequest.proto b/protofiles/ConfigDefaultsRequest.proto
@@ -8,7 +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; 

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

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

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

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

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

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

diff --git a/protofiles/DriveInfo.proto b/protofiles/DriveInfo.proto
@@ -3,7 +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,7 +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,7 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "ESDataMsg";
 
-import "GoProtoDefaults.proto";
+
+
 
 message ESData {
    enum RequestType {

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

diff --git a/protofiles/ElasticSearchClientConfig.proto b/protofiles/ElasticSearchClientConfig.proto
@@ -3,7 +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,7 +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;

diff --git a/protofiles/ForkerRequest.proto b/protofiles/ForkerRequest.proto
@@ -3,7 +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;

diff --git a/protofiles/GoProtoDefaults.proto b/protofiles/GoProtoDefaults.proto
diff --git a/protofiles/HermesConfig.proto b/protofiles/HermesConfig.proto
@@ -3,7 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "HermesConfigMsg";
 
-import "GoProtoDefaults.proto";
+
+
 
 message HermesConfig {
    repeated string pollStatsQueue = 1;

diff --git a/protofiles/HermesReply.proto b/protofiles/HermesReply.proto
@@ -3,7 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "HermesReplyMsg";
 
-import "GoProtoDefaults.proto";
+
+
 
 message HermesReply {
    message ValueTuple {
@@ -17,7 +18,6 @@ message HermesReply {
       optional ValueTuple tupleValue = 3;
    }
 
-   optional int32 beginTimeSeconds = 1;
-   optional int32 endTimeSeconds = 2;
-   repeated Stat stat = 3;
+   optional string uuid = 1;
+   repeated Stat stat = 2;
 }
diff --git a/protofiles/HermesRequest.proto b/protofiles/HermesRequest.proto
@@ -3,9 +3,12 @@ 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;
+  optional string uuid = 1;
+  optional string indexName = 2;
+  optional int64 beginTimeMilliSeconds = 3;
+  optional int64 endTimeMilliSeconds = 4;
 }
diff --git a/protofiles/IndexManagerConfig.proto b/protofiles/IndexManagerConfig.proto
@@ -3,7 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "IndexManagerConfigMsg";
 
-import "GoProtoDefaults.proto";
+
+
 
 message IndexManagerConfig {
 

diff --git a/protofiles/InfluxConfig.proto b/protofiles/InfluxConfig.proto
@@ -3,11 +3,15 @@ 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;
-   optional string username = 3;
-   optional string password = 4;
+   optional int32 port = 2;
+   optional string database = 3;
+   optional string adminUsername = 4;
+   optional string adminPassword = 5;
+   optional string dbUsername = 6;
+   optional string dbPassword = 7;
 }
diff --git a/protofiles/InstallInfo.proto b/protofiles/InstallInfo.proto
@@ -3,7 +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;

diff --git a/protofiles/License.proto b/protofiles/License.proto
@@ -3,7 +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; 

diff --git a/protofiles/LicenseReply.proto b/protofiles/LicenseReply.proto
@@ -3,7 +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,7 +3,8 @@ package protoMsg;
 option java_package = "com.logrhythm.nm.message";
 option java_outer_classname = "LicenseRequestMsg";
 
-import "GoProtoDefaults.proto";
+
+
 
 message LicenseRequest {
   enum RequestType {

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

diff --git a/protofiles/LicenseUpdateReply.proto b/protofiles/LicenseUpdateReply.proto
@@ -3,7 +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;

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

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