Merge pull request elastic#399 from Tom-Artale/elasticsearch-settings

Added ES Server settings to AllConf
harper-carroll · Aug 25, 2015 · 8b5bba2 · 8b5bba2
2 parents 2194523 + 0156846
commit 8b5bba2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/protofiles/configelements/ux/AllConf.proto b/protofiles/configelements/ux/AllConf.proto
@@ -12,6 +12,7 @@ import "ConfigServerConfigUX.proto";
 import "DispatchConfigUX.proto";
 import "DispatchClientConfigUX.proto";
 import "ElasticSearchClientConfigUX.proto";
+import "ElasticSearchServerConfigUX.proto";
 import "EnigmaConfigUX.proto";
 import "HermesConfigUX.proto";
 import "InfluxConfigUX.proto";
@@ -60,4 +61,7 @@ message AllConf {
 
   optional ConfigUX clusterNodeConfigUX = 25;
   optional ClusterNodeConfigUX clusterNodeConfig = 26;
+
+  optional ConfigUX elasticsearchServerConfigUX = 27;
+  optional ElasticSearchServerConfigUX elasticsearchServerConfig = 28;
 }