Skip to content

Commit c801bc9

Browse files
eedugoneedugon
committed
conflict fix
2 parents 3809a62 + 00263ab commit c801bc9

14 files changed

+114
-71
lines changed

‎deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: With {{eck}}
2+
navigation_title: To {{eck}}
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs-for-eck.html
55
applies_to:
@@ -10,7 +10,7 @@ products:
1010
- id: cloud-hosted
1111
---
1212

13-
# Remote clusters between {{ech}} and ECK [ec-enable-ccs-for-eck]
13+
# Connect {{ech}} deployments to {{eck}} clusters [ec-enable-ccs-for-eck]
1414

1515
These steps describe how to configure remote clusters between an {{es}} cluster in {{ech}} (ECH) and an {{es}} cluster running within [{{eck}} (ECK)](/deploy-manage/deploy/cloud-on-k8s.md). Once that’s done, you’ll be able to [run CCS queries from {{es}}](/solutions/search/cross-cluster-search.md) or [set up CCR](/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md).
1616

‎deploy-manage/remote-clusters/ec-enable-ccs.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: Elastic Cloud Hosted
2+
navigation_title: On Elastic Cloud Hosted
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs.html
55
applies_to:
@@ -9,9 +9,9 @@ products:
99
- id: cloud-hosted
1010
---
1111

12-
# Remote clusters with {{ech}} [ec-enable-ccs]
12+
# Remote clusters on {{ech}} [ec-enable-ccs]
1313

14-
You can configure an {{ech}} deployment to remotely access or (be accessed by) a cluster from:
14+
You can configure an {{ech}} deployment to either connect to remote clusters or accept connections from:
1515

1616
* Another {{ech}} deployment of your {{ecloud}} organization, across any region or cloud provider (AWS, GCP, Azure…)
1717
* An {{ech}} deployment of another {{ecloud}} organization

‎deploy-manage/remote-clusters/ec-remote-cluster-ece.md‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: With {{ece}}
2+
navigation_title: To {{ece}}
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-ece.html
55
applies_to:
@@ -10,7 +10,7 @@ products:
1010
- id: cloud-hosted
1111
---
1212

13-
# Access deployments of an {{ece}} environment [ec-remote-cluster-ece]
13+
# Connect {{ech}} deployments to an {{ece}} environment [ec-remote-cluster-ece]
1414

1515
This section explains how to configure a deployment to connect remotely to clusters belonging to an {{ECE}} (ECE) environment.
1616

@@ -65,12 +65,12 @@ The steps to follow depend on whether the Certificate Authority (CA) of the remo
6565
On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
6666

6767
3. From the navigation menu, select **Security**.
68-
4. Locate **Remote connections** and select **Add API key**.
68+
4. Locate **Remote Connections > Trust management > Connections using API keys** and select **Add API key**.
6969

70-
1. Add a setting:
70+
1. Fill both fields.
7171

72-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
73-
* For the **Secret**, paste the encoded cross-cluster API key.
72+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
73+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
7474

7575
2. Click **Add** to save the API key to the keystore.
7676

@@ -99,8 +99,8 @@ If you need to update the remote connection with different permissions later, re
9999

100100
1. Fill both fields.
101101

102-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
103-
* For the **Secret**, paste the encoded cross-cluster API key.
102+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
103+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
104104

105105
2. Click **Add** to save the API key to the keystore.
106106
3. Repeat these steps for each API key you want to add. For example, if you want to use several deployments of the remote environment for CCR or CCS.
@@ -205,7 +205,9 @@ On the local cluster, add the remote cluster using {{kib}} or the {{es}} API.
205205
2. Enable **Manually enter proxy address and server name**.
206206
3. Fill in the following fields:
207207

208-
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish between local and remote indices.
208+
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish local and remote indices.
209+
210+
When using API key authentication, this alias must match the **Remote cluster name** you configured when adding the API key in the Cloud UI.
209211
* **Proxy address**: This value can be found on the **Security** page of the {{ech}} deployment you want to use as a remote.<br>
210212

