Merge pull request elastic#301 from Tom-Artale/deployable-config-2

Deployable config 2
harper-carroll · Mar 19, 2015 · c7b3ef0 · c7b3ef0
2 parents 1eda98f + 2c6906d
commit c7b3ef0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
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/ConfigType.proto b/protofiles/ConfigType.proto
@@ -21,4 +21,6 @@ enum ConfigType {
    ColumboConfig = 11;
    CarpenterConfig = 12;
    InfluxConfig = 13;
+   EventManagerClientConfig = 14;
+   ColumboClientConfig = 15;
 }
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;
 }