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

harper-carroll · Mar 19, 2015 · ef86e6b · ef86e6b
2 parents 58d82c5 + 732daba
commit ef86e6b
Show file tree

Hide file tree

Showing 15 changed files with 490 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,7 @@ java
 php
 thirdParty/dist
 thirdParty/protobuf-2.4.1/
+thirdParty/protobuf-2.5.0/
+thirdParty/github.com
 source
+.idea/
diff --git a/protofiles/CarpenterConfig.proto b/protofiles/CarpenterConfig.proto
@@ -8,7 +8,6 @@ option java_outer_classname = "CarpenterConfigMsg";
 
 message CarpenterConfig {
    optional int32 minutesToRest = 1;
-   optional string remoteDB = 2;
    optional string listTable = 3;
    optional string listTableIDColumn = 4;
    optional string listTableItemColumn = 5;

diff --git a/protofiles/ColumboClientConfig.proto b/protofiles/ColumboClientConfig.proto
@@ -0,0 +1,11 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ColumboClientConfigMsg";
+
+
+
+
+message ColumboClientConfig {
+   optional string requestQueue = 1;
+}
diff --git a/protofiles/ConfigReplyMsg.proto b/protofiles/ConfigReplyMsg.proto
@@ -16,6 +16,5 @@ message ConfigReply {
    optional ReplyType replyType = 1;
    optional string errorMessage = 2;
    optional ConfigType configType = 3;
-   optional string overrideExtension = 4;
-   optional bytes serializedConfigMessage = 5;
+   optional bytes serializedConfigMessage = 4;
 }
diff --git a/protofiles/ConfigType.proto b/protofiles/ConfigType.proto
@@ -21,4 +21,7 @@ enum ConfigType {
    ColumboConfig = 11;
    CarpenterConfig = 12;
    InfluxConfig = 13;
+   EventManagerClientConfig = 14;
+   ColumboClientConfig = 15;
+   VitalsClientConfig = 16;
 }
diff --git a/protofiles/EventManagerClientConfig.proto b/protofiles/EventManagerClientConfig.proto
@@ -0,0 +1,11 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "EventManagerClientConfigMsg";
+
+
+
+
+message EventManagerClientConfig {
+   optional string eventManagerHost = 1;
+}
diff --git a/protofiles/LinkConfig.proto b/protofiles/LinkConfig.proto
@@ -8,8 +8,6 @@ option java_outer_classname = "LinkConfigMsg";
 
 message LinkConfig {
    optional int64 webHeartbeatIntervalMs = 1;
-   optional string searchInputQueue = 2;
-   optional string searchRequestForwardingQueue = 3;
-   optional string searchResultForwardingQueue = 4;
-   optional string taskUpdateQueue = 5;
+   optional int32 searchInputPort = 2;
+   optional int32 searchResultForwardingPort = 3;
 }
diff --git a/protofiles/VitalsClientConfig.proto b/protofiles/VitalsClientConfig.proto
@@ -0,0 +1,9 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "VitalsClientConfigMsg";
+
+message VitalsClientConfig {
+   optional string insertInputQueue = 1;
+   optional string accumulatorQueue = 2;
+}