Skip to content

Commit b938523

Browse files
kapral18elasticmachine
kapral18
and
elasticmachine
authored
[9.1] [Remote Clusters] Add IPv6 support (elastic#233415) (elastic#233682)
# Backport This will backport the following commits from `main` to `9.1`: - [[Remote Clusters] Add IPv6 support (elastic#233415)](elastic#233415) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Karen Grigoryan","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-09-01T13:26:07Z","message":"[Remote Clusters] Add IPv6 support (elastic#233415)\n\nfixes elastic#228298\n\n- Add IPv6 address support for remote cluster seed nodes and proxy\naddresses using bracket notation ( [::1]:9300 )\n- Move address validation from client-side to shared common library\nusing ipaddr.js for robust IPv4/IPv6 validation\n- Update cluster serialization and cloud URL parsing to handle IPv6\naddresses correctly\n\n## How to test\n\n1. Spin up local kibana and es on default ports (`yarn es snapshot` and\n`yarn start --no-base-path`)\n2. Go to `/app/management/data/remote_clusters`\n3. Click \"add new cluster\"\n4. Click \"certificates celect\"\n5. Add loopback ipv6 address to seed pointing to cluster communication\nport `[::1]:9300`\n6. Observe no client side error for `seed` field, proving that ipv6\nsyntax is now valid\n7. Add `test` name\n8. `Uncheck skip_unavailable`\n10. Click `next`\n11. Click `create remote cluster`\n12. Observe live cluster connection in the list of remote clusters\n\n## Release Note\nAdded IPv6 support to address fields in Remote Clusters UI\n\n---------\n\nCo-authored-by: Elastic Machine <[email protected]>","sha":"82f7f9d83a21db96ddb8cc6957f138a8e7729da9","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:enhancement","Feature:CCR and Remote Clusters","Team:Kibana Management","backport:version","v9.2.0","v9.1.4","v8.19.4"],"title":"[Remote Clusters] Add IPv6 support","number":233415,"url":"https://github.com/elastic/kibana/pull/233415","mergeCommit":{"message":"[Remote Clusters] Add IPv6 support (elastic#233415)\n\nfixes elastic#228298\n\n- Add IPv6 address support for remote cluster seed nodes and proxy\naddresses using bracket notation ( [::1]:9300 )\n- Move address validation from client-side to shared common library\nusing ipaddr.js for robust IPv4/IPv6 validation\n- Update cluster serialization and cloud URL parsing to handle IPv6\naddresses correctly\n\n## How to test\n\n1. Spin up local kibana and es on default ports (`yarn es snapshot` and\n`yarn start --no-base-path`)\n2. Go to `/app/management/data/remote_clusters`\n3. Click \"add new cluster\"\n4. Click \"certificates celect\"\n5. Add loopback ipv6 address to seed pointing to cluster communication\nport `[::1]:9300`\n6. Observe no client side error for `seed` field, proving that ipv6\nsyntax is now valid\n7. Add `test` name\n8. `Uncheck skip_unavailable`\n10. Click `next`\n11. Click `create remote cluster`\n12. Observe live cluster connection in the list of remote clusters\n\n## Release Note\nAdded IPv6 support to address fields in Remote Clusters UI\n\n---------\n\nCo-authored-by: Elastic Machine <[email protected]>","sha":"82f7f9d83a21db96ddb8cc6957f138a8e7729da9"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233415","number":233415,"mergeCommit":{"message":"[Remote Clusters] Add IPv6 support (elastic#233415)\n\nfixes elastic#228298\n\n- Add IPv6 address support for remote cluster seed nodes and proxy\naddresses using bracket notation ( [::1]:9300 )\n- Move address validation from client-side to shared common library\nusing ipaddr.js for robust IPv4/IPv6 validation\n- Update cluster serialization and cloud URL parsing to handle IPv6\naddresses correctly\n\n## How to test\n\n1. Spin up local kibana and es on default ports (`yarn es snapshot` and\n`yarn start --no-base-path`)\n2. Go to `/app/management/data/remote_clusters`\n3. Click \"add new cluster\"\n4. Click \"certificates celect\"\n5. Add loopback ipv6 address to seed pointing to cluster communication\nport `[::1]:9300`\n6. Observe no client side error for `seed` field, proving that ipv6\nsyntax is now valid\n7. Add `test` name\n8. `Uncheck skip_unavailable`\n10. Click `next`\n11. Click `create remote cluster`\n12. Observe live cluster connection in the list of remote clusters\n\n## Release Note\nAdded IPv6 support to address fields in Remote Clusters UI\n\n---------\n\nCo-authored-by: Elastic Machine <[email protected]>","sha":"82f7f9d83a21db96ddb8cc6957f138a8e7729da9"}},{"branch":"9.1","label":"v9.1.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Elastic Machine <[email protected]>
1 parent 136f446 commit b938523

File tree

16 files changed

+685
-192
lines changed

16 files changed

+685
-192
lines changed

‎x-pack/platform/plugins/private/remote_clusters/__jest__/client_integration/add/remote_clusters_add.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ describe('Create Remote cluster', () => {
150150
});
151151

152152
describe('seeds', () => {
153-
test('should only allow alpha-numeric characters and "-" (dash) in the node "host" part', async () => {
153+
test('should only allow hostname, ipv4 and ipv6 format in the node "host" part', async () => {
154154
await actions.formStep.button.click(); // display form errors
155155

156156
const expectInvalidChar = (char: string) => {
157157
actions.formStep.seedsInput.setValue(`192.16${char}:3000`);
158158
expect(actions.getErrorMessages()).toContain(
159-
`Seed node must use host:port format. Example: 127.0.0.1:9400, localhost:9400. Hosts can only consist of letters, numbers, and dashes.`
159+
`Seed node must use host:port format. Example: 127.0.0.1:9400, [::1]:9400 or localhost:9400. Hosts can only consist of letters, numbers, and dashes.`
160160
);
161161
};
162162

@@ -288,7 +288,7 @@ describe('Create Remote cluster', () => {
288288
const expectInvalidChar = (char: string) => {
289289
actions.formStep.proxyAddressInput.setValue(`192.16${char}:3000`);
290290
expect(actions.getErrorMessages()).toContain(
291-
'Address must use host:port format. Example: 127.0.0.1:9400, localhost:9400. Hosts can only consist of letters, numbers, and dashes.'
291+
'Address must use host:port format. Example: 127.0.0.1:9400, [::1]:9400 or localhost:9400. Hosts can only consist of letters, numbers, and dashes.'
292292
);
293293
};
294294

‎x-pack/platform/plugins/private/remote_clusters/common/lib/cluster_serialization.test.ts‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -135,41 +135,52 @@ describe('cluster_serialization', () => {
135135
});
136136
});
137137

138-
it('should deserialize a cluster that contains a deprecated proxy address and is in cloud', () => {
139-
expect(
140-
deserializeCluster(
141-
'test_cluster',
142-
{
143-
seeds: ['localhost:9300'],
144-
connected: true,
145-
num_nodes_connected: 1,
146-
max_connections_per_cluster: 3,
147-
initial_connect_timeout: '30s',
148-
skip_unavailable: false,
149-
transport: {
150-
ping_schedule: '-1',
151-
compress: false,
138+
it.each([
139+
{ title: '(hostname)', address: 'localhost:3000', host: 'localhost' },
140+
{ title: '(IPv4)', address: '123.1.2.142:3000', host: '123.1.2.142' },
141+
{
142+
title: '(IPv6)',
143+
address: '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:3000',
144+
host: '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]',
145+
},
146+
])(
147+
'should deserialize a cluster that contains a deprecated proxy address and is in cloud $title',
148+
({ address, host }) => {
149+
expect(
150+
deserializeCluster(
151+
'test_cluster',
152+
{
153+
seeds: [address],
154+
connected: true,
155+
num_nodes_connected: 1,
156+
max_connections_per_cluster: 3,
157+
initial_connect_timeout: '30s',
158+
skip_unavailable: false,
159+
transport: {
160+
ping_schedule: '-1',
161+
compress: false,
162+
},
152163
},
153-
},
154-
'localhost:9300',
155-
true
156-
)
157-
).toEqual({
158-
name: 'test_cluster',
159-
proxyAddress: 'localhost:9300',
160-
mode: 'proxy',
161-
hasDeprecatedProxySetting: true,
162-
isConnected: true,
163-
connectedNodesCount: 1,
164-
maxConnectionsPerCluster: 3,
165-
initialConnectTimeout: '30s',
166-
skipUnavailable: false,
167-
transportPingSchedule: '-1',
168-
transportCompress: false,
169-
serverName: 'localhost',
170-
securityModel: SECURITY_MODEL.CERTIFICATE,
171-
});
172-
});
164+
address,
165+
true
166+
)
167+
).toEqual({
168+
name: 'test_cluster',
169+
proxyAddress: address,
170+
mode: 'proxy',
171+
hasDeprecatedProxySetting: true,
172+
isConnected: true,
173+
connectedNodesCount: 1,
174+
maxConnectionsPerCluster: 3,
175+
initialConnectTimeout: '30s',
176+
skipUnavailable: false,
177+
transportPingSchedule: '-1',
178+
transportCompress: false,
179+
serverName: host,
180+
securityModel: SECURITY_MODEL.CERTIFICATE,
181+
});
182+
}
183+
);
173184

174185
it('should deserialize a cluster object with arbitrary missing properties', () => {
175186
expect(

‎x-pack/platform/plugins/private/remote_clusters/common/lib/cluster_serialization.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2.0.
66
*/
77

8+
import { extractHostAndPort } from './validate_address';
89
import { PROXY_MODE, SNIFF_MODE, SECURITY_MODEL } from '../constants';
910

1011
// Values returned from ES GET /_remote/info
@@ -143,19 +144,21 @@ export function deserializeCluster(
143144
};
144145
}
145146

147+
const deprecatedProxyHost = deprecatedProxyAddress
148+
? extractHostAndPort(deprecatedProxyAddress)?.host
149+
: undefined;
150+
146151
// If a user has a remote cluster with the deprecated proxy setting,
147152
// we transform the data to support the new implementation and also flag the deprecation
148-
if (deprecatedProxyAddress) {
149-
// Cloud-specific logic: Create default server name, since field doesn't exist in deprecated implementation
150-
const defaultServerName = deprecatedProxyAddress.split(':')[0];
151-
153+
if (deprecatedProxyAddress && deprecatedProxyHost) {
152154
deserializedClusterObject = {
153155
...deserializedClusterObject,
154156
proxyAddress: deprecatedProxyAddress,
155157
seeds: undefined,
156158
hasDeprecatedProxySetting: true,
157159
mode: PROXY_MODE,
158-
serverName: isCloudEnabled ? defaultServerName : undefined,
160+
// Cloud-specific logic: Create default server name, since this field doesn't exist in deprecated implementation
161+
serverName: isCloudEnabled ? deprecatedProxyHost : undefined,
159162
};
160163
}
161164

‎x-pack/platform/plugins/private/remote_clusters/common/lib/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ export type {
1212
ClusterPayloadEs,
1313
} from './cluster_serialization';
1414
export { deserializeCluster, serializeCluster } from './cluster_serialization';
15+
export { extractHostAndPort, isAddressValid, isPortValid } from './validate_address';

0 commit comments

Comments
 (0)