elastic · Tim-Brooks · Dec 18, 2019 · Dec 18, 2019 · Dec 18, 2019 · Dec 18, 2019
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -929,7 +929,7 @@ buildRestTests.setups['farequote_index'] = '''
                   airline:
                      type: keyword
                   doc_count:
-                     type: integer       
+                     type: integer
 '''
 buildRestTests.setups['farequote_data'] = buildRestTests.setups['farequote_index'] + '''
   - do:
@@ -941,7 +941,7 @@ buildRestTests.setups['farequote_data'] = buildRestTests.setups['farequote_index
             {"airline":"JZA","responsetime":990.4628,"time":"2016-02-07T00:00:00+0000", "doc_count": 5}
             {"index": {"_id":"2"}}
             {"airline":"JBU","responsetime":877.5927,"time":"2016-02-07T00:00:00+0000", "doc_count": 23}
-            {"index": {"_id":"3"}}            
+            {"index": {"_id":"3"}}
             {"airline":"KLM","responsetime":1355.4812,"time":"2016-02-07T00:00:00+0000", "doc_count": 42}
 '''
 buildRestTests.setups['farequote_job'] = buildRestTests.setups['farequote_data'] + '''
@@ -1100,7 +1100,7 @@ buildRestTests.setups['server_metrics_openjob'] = buildRestTests.setups['server_
 buildRestTests.setups['server_metrics_openjob-raw'] = buildRestTests.setups['server_metrics_datafeed-raw'] + '''
   - do:
       raw:
-        method: POST 
+        method: POST
         path: _ml/anomaly_detectors/total-requests/_open
 '''
 buildRestTests.setups['server_metrics_startdf'] = buildRestTests.setups['server_metrics_openjob'] + '''