211213
::::{tip}
@@ -255,6 +257,9 @@ PUT /_cluster/settings
255257
}
256258
```
257259

260+
::::{note}
261+
When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
262+
::::
258263

259264
### Using the {{ecloud}} RESTful API [ec_using_the_elasticsearch_service_restful_api_3]
260265

‎deploy-manage/remote-clusters/ec-remote-cluster-other-ess.md‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: With a different {{ecloud}} organization
2+
navigation_title: To a different {{ecloud}} organization
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-other-ess.html
55
applies_to:
@@ -9,7 +9,7 @@ products:
99
- id: cloud-hosted
1010
---
1111

12-
# Access deployments of another {{ecloud}} organization [ec-remote-cluster-other-ess]
12+
# Connect to deployments in another {{ecloud}} organization [ec-remote-cluster-other-ess]
1313

1414
This section explains how to configure a deployment to connect remotely to clusters belonging to a different {{ecloud}} organization.
1515

@@ -61,12 +61,12 @@ The API key created previously will be used by the local deployment to authentic
6161
On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
6262

6363
3. From the navigation menu, select **Security**.
64-
4. Locate **Remote connections** and select **Add API key**.
64+
4. Locate **Remote Connections > Trust management > Connections using API keys** and select **Add API key**.
6565

6666
1. Fill both fields.
6767

68-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
69-
* For the **Secret**, paste the encoded cross-cluster API key.
68+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
69+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
7070

7171
2. Click **Add** to save the API key to the keystore.
7272

@@ -143,7 +143,9 @@ On the local cluster, add the remote cluster using {{kib}} or the {{es}} API.
143143
2. Enable **Manually enter proxy address and server name**.
144144
3. Fill in the following fields:
145145

146-
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish between local and remote indices.
146+
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish local and remote indices.
147+
148+
When using API key authentication, this alias must match the **Remote cluster name** you configured when adding the API key in the Cloud UI.
147149
* **Proxy address**: This value can be found on the **Security** page of the {{ech}} deployment you want to use as a remote.<br>
148150

149151
::::{tip}
@@ -193,6 +195,10 @@ PUT /_cluster/settings
193195
}
194196
```
195197

198+
::::{note}
199+
When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
200+
::::
201+
196202
### Using the {{ecloud}} RESTful API [ec_using_the_elasticsearch_service_restful_api_2]
197203

198204
::::{note}

‎deploy-manage/remote-clusters/ec-remote-cluster-same-ess.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: Within the same {{ecloud}} organization
2+
navigation_title: To the same {{ecloud}} organization
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-same-ess.html
55
applies_to:
@@ -9,7 +9,7 @@ products:
99
- id: cloud-hosted
1010
---
1111

12-
# Access other deployments of the same {{ecloud}} organization [ec-remote-cluster-same-ess]
12+
# Connect to deployments in the same {{ecloud}} organization [ec-remote-cluster-same-ess]
1313

1414
This section explains how to configure a deployment to connect remotely to clusters belonging to the same {{ecloud}} organization.
1515

@@ -61,12 +61,12 @@ The API key created previously will be used by the local deployment to authentic
6161
On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
6262

6363
3. From the navigation menu, select **Security**.
64-
4. Locate **Remote connections** and select **Add API key**.
64+
4. Locate **Remote Connections > Trust management > Connections using API keys** and select **Add API key**.
6565

6666
1. Fill both fields.
6767

68-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
69-
* For the **Secret**, paste the encoded cross-cluster API key.
68+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
69+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
7070

7171
2. Click **Add** to save the API key.
7272

@@ -172,7 +172,9 @@ On the local cluster, add the remote cluster using {{kib}} or the {{es}} API.
172172
2. Enable **Manually enter proxy address and server name**.
173173
3. Fill in the following fields:
174174

175-
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish between local and remote indices.
175+
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish local and remote indices.
176+
177+
When using API key authentication, this alias must match the **Remote cluster name** you configured when adding the API key in the Cloud UI.
176178
* **Proxy address**: This value can be found on the **Security** page of the {{ech}} deployment you want to use as a remote.<br>
177179

178180
::::{tip}
@@ -222,6 +224,9 @@ PUT /_cluster/settings
222224
}
223225
```
224226

227+
::::{note}
228+
When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
229+
::::
225230

226231
### Using the {{ecloud}} RESTful API [ec_using_the_elasticsearch_service_restful_api]
227232

‎deploy-manage/remote-clusters/ec-remote-cluster-self-managed.md‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: With a self-managed cluster
2+
navigation_title: To a self-managed cluster
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-self-managed.html
55
applies_to:
@@ -10,7 +10,7 @@ products:
1010
- id: cloud-hosted
1111
---
1212

13-
# Access clusters of a self-managed environment [ec-remote-cluster-self-managed]
13+
# Connect {{ech}} deployments to self-managed clusters [ec-remote-cluster-self-managed]
1414

1515
This section explains how to configure a deployment to connect remotely to self-managed clusters.
1616

@@ -61,12 +61,12 @@ The steps to follow depend on whether the Certificate Authority (CA) of the remo
6161
On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
6262

6363
3. From the navigation menu, select **Security**.
64-
4. Locate **Remote connections** and select **Add API key**.
64+
4. Locate **Remote Connections > Trust management > Connections using API keys** and select **Add API key**.
6565

66-
1. Add a setting:
66+
1. Fill both fields.
6767

68-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
69-
* For the **Secret**, paste the encoded cross-cluster API key.
68+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
69+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
7070

7171
2. Click **Add** to save the API key to the keystore.
7272

@@ -95,8 +95,8 @@ If you need to update the remote connection with different permissions later, re
9595

9696
1. Fill both fields.
9797

98-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
99-
* For the **Secret**, paste the encoded cross-cluster API key.
98+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
99+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
100100

101101
2. Click **Add** to save the API key to the keystore.
102102
3. Repeat these steps for each API key you want to add. For example, if you want to use several clusters of the remote environment for CCR or CCS.
@@ -225,7 +225,9 @@ On the local cluster, add the remote cluster using {{kib}} or the {{es}} API.
225225
2. Enable **Manually enter proxy address and server name**.
226226
3. Fill in the following fields:
227227

228-
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish between local and remote indices.
228+
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish local and remote indices.
229+
230+
When using API key authentication, this alias must match the **Remote cluster name** you configured when adding the API key in the Cloud UI.
229231
* **Proxy address**: This value can be found on the **Security** page of the {{ech}} deployment you want to use as a remote.<br>
230232

231233
::::{tip}
@@ -275,6 +277,10 @@ PUT /_cluster/settings
275277
}
276278
```
277279

