Merge pull request elastic#344 from Tom-Artale/config-ux

Moved config protos to package; added UX protos

protofiles/configelements/AllConf.proto

@@ -0,0 +1,19 @@
+package configelements;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "AllConfUXMsg";
+
+import "ConfigUX.proto";
+
+// http://host:port/getAll/
+// http://news.softpedia.com/news/Hasbro-Setting-Up-AllSpark-Website-for-3D-Printed-Transformers-442669.shtml
+message AllConf {
+
+   message Entry {
+      optional string type = 1;
+      optional ConfigUX configUX = 2;
+      optional bytes serializedConfigUXMessage = 3;
+   }
+
+   repeated Entry allConf = 1;
+}

protofiles/CarpenterConfig.proto → protofiles/configelements/CarpenterConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 import "EncryptedString.proto";
 

protofiles/configelements/CarpenterConfigUX.proto

@@ -0,0 +1,56 @@
+package configelements; import "ConfigUX.proto";
+
+import "EncryptedString.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "CarpenterConfigUXMsg";
+
+message CarpenterConfig {
+   optional ConfigUX minutesToRest = 1;
+   optional ConfigUX listTable = 3;
+   optional ConfigUX listTableIDColumn = 4;
+   optional ConfigUX listTableItemColumn = 5;
+   optional ConfigUX commonEventTable = 6;
+   optional ConfigUX commonEventTableIDColumn = 7;
+   optional ConfigUX commonEventTableItemColumn = 8;
+   optional ConfigUX hostTable = 9;
+   optional ConfigUX hostTableIDColumn = 10;
+   optional ConfigUX hostTableItemColumn = 11;
+   optional ConfigUX networkTable = 12;
+   optional ConfigUX networkTableIDColumn = 13;
+   optional ConfigUX networkTableItemColumn = 14;
+   optional ConfigUX serviceTable = 15;
+   optional ConfigUX serviceTableIDColumn = 16;
+   optional ConfigUX serviceTableItemColumn = 17;
+   optional ConfigUX protocolTable = 18;
+   optional ConfigUX protocolTableIDColumn = 19;
+   optional ConfigUX protocolTableItemColumn = 20;
+   optional ConfigUX msgSourceTable = 21;
+   optional ConfigUX msgSourceTableIDColumn = 22;
+   optional ConfigUX msgSourceTableItemColumn = 23;
+   optional ConfigUX msgSourceTypeTable = 24;
+   optional ConfigUX msgSourceTypeTableIDColumn = 25;
+   optional ConfigUX msgSourceTypeTableItemColumn = 26;
+   optional ConfigUX msgClassTable = 27;
+   optional ConfigUX msgClassTableIDColumn = 28;
+   optional ConfigUX msgClassTableItemColumn = 29;
+   optional ConfigUX entityTable = 30;
+   optional ConfigUX entityTableIDColumn = 31;
+   optional ConfigUX entityTableItemColumn = 32;
+   optional ConfigUX mpeRuleTable = 33;
+   optional ConfigUX mpeRuleTableIDColumn = 34;
+   optional ConfigUX mpeRuleTableItemColumn = 35;
+   optional ConfigUX aclTable = 36;
+   optional ConfigUX aclTableIDColumn = 37;
+   optional ConfigUX aclTableItemColumn = 38;
+   optional ConfigUX directionTable = 39;
+   optional ConfigUX directionTableIDColumn = 40;
+   optional ConfigUX directionTableItemColumn = 41;
+   optional ConfigUX zoneTable = 42;
+   optional ConfigUX zoneTableIDColumn = 43;
+   optional ConfigUX zoneTableItemColumn = 44;
+   optional ConfigUX dbUsername = 45;
+   optional ConfigUX dbPassword = 46;
+   optional ConfigUX emdbHost = 47;
+   optional ConfigUX sqlPagingSize = 48;
+}

protofiles/CassandraConfig.proto → protofiles/configelements/CassandraConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "CassandraConfigMsg";

protofiles/configelements/CassandraConfigUX.proto

@@ -0,0 +1,12 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "CassandraConfigUXMsg";
+
+
+
+
+message CassandraConfig {
+   optional ConfigUX statsDBClusterName = 1;
+   optional ConfigUX statsDBUrl = 2;
+}