@@ -1178,7 +1178,7 @@ buildRestTests.setups['remote_cluster'] = buildRestTests.setups['host'] + '''
       cluster.put_settings:
         body:
           persistent:
-            cluster.remote.remote_cluster.seeds: $transport_host
+            cluster.remote.remote_cluster.sniff.seeds: $transport_host
 '''
 
 buildRestTests.setups['remote_cluster_and_leader_index'] = buildRestTests.setups['remote_cluster'] + '''
@@ -1309,7 +1309,7 @@ buildRestTests.setups['logdata_job'] = buildRestTests.setups['setup_logdata'] +
         id: "loganalytics"
         body:  >
           {
-            "source": { 
+            "source": {
               "index": "logdata"
               },
             "dest": {

diff --git a/docs/reference/ccr/getting-started.asciidoc b/docs/reference/ccr/getting-started.asciidoc
@@ -98,7 +98,7 @@ PUT /_cluster/settings
     "cluster" : {
       "remote" : {
         "leader" : {
-          "seeds" : [
+          "sniff.seeds" : [
             "127.0.0.1:9300" <1>
           ]
         }

diff --git a/docs/reference/modules/cross-cluster-search.asciidoc b/docs/reference/modules/cross-cluster-search.asciidoc
@@ -29,17 +29,17 @@ PUT _cluster/settings
     "cluster": {
       "remote": {
         "cluster_one": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9300"
           ]
         },
         "cluster_two": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9301"
           ]
         },
         "cluster_three": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9302"
           ]
         }

diff --git a/docs/reference/modules/remote-clusters.asciidoc b/docs/reference/modules/remote-clusters.asciidoc
@@ -81,10 +81,10 @@ nodes. For example:
 cluster:
     remote:
         cluster_one: <1>
-            seeds: 127.0.0.1:9300 <2>
+            sniff.seeds: 127.0.0.1:9300 <2>
             transport.ping_schedule: 30s <3>
-        cluster_two: 
-            seeds: 127.0.0.1:9301
+        cluster_two:
+            sniff.seeds: 127.0.0.1:9301
             transport.compress: true <4>
             skip_unavailable: true <5>
 
@@ -99,7 +99,7 @@ seed node in the remote cluster.
 <5> Disconnected remote clusters are optional for `cluster_two`.
 
 For more information about the optional transport settings, see
-<<modules-transport>>. 
+<<modules-transport>>.
 
 
 If you use <<cluster-update-settings,cluster settings>>, the remote clusters
@@ -113,20 +113,20 @@ PUT _cluster/settings
     "cluster": {
       "remote": {
         "cluster_one": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9300"
           ],
           "transport.ping_schedule": "30s"
         },
         "cluster_two": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9301"
           ],
           "transport.compress": true,
           "skip_unavailable": true
         },
         "cluster_three": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9302"
           ]
         }
@@ -149,13 +149,13 @@ PUT _cluster/settings
     "cluster": {
       "remote": {
         "cluster_one": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9300"
           ],
           "transport.ping_schedule": "60s"
         },
         "cluster_two": {
-          "seeds": [
+          "sniff.seeds": [
             "127.0.0.1:9301"
           ],
           "transport.compress": false
@@ -181,7 +181,7 @@ PUT _cluster/settings
     "cluster": {
       "remote": {
         "cluster_two": { <1>
-          "seeds": null,
+          "sniff.seeds": null,
           "skip_unavailable": null,
           "transport": {
             "compress": null

diff --git a/...restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.java b/...restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.upgrades;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.action.admin.cluster.settings.ClusterGetSettingsResponse;
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.settings.Setting;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.json.JsonXContent;
+import org.elasticsearch.transport.SniffConnectionStrategy;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.hamcrest.Matchers.equalTo;
+
+public class FullClusterRestartSettingsUpgradeIT extends AbstractFullClusterRestartTestCase {
+
+    public void testRemoteClusterSettingsUpgraded() throws IOException {
+        // TODO: Change to 7.6 on backport
+        assumeTrue("settings automatically upgraded since 8.0.0", getOldClusterVersion().before(Version.V_8_0_0));
+        if (isRunningAgainstOldCluster()) {
+            final Request putSettingsRequest = new Request("PUT", "/_cluster/settings");
+            try (XContentBuilder builder = jsonBuilder()) {
+                builder.startObject();
+                {
+                    builder.startObject("persistent");
+                    {
+                        builder.field("cluster.remote.foo.proxy", "localhost:9201");
+                        builder.field("cluster.remote.foo.seeds", Collections.singletonList("localhost:9200"));
+                    }
+                    builder.endObject();
+                }
+                builder.endObject();
+                putSettingsRequest.setJsonEntity(Strings.toString(builder));
+            }
+            client().performRequest(putSettingsRequest);
+
+            final Request getSettingsRequest = new Request("GET", "/_cluster/settings");
+            final Response response = client().performRequest(getSettingsRequest);
+            try (XContentParser parser = createParser(JsonXContent.jsonXContent, response.getEntity().getContent())) {
+                final ClusterGetSettingsResponse clusterGetSettingsResponse = ClusterGetSettingsResponse.fromXContent(parser);
+                final Settings settings = clusterGetSettingsResponse.getPersistentSettings();
+
+                assertTrue(SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS_OLD.getConcreteSettingForNamespace("foo").exists(settings));
+                assertTrue(SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY_OLD.getConcreteSettingForNamespace("foo").exists(settings));
+                assertThat(
+                    SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS_OLD.getConcreteSettingForNamespace("foo").get(settings),
+                    equalTo(Collections.singletonList("localhost:9200")));
+                assertThat(
+                    SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY_OLD.getConcreteSettingForNamespace("foo").get(settings),
+                    equalTo("localhost:9201"));
+            }
+
+            assertSettingDeprecationsAndWarnings(new Setting<?>[]{
+                SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS_OLD.getConcreteSettingForNamespace("foo"),
+            });
+        } else {
+            final Request getSettingsRequest = new Request("GET", "/_cluster/settings");
+            final Response getSettingsResponse = client().performRequest(getSettingsRequest);
+            try (XContentParser parser = createParser(JsonXContent.jsonXContent, getSettingsResponse.getEntity().getContent())) {
+                final ClusterGetSettingsResponse clusterGetSettingsResponse = ClusterGetSettingsResponse.fromXContent(parser);
+                final Settings settings = clusterGetSettingsResponse.getPersistentSettings();
+
+                assertFalse(SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS_OLD.getConcreteSettingForNamespace("foo").exists(settings));
+
+                assertTrue(SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS.getConcreteSettingForNamespace("foo")
+                    .exists(settings));
+                assertTrue(SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY.getConcreteSettingForNamespace("foo")
+                    .exists(settings));
+                assertThat(
+                    SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS.getConcreteSettingForNamespace("foo").get(settings),
+                    equalTo(Collections.singletonList("localhost:9200")));
+                assertThat(
+                    SniffConnectionStrategy.REMOTE_CLUSTERS_PROXY.getConcreteSettingForNamespace("foo").get(settings),
+                    equalTo("localhost:9201"));
+            }
+        }
+    }
+
+}
diff --git a/qa/multi-cluster-search/build.gradle b/qa/multi-cluster-search/build.gradle
@@ -47,7 +47,7 @@ task mixedClusterTest(type: RestIntegTestTask) {
 }
 
 testClusters.mixedClusterTest {
-  setting 'cluster.remote.my_remote_cluster.seeds',
+  setting 'cluster.remote.my_remote_cluster.sniff.seeds',
     { "\"${testClusters.'remote-cluster'.getAllTransportPortURI().get(0)}\"" }
   setting 'cluster.remote.connections_per_cluster', '1'
   setting 'cluster.remote.connect', 'true'

diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml
@@ -121,16 +121,16 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
         flat_settings: true
         body:
           transient:
-            cluster.remote.test_remote_cluster.seeds: $remote_ip
+            cluster.remote.test_remote_cluster.sniff.seeds: $remote_ip
 
-  - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
+  - match: {transient: {cluster.remote.test_remote_cluster.sniff.seeds: $remote_ip}}
 
   - do:
       search:
@@ -151,16 +151,16 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
         flat_settings: true
         body:
           transient:
-            cluster.remote.test_remote_cluster.seeds: $remote_ip
+            cluster.remote.test_remote_cluster.sniff.seeds: $remote_ip
 
-  - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
+  - match: {transient: {cluster.remote.test_remote_cluster.sniff.seeds: $remote_ip}}
 
   - do:
       search:

diff --git a/.../src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml b/.../src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml
@@ -4,7 +4,7 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       catch: bad_request
@@ -42,7 +42,7 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       catch: bad_request
@@ -78,7 +78,7 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
@@ -112,7 +112,7 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
@@ -146,7 +146,7 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:

diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
@@ -15,7 +15,7 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
@@ -100,16 +100,16 @@
       cluster.get_settings:
         include_defaults: true
 
-  - set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
+  - set: { defaults.cluster.remote.my_remote_cluster.sniff.seeds.0: remote_ip }
 
   - do:
       cluster.put_settings:
         flat_settings: true
         body:
           transient:
-            cluster.remote.remote1.seeds: $remote_ip
+            cluster.remote.remote1.sniff.seeds: $remote_ip
 
-  - match: {transient: {cluster.remote.remote1.seeds: $remote_ip}}
+  - match: {transient: {cluster.remote.remote1.sniff.seeds: $remote_ip}}
 
   - do:
       cluster.remote_info: {}
@@ -158,5 +158,5 @@
       cluster.put_settings:
         body:
           transient:
-            cluster.remote.remote1.seeds: null
+            cluster.remote.remote1.sniff.seeds: null
             cluster.remote.remote1.skip_unavailable: null