From 4c6ff311f65d68ab20c5df9f673774633951c24b Mon Sep 17 00:00:00 2001 From: Tom Artale Date: Wed, 6 May 2015 18:17:36 -0600 Subject: [PATCH 1/2] Separated the ES node and client; added builders for all --- protofiles/ElasticSearchClientConfig.proto | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/protofiles/ElasticSearchClientConfig.proto b/protofiles/ElasticSearchClientConfig.proto index a37d77d70956c..add73aa2a4aeb 100644 --- a/protofiles/ElasticSearchClientConfig.proto +++ b/protofiles/ElasticSearchClientConfig.proto @@ -7,6 +7,14 @@ option java_outer_classname = "ElasticSearchClientConfigMsg"; message ElasticSearchClientConfig { - optional string elasticsearchClusterName = 1; - optional string elasticsearchNodeIp = 2; + message SettingsEntry { + optional string key = 1; + optional string value = 2; + } + +// deprecated optional string elasticsearchClusterName = 1; +// deprecated optional string elasticsearchNodeIp = 2; + optional string elasticsearchServerConfigPath = 3; + repeated string elasticsearchClientTransportAddress = 4; + repeated SettingsEntry elasticsearchClientSettings = 5; } From 7125522fe23823d8acd2652e0f622e4c3fd5fe54 Mon Sep 17 00:00:00 2001 From: Tom Artale Date: Thu, 7 May 2015 17:47:30 -0600 Subject: [PATCH 2/2] Review suggestions --- protofiles/ElasticSearchClientConfig.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protofiles/ElasticSearchClientConfig.proto b/protofiles/ElasticSearchClientConfig.proto index add73aa2a4aeb..5695b152fe7b4 100644 --- a/protofiles/ElasticSearchClientConfig.proto +++ b/protofiles/ElasticSearchClientConfig.proto @@ -12,8 +12,8 @@ message ElasticSearchClientConfig { optional string value = 2; } -// deprecated optional string elasticsearchClusterName = 1; -// deprecated optional string elasticsearchNodeIp = 2; + optional string OBSOLETE_elasticsearchClusterName = 1; + optional string OBSOLETE_elasticsearchNodeIp = 2; optional string elasticsearchServerConfigPath = 3; repeated string elasticsearchClientTransportAddress = 4; repeated SettingsEntry elasticsearchClientSettings = 5;