protofiles/ColumboClientConfig.proto → protofiles/configelements/ColumboClientConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ColumboClientConfigMsg";

protofiles/configelements/ColumboClientConfigUX.proto

@@ -0,0 +1,11 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ColumboClientConfigUXMsg";
+
+
+
+
+message ColumboClientConfig {
+   optional ConfigUX requestQueue = 1;
+}

protofiles/ColumboConfig.proto → protofiles/configelements/ColumboConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ColumboConfigMsg";

protofiles/configelements/ColumboConfigUX.proto

@@ -0,0 +1,16 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ColumboConfigUXMsg";
+
+
+
+
+message ColumboConfig {
+   optional ConfigUX requestQueue = 1;
+   optional ConfigUX resendTranslationTableIntervalInMS = 2;
+   optional ConfigUX requestBackend = 3;
+   optional ConfigUX searchThreadpoolSize = 4;
+   optional ConfigUX minutesToCache = 5;
+   optional ConfigUX cacheSizeInRecords = 6;
+}

protofiles/ConfigReplyMsg.proto → protofiles/configelements/ConfigReply.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigReplyMsg";

protofiles/ConfigRequestMsg.proto → protofiles/configelements/ConfigRequest.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigRequestMsg";

protofiles/ConfigServerConfigMsg.proto → protofiles/configelements/ConfigServerConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigServerConfigMsg";

protofiles/configelements/ConfigServerConfigUX.proto

@@ -0,0 +1,14 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ConfigServerConfigUXMsg";
+
+
+
+
+message ConfigServerConfig {
+   repeated ConfigUX configRequestQueue = 1;
+   optional ConfigUX frontEndRelayQueue = 2;
+   optional ConfigUX backEndHandlerQueue = 3;
+   optional ConfigUX maxSimultaneousRequests = 4;
+}

protofiles/ConfigType.proto → protofiles/configelements/ConfigType.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ConfigTypeMsg";

protofiles/configelements/ConfigUX.proto

@@ -0,0 +1,44 @@
+package configelements;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ConfigUXMsg";
+
+
+message ConfigUX {
+
+  enum DisplayType {
+    INTEGER = 1;
+    NATURAL = 2;
+    REAL = 3;
+    TEXT = 4;
+    BOOLEAN = 5;
+    ENUMERATION = 6;
+    USERNAME = 7;
+    PASSWORD = 8;
+    IPV4 = 9;
+    IPV6 = 10;
+    DISPLAY = 11; // This is to control cross-referenced data-points.
+  }
+
+  enum DisplayUnit {
+    NONE = 0;
+    MILLISECONDS = 1;
+    SECONDS = 2;
+  }
+
+  message SelectableValue {
+    required string display = 1;
+    required string value = 2;
+  }
+
+  optional string defaultValue = 1;               // Default value associated with the field.
+  optional string currentValue = 2;               // Currently saved value in the config.yaml file(s).
+  repeated SelectableValue selectableValues = 3;  // Pairs for a drop-down.
+  optional DisplayType displayType = 4;           // Helps UX control input (ie positive numbers only).
+  optional DisplayUnit displayUnit = 5;           // Possible units of the display type
+  optional string displayValue = 6;               // Human readable version of camel-case name of data-point.
+  optional bool isReadOnly = 7;                   // Renders the data-point as read-only.
+  optional bool isVisible = 8;                    // Flag causes UI to not render the data point.
+  optional string validateHint = 9;               // Text that can be read as part of tool tip.
+  repeated string validateErrors = 10;            // Messages resulting from invalid input.
+}

protofiles/configelements/ConfigUXReply.proto

@@ -0,0 +1,21 @@
+package configelements;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ConfigUXReplyMsg";
+import "AllConf.proto";
+
+
+
+
+message ConfigUXReply {
+   enum ReplyType {
+      SUCCESS = 0;
+      ERROR = 1;
+   }
+
+
+   optional string requestId = 1;
+   optional ReplyType replyType = 2;
+   optional string errorMessage = 3;
+   optional AllConf allConf = 4;
+}

protofiles/configelements/ConfigUXRequest.proto

