Renamed remaining leader_cluster_alias / cluster_alias to leader_cluster

x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/auto_follow.yml

@@ -21,7 +21,7 @@
 
   - do:
       ccr.put_auto_follow_pattern:
-        leader_cluster_alias: local
+        leader_cluster: local
         body:
           leader_index_patterns: ['logs-*']
           max_concurrent_read_batches: 2
@@ -29,7 +29,7 @@
 
   - do:
       ccr.get_auto_follow_pattern:
-        leader_cluster_alias: local
+        leader_cluster: local
   - match: { local.leader_index_patterns: ['logs-*'] }
   - match: { local.max_concurrent_read_batches: 2 }
 
@@ -40,10 +40,10 @@
 
   - do:
       ccr.delete_auto_follow_pattern:
-        leader_cluster_alias: local
+        leader_cluster: local
   - is_true: acknowledged
 
   - do:
       catch: missing
       ccr.get_auto_follow_pattern:
-        leader_cluster_alias: local
+        leader_cluster: local

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/monitoring/collector/ccr/FollowStatsMonitoringDocTests.java

@@ -108,7 +108,7 @@ public class FollowStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Fol
                         Tuple.tuple(randomIntBetween(0, Integer.MAX_VALUE), new ElasticsearchException("shard is sad"))));
         final long timeSinceLastFetchMillis = randomNonNegativeLong();
         final ShardFollowNodeTaskStatus status = new ShardFollowNodeTaskStatus(
-                "cluster_alias",
+                "leader_cluster",
                 "leader_index",
                 "follower_index",
                 shardId,
@@ -152,7 +152,7 @@ public class FollowStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Fol
                                         + "\"timestamp\":\"" + new DateTime(nodeTimestamp, DateTimeZone.UTC).toString() +  "\""
                                 + "},"
                                 + "\"ccr_stats\":{"
-                                        + "\"leader_cluster\":\"cluster_alias\","
+                                        + "\"leader_cluster\":\"leader_cluster\","
                                         + "\"leader_index\":\"leader_index\","
                                         + "\"follower_index\":\"follower_index\","
                                         + "\"shard_id\":" + shardId + ","
@@ -194,7 +194,7 @@ public class FollowStatsMonitoringDocTests extends BaseMonitoringDocTestCase<Fol
         final NavigableMap<Long, Tuple<Integer, ElasticsearchException>> fetchExceptions =
             new TreeMap<>(Collections.singletonMap(1L, Tuple.tuple(2, new ElasticsearchException("shard is sad"))));
         final ShardFollowNodeTaskStatus status = new ShardFollowNodeTaskStatus(
-            "cluster_alias",
+            "leader_cluster",
             "leader_index",
             "follower_index",
             0,

x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.delete_auto_follow_pattern.json

@@ -3,10 +3,10 @@
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current",
     "methods": [ "DELETE" ],
     "url": {
-      "path": "/_ccr/auto_follow/{leader_cluster_alias}",
+      "path": "/_ccr/auto_follow/{leader_cluster}",
-      "paths": [ "/_ccr/auto_follow/{leader_cluster_alias}" ],
+      "paths": [ "/_ccr/auto_follow/{leader_cluster}" ],
       "parts": {
-        "leader_cluster_alias": {
+        "leader_cluster": {
           "type": "string",
           "required": true,
           "description": "The name of the leader cluster alias."

x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.get_auto_follow_pattern.json

@@ -3,10 +3,10 @@
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current",
     "methods": [ "GET" ],
     "url": {
-      "path": "/_ccr/auto_follow/{leader_cluster_alias}",
+      "path": "/_ccr/auto_follow/{leader_cluster}",
-      "paths": [ "/_ccr/auto_follow", "/_ccr/auto_follow/{leader_cluster_alias}" ],
+      "paths": [ "/_ccr/auto_follow", "/_ccr/auto_follow/{leader_cluster}" ],
       "parts": {
-        "leader_cluster_alias": {
+        "leader_cluster": {
           "type": "string",
           "description": "The name of the leader cluster alias."
         }

x-pack/plugin/src/test/resources/rest-api-spec/api/ccr.put_auto_follow_pattern.json

@@ -3,10 +3,10 @@
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current",
     "methods": [ "PUT" ],
     "url": {
-      "path": "/_ccr/auto_follow/{leader_cluster_alias}",
+      "path": "/_ccr/auto_follow/{leader_cluster}",
-      "paths": [ "/_ccr/auto_follow/{leader_cluster_alias}" ],
+      "paths": [ "/_ccr/auto_follow/{leader_cluster}" ],
       "parts": {
-        "leader_cluster_alias": {
+        "leader_cluster": {
           "type": "string",
           "required": true,
           "description": "The name of the leader cluster alias."