280+
::::{note}
281+
When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
282+
::::
283+
278284
### Using the {{ecloud}} RESTful API [ec_using_the_elasticsearch_service_restful_api_4]
279285

280286
::::{note}

‎deploy-manage/remote-clusters/ece-enable-ccs-for-eck.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: With {{eck}}
2+
navigation_title: To {{eck}}
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-enable-ccs-for-eck.html
55
applies_to:
@@ -10,7 +10,7 @@ products:
1010
- id: cloud-enterprise
1111
---
1212

13-
# Remote clusters between {{ece}} and ECK [ece-enable-ccs-for-eck]
13+
# Connect {{ece}} deployments to {{eck}} clusters [ece-enable-ccs-for-eck]
1414

1515
These steps describe how to configure remote clusters between an {{es}} cluster in {{ece}} and an {{es}} cluster running within [{{eck}} (ECK)](/deploy-manage/deploy/cloud-on-k8s.md). Once that’s done, you’ll be able to [run CCS queries from {{es}}](/solutions/search/cross-cluster-search.md) or [set up CCR](/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md).
1616

‎deploy-manage/remote-clusters/ece-enable-ccs.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: Elastic Cloud Enterprise
2+
navigation_title: On Elastic Cloud Enterprise
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-enable-ccs.html
55
applies_to:
@@ -9,9 +9,9 @@ products:
99
- id: cloud-enterprise
1010
---
1111

12-
# Remote clusters with {{ece}} [ece-enable-ccs]
12+
# Remote clusters on {{ece}} [ece-enable-ccs]
1313

14-
You can configure an {{ece}} deployment to remotely access or (be accessed by) a cluster from:
14+
You can configure an {{ece}} deployment to either connect to remote clusters or accept connections from:
1515

1616
* Another deployment of your ECE installation
1717
* A deployment running on a different ECE installation

‎deploy-manage/remote-clusters/ece-remote-cluster-ece-ess.md‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
navigation_title: With {{ecloud}}
2+
navigation_title: To {{ecloud}}
33
mapped_pages:
44
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-remote-cluster-ece-ess.html
55
applies_to:
@@ -10,7 +10,7 @@ products:
1010
- id: cloud-enterprise
1111
---
1212

13-
# Access deployments of an {{ecloud}} organization [ece-remote-cluster-ece-ess]
13+
# Connect {{ece}} deployments to an {{ecloud}} organization [ece-remote-cluster-ece-ess]
1414

1515
This section explains how to configure a deployment to connect remotely to clusters belonging to an {{ecloud}} organization.
1616

@@ -65,12 +65,12 @@ The API key created previously will be used by the local deployment to authentic
6565
Narrow the list by name, ID, or choose from several other filters. To further define the list, use a combination of filters.
6666

6767
3. From the deployment menu, select **Security**.
68-
4. Locate **Remote connections** and select **Add an API key**.
68+
4. Locate **Remote Connections > Trust management > Connections using API keys** and select **Add API key**.
6969

7070
1. Fill both fields.
7171

72-
* For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
73-
* For the **Secret**, paste the encoded cross-cluster API key.
72+
* For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
73+
* For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
7474

7575
2. Click **Add** to save the API key to the keystore.
7676

@@ -152,7 +152,9 @@ On the local cluster, add the remote cluster using {{kib}} or the {{es}} API.
152152
2. Enable **Manually enter proxy address and server name**.
153153
3. Fill in the following fields:
154154

155-
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish between local and remote indices.
155+
* **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish local and remote indices.
156+
157+
When using API key authentication, this alias must match the **Remote cluster name** you configured when adding the API key in the Cloud UI.
156158
* **Proxy address**: This value can be found on the **Security** page of the {{ece}} deployment you want to use as a remote.<br>
157159

158160
::::{tip}
@@ -212,6 +214,10 @@ PUT /_cluster/settings
212214
}
213215
```
214216

217+
::::{note}
218+
When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
219+
::::
220+
215221
### Using the {{ece}} RESTful API [ece_using_the_elastic_cloud_enterprise_restful_api_3]
216222

217223
::::{note}

0 commit comments

Comments
 (0)