@@ -0,0 +1,20 @@
+package configelements;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ConfigUXRequestMsg";
+import "AllConf.proto";
+
+
+
+
+message ConfigUXRequest {
+   enum RequestType {
+      READ_ALL = 0;
+      WRITE = 1;
+      VALIDATE = 2;
+   }
+
+   optional string requestId = 1;
+   optional RequestType requestType = 2;
+   optional AllConf allConf = 3;
+}

protofiles/DispatchClientConfig.proto → protofiles/configelements/DispatchClientConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "DispatchClientConfigMsg";

protofiles/configelements/DispatchClientConfigUX.proto

@@ -0,0 +1,13 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "DispatchClientConfigUXMsg";
+
+
+
+
+message DispatchClientConfig {
+
+   optional ConfigUX dataInsertQueue = 1;
+   optional ConfigUX bulkDataInsertQueue = 2;
+}

protofiles/DispatchConfig.proto → protofiles/configelements/DispatchConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "DispatchConfigMsg";

protofiles/configelements/DispatchConfigUX.proto

@@ -0,0 +1,53 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "DispatchConfigUXMsg";
+
+
+
+
+message DispatchConfig {
+
+   message IndexerConfig {
+      optional ConfigUX inputQueue = 1;
+      optional ConfigUX inputQueueTimeoutSec = 2;
+      optional ConfigUX inputQueueOwnsSocket = 3;
+      optional ConfigUX inputQueueHighWaterMark = 4;
+      optional ConfigUX indexAttemptLimit = 5;
+      optional ConfigUX indexRetryBackoffDurationMs = 6;
+      optional ConfigUX dataBufferLimit = 7;
+      optional ConfigUX statReportIntervalMs = 8;
+      optional ConfigUX statCountKey = 9;
+      optional ConfigUX statFinishedKey = 10;
+      optional ConfigUX statRetryKey = 11;
+      optional ConfigUX statFailedKey = 12;
+      optional ConfigUX statRequestKey = 13;
+      optional ConfigUX dataHandler = 14;
+      optional ConfigUX sendToPercolator = 15;
+      optional ConfigUX sendToRecorder = 16;
+      optional ConfigUX passthroughQName = 17;
+   }
+
+   message AccumulatorConfig {
+      optional ConfigUX secondsToAccumulate = 1;
+      optional ConfigUX entriesToAccumulate = 2;
+      optional ConfigUX inputQueue = 3;
+      optional ConfigUX outputQueue = 4;
+      optional ConfigUX dataAccumulator = 5;
+   }
+
+   message PercolatorConfig {
+      optional ConfigUX inputQueue = 1;
+      optional ConfigUX inputQueueTimeoutSec = 2;
+      optional ConfigUX inputQueueHighWaterMark = 3;
+      optional ConfigUX dataHandler = 4;
+      optional ConfigUX dataBufferLimit = 5;
+      optional ConfigUX percolateAttemptLimit = 6;
+      optional ConfigUX syslogQueue = 7;
+   }
+
+   repeated IndexerConfig indexerConf = 1;
+   optional AccumulatorConfig accumulatorConf = 2;
+   optional PercolatorConfig percolatorConf = 3;
+
+}

protofiles/ElasticSearchClientConfig.proto → protofiles/configelements/ElasticSearchClientConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "ElasticSearchClientConfigMsg";

protofiles/configelements/ElasticSearchClientConfigUX.proto

@@ -0,0 +1,20 @@
+package configelements; import "ConfigUX.proto";
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "ElasticSearchClientConfigUXMsg";
+
+
+
+
+message ElasticSearchClientConfig {
+   message SettingsEntry {
+      optional ConfigUX key = 1;
+      optional ConfigUX value = 2;
+   }
+
+   optional ConfigUX OBSOLETE_elasticsearchClusterName = 1;
+   optional ConfigUX OBSOLETE_elasticsearchNodeIp = 2;
+   optional ConfigUX elasticsearchServerConfigPath = 3;
+   repeated ConfigUX elasticsearchClientTransportAddress = 4;
+   repeated SettingsEntry elasticsearchClientSettings = 5;
+}

protofiles/EncryptedString.proto → protofiles/configelements/EncryptedString.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "EncryptedStringMsg";

protofiles/EnigmaConfig.proto → protofiles/configelements/EnigmaConfig.proto

@@ -1,4 +1,4 @@
-package protoMsg;
+package configelements;
 
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "EnigmaConfigMsg";