From 74db7f2349442c156a0acccbee0639e30c6a4fd5 Mon Sep 17 00:00:00 2001
From: Paul Oldenburg <paul.oldenburg@logrhythm.com>
Date: Wed, 21 Oct 2015 12:18:36 -0600
Subject: [PATCH 1/3] Initial commit of Anubis config

---
 protofiles/configelements/AnubisConfig.proto | 43 ++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 protofiles/configelements/AnubisConfig.proto

diff --git a/protofiles/configelements/AnubisConfig.proto b/protofiles/configelements/AnubisConfig.proto
new file mode 100644
index 0000000000000..23a4c77c63df3
--- /dev/null
+++ b/protofiles/configelements/AnubisConfig.proto
@@ -0,0 +1,43 @@
+package configelements;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "AnubisConfigMsg";
+
+message AnubisConfig {
+   
+   message GigawattDBConfig {
+      optional string name = 1;
+      optional uint64 batchWeightLim = 2;
+      optional int32 batchCountLim = 3;
+   }
+
+   message GatlingConfig {
+      optional string dispatchMsgUrl = 1; 
+      optional int32 dispatchMsgPort = 2;
+   }
+
+   message RelayConfig {
+      optional string mediatorMsgUrl = 1; 
+      optional int32 mediatorMsgPort = 2;
+      optional int32 bufferSize = 3;
+      optional int32 timeoutAutoSend = 4;
+      optional int32 timeoutReceive = 5;
+   }
+
+   message BiffConfig {
+      optional string dispatchAckidUrl = 1;
+      optional int32 dispatchAckidPort = 2;
+   }
+
+   message MessageRetryConfig {
+      optional int64 tryInterval = 1;
+      optional int64 ageForOld = 2;
+   }
+
+   optional GigawattDBConfig gigawattDBConfig= 1;
+   optional GatlingConfig gatlingConfig = 2;
+   optional RelayConfig relayConfig = 3;
+   optional BiffConfig biffConfig = 4;
+   optional MessageRetryConfig messageRetryConfig = 5;
+
+}

From 188c60bdc8ae627f8b3aa54aaf463ec3c6e8f18c Mon Sep 17 00:00:00 2001
From: Paul Oldenburg <paul.oldenburg@logrhythm.com>
Date: Wed, 21 Oct 2015 13:59:01 -0600
Subject: [PATCH 2/3] Restructured config according to comments

---
 .../configelements/AnubisClientConfig.proto   | 11 ++++++
 protofiles/configelements/AnubisConfig.proto  | 34 ++++++++-----------
 2 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 protofiles/configelements/AnubisClientConfig.proto

diff --git a/protofiles/configelements/AnubisClientConfig.proto b/protofiles/configelements/AnubisClientConfig.proto
new file mode 100644
index 0000000000000..3c9059273776b
--- /dev/null
+++ b/protofiles/configelements/AnubisClientConfig.proto
@@ -0,0 +1,11 @@
+package configelements;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "AnubisClientConfigMsg";
+
+message AnubisClientConfig {
+   
+   optional string msgQueue = 1;
+   optional string ackidQueue = 2;
+
+}
diff --git a/protofiles/configelements/AnubisConfig.proto b/protofiles/configelements/AnubisConfig.proto
index 23a4c77c63df3..7397ffab69b4b 100644
--- a/protofiles/configelements/AnubisConfig.proto
+++ b/protofiles/configelements/AnubisConfig.proto
@@ -7,37 +7,31 @@ message AnubisConfig {
    
    message GigawattDBConfig {
       optional string name = 1;
-      optional uint64 batchWeightLim = 2;
-      optional int32 batchCountLim = 3;
-   }
-
-   message GatlingConfig {
-      optional string dispatchMsgUrl = 1; 
-      optional int32 dispatchMsgPort = 2;
+      optional uint64 batchLimBytes = 2;
+      optional int32 batchLimRows = 3;
+      optional int32 dbMaxRows = 4;
    }
 
    message RelayConfig {
-      optional string mediatorMsgUrl = 1; 
-      optional int32 mediatorMsgPort = 2;
-      optional int32 bufferSize = 3;
-      optional int32 timeoutAutoSend = 4;
-      optional int32 timeoutReceive = 5;
+      optional string mediatorQueue = 1; 
+	  optional int32 mediatorQueueSize = 2;
+      optional int32 timeoutAutoSendMs = 4
+      optional int32 timeoutReceiveMs = 5;
    }
 
    message BiffConfig {
-      optional string dispatchAckidUrl = 1;
-      optional int32 dispatchAckidPort = 2;
+      optional string ackidQueue = 1;
+      optional int32 ackidQueueSize = 2;
    }
 
    message MessageRetryConfig {
-      optional int64 tryInterval = 1;
-      optional int64 ageForOld = 2;
+      optional int32 tryIntervalSecs = 1;
+      optional int32 ageForOldSecs = 2;
    }
 
    optional GigawattDBConfig gigawattDBConfig= 1;
-   optional GatlingConfig gatlingConfig = 2;
-   optional RelayConfig relayConfig = 3;
-   optional BiffConfig biffConfig = 4;
-   optional MessageRetryConfig messageRetryConfig = 5;
+   optional RelayConfig relayConfig = 2;
+   optional BiffConfig biffConfig = 3;
+   optional MessageRetryConfig messageRetryConfig = 4;
 
 }

From fddaf58b1645b60f8fe719fb49894a819b2ba612 Mon Sep 17 00:00:00 2001
From: Paul Oldenburg <paul.oldenburg@logrhythm.com>
Date: Wed, 21 Oct 2015 14:18:22 -0600
Subject: [PATCH 3/3] Fixed whitespace and indexing

---
 protofiles/configelements/AnubisConfig.proto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/protofiles/configelements/AnubisConfig.proto b/protofiles/configelements/AnubisConfig.proto
index 7397ffab69b4b..d924cb6c5465d 100644
--- a/protofiles/configelements/AnubisConfig.proto
+++ b/protofiles/configelements/AnubisConfig.proto
@@ -14,9 +14,9 @@ message AnubisConfig {
 
    message RelayConfig {
       optional string mediatorQueue = 1; 
-	  optional int32 mediatorQueueSize = 2;
-      optional int32 timeoutAutoSendMs = 4
-      optional int32 timeoutReceiveMs = 5;
+      optional int32 mediatorQueueSize = 2;
+      optional int32 timeoutAutoSendMs = 3; 
+      optional int32 timeoutReceiveMs = 4;
    }
 
    message BiffConfig {