Merge pull request elastic#434 from Tom-Artale/config-update

Changes based on discussion with Paul
harper-carroll · Oct 27, 2015 · 1c5380e · 1c5380e
2 parents 6628358 + 2d488c4
commit 1c5380e
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/protofiles/configelements/AnubisConfig.proto b/protofiles/configelements/AnubisConfig.proto
@@ -5,33 +5,37 @@ option java_outer_classname = "AnubisConfigMsg";
 
 message AnubisConfig {
 
+   message AccumulatorConf {
+      optional int32 secondsToAccumulate = 1;
+      optional int32 entriesToAccumulate = 2;
+      optional int32 maxBatchSizeBytes = 3;
+   }
+
    message GigawattDBConfig {
-      optional string name = 1;
-      optional uint64 batchLimBytes = 2;
-      optional int32 batchLimRows = 3;
-      optional int32 dbMaxRows = 4;
+      optional string gigawattDbPath = 1;
+      optional int32 dbMaxRows = 2;
    }
 
    message RelayConfig {
       optional string mediatorQueue = 1; 
       optional int32 mediatorQueueSize = 2;
-      optional int32 timeoutAutoSendMs = 3; 
-      optional int32 timeoutReceiveMs = 4;
+      optional int32 timeoutReceiveMs = 3;
    }
 
    message BiffConfig {
-      optional string ackidQueue = 1;
-      optional int32 ackidQueueSize = 2;
+      optional string ackQueue = 1;
+      optional int32 ackQueueSize = 2;
    }
 
    message MessageRetryConfig {
       optional int32 tryIntervalSecs = 1;
       optional int32 ageForOldSecs = 2;
    }
 
-   optional GigawattDBConfig gigawattDBConfig= 1;
-   optional RelayConfig relayConfig = 2;
-   optional BiffConfig biffConfig = 3;
-   optional MessageRetryConfig messageRetryConfig = 4;
+   optional AccumulatorConf accumulatorConf = 1;
+   optional GigawattDBConfig gigawattDBConfig= 2;
+   optional RelayConfig relayConfig = 3;
+   optional BiffConfig biffConfig = 4;
+   optional MessageRetryConfig messageRetryConfig = 5;
 
 }