Server name (optional)
@@ -871,6 +875,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
aria-describedby="mockId-help"
fullWidth={true}
id="mockId"
+ isInvalid={false}
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
@@ -886,7 +891,9 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
-
+
+ isCloudEnabled ? (
+
+ ) : (
+
+ )
}
helpText={
this.onFieldsChange({ serverName: e.target.value })}
+ isInvalid={Boolean(areErrorsVisible && errorServerName)}
fullWidth
/>
@@ -452,6 +480,8 @@ export class RemoteClusterForm extends Component {
fields: { mode },
} = this.state;
+ const { isCloudEnabled } = this.context;
+
return (
+ {isCloudEnabled && mode === PROXY_MODE ? (
+ <>
+
+
+ }
+ iconType="pin"
+ size="s"
+ />
+
+ ) : null}
}
fullWidth
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
index ec5f0b1166ce5..a731da362382b 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
@@ -8,3 +8,4 @@ export { validateName } from './validate_name';
export { validateProxy } from './validate_proxy';
export { validateSeeds } from './validate_seeds';
export { validateSeed } from './validate_seed';
+export { validateServerName } from './validate_server_name';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js
new file mode 100644
index 0000000000000..197d36445d756
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export function validateServerName(serverName) {
+ if (!serverName || !serverName.trim()) {
+ return (
+
+ );
+ }
+
+ return null;
+}
diff --git a/x-pack/plugins/remote_clusters/public/plugin.ts b/x-pack/plugins/remote_clusters/public/plugin.ts
index 0fc70cdb60f95..d110c461c1e3f 100644
--- a/x-pack/plugins/remote_clusters/public/plugin.ts
+++ b/x-pack/plugins/remote_clusters/public/plugin.ts
@@ -19,7 +19,7 @@ export class RemoteClustersUIPlugin implements Plugin
async setup(
{ http, elasticsearch: elasticsearchService }: CoreSetup,
- { licensing }: Dependencies
+ { licensing, cloud }: Dependencies
) {
const elasticsearch = await elasticsearchService.adminClient;
const router = http.createRouter();
@@ -41,6 +41,9 @@ export class RemoteClustersServerPlugin implements Plugin
elasticsearchService,
router,
getLicenseStatus: () => this.licenseStatus,
+ config: {
+ isCloudEnabled: Boolean(cloud?.isCloudEnabled),
+ },
};
// Register routes
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
index 34d741aa4b7da..2b8b3bf1a5e59 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
@@ -34,6 +34,9 @@ describe('ADD remote clusters', () => {
getLicenseStatus: () => licenseCheckResult,
elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
elasticsearch: elasticsearchMock,
+ config: {
+ isCloudEnabled: false,
+ },
};
const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
index ec14336da08d4..69f84b7ef5e16 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
@@ -36,6 +36,9 @@ describe('DELETE remote clusters', () => {
getLicenseStatus: () => licenseCheckResult,
elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
elasticsearch: elasticsearchMock,
+ config: {
+ isCloudEnabled: false,
+ },
};
const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
index d81b50f1148de..deaf251c80c17 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
@@ -35,6 +35,9 @@ describe('GET remote clusters', () => {
getLicenseStatus: () => licenseCheckResult,
elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
elasticsearch: elasticsearchMock,
+ config: {
+ isCloudEnabled: false,
+ },
};
const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
index 8938f342674f0..078e1073d1568 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
@@ -33,6 +33,7 @@ export const register = (deps: RouteDependencies): void => {
const cluster = clustersByName[clusterName];
const isTransient = transientClusterNames.includes(clusterName);
const isPersistent = persistentClusterNames.includes(clusterName);
+ const { config } = deps;
// If the cluster hasn't been stored in the cluster state, then it's defined by the
// node's config file.
@@ -46,7 +47,12 @@ export const register = (deps: RouteDependencies): void => {
: undefined;
return {
- ...deserializeCluster(clusterName, cluster, deprecatedProxyAddress),
+ ...deserializeCluster(
+ clusterName,
+ cluster,
+ deprecatedProxyAddress,
+ config.isCloudEnabled
+ ),
isConfiguredByNode,
};
});
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
index 84ba9587ddfa6..b2a443c41fbf9 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
@@ -43,6 +43,9 @@ describe('UPDATE remote clusters', () => {
getLicenseStatus: () => licenseCheckResult,
elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
elasticsearch: elasticsearchMock,
+ config: {
+ isCloudEnabled: false,
+ },
};
const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
@@ -171,6 +174,85 @@ describe('UPDATE remote clusters', () => {
},
},
});
+ updateRemoteClustersTest('updates v1 proxy cluster', {
+ apiResponses: [
+ async () => ({
+ test: {
+ connected: true,
+ initial_connect_timeout: '30s',
+ skip_unavailable: false,
+ seeds: ['127.0.0.1:9300'],
+ },
+ }),
+ async () => ({
+ acknowledged: true,
+ persistent: {
+ cluster: {
+ remote: {
+ test: {
+ connected: true,
+ proxy_address: '127.0.0.1:9300',
+ initial_connect_timeout: '30s',
+ skip_unavailable: true,
+ mode: 'proxy',
+ proxy_socket_connections: 18,
+ },
+ },
+ },
+ },
+ transient: {},
+ }),
+ ],
+ params: {
+ name: 'test',
+ },
+ payload: {
+ proxyAddress: '127.0.0.1:9300',
+ skipUnavailable: true,
+ mode: 'proxy',
+ hasDeprecatedProxySetting: true,
+ serverName: '',
+ proxySocketConnections: 18,
+ },
+ asserts: {
+ apiArguments: [
+ ['cluster.remoteInfo'],
+ [
+ 'cluster.putSettings',
+ {
+ body: {
+ persistent: {
+ cluster: {
+ remote: {
+ test: {
+ proxy_address: '127.0.0.1:9300',
+ skip_unavailable: true,
+ mode: 'proxy',
+ node_connections: null,
+ seeds: null,
+ proxy_socket_connections: 18,
+ server_name: null,
+ proxy: null,
+ },
+ },
+ },
+ },
+ },
+ },
+ ],
+ ],
+ statusCode: 200,
+ result: {
+ initialConnectTimeout: '30s',
+ isConfiguredByNode: false,
+ isConnected: true,
+ proxyAddress: '127.0.0.1:9300',
+ name: 'test',
+ skipUnavailable: true,
+ mode: 'proxy',
+ },
+ },
+ });
});
describe('failure', () => {
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
index 47b0d4ad2def2..02a63783154df 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
@@ -24,6 +24,7 @@ const bodyValidation = schema.object({
proxyAddress: schema.nullable(schema.string()),
proxySocketConnections: schema.nullable(schema.number()),
serverName: schema.nullable(schema.string()),
+ hasDeprecatedProxySetting: schema.maybe(schema.boolean()),
});
const paramsValidation = schema.object({
diff --git a/x-pack/plugins/remote_clusters/server/types.ts b/x-pack/plugins/remote_clusters/server/types.ts
index 708b1daf4bbad..85678cba92f19 100644
--- a/x-pack/plugins/remote_clusters/server/types.ts
+++ b/x-pack/plugins/remote_clusters/server/types.ts
@@ -6,9 +6,11 @@
import { IRouter, ElasticsearchServiceSetup, IClusterClient } from 'kibana/server';
import { LicensingPluginSetup } from '../../licensing/server';
+import { CloudSetup } from '../../cloud/server';
export interface Dependencies {
licensing: LicensingPluginSetup;
+ cloud: CloudSetup;
}
export interface RouteDependencies {
@@ -16,6 +18,9 @@ export interface RouteDependencies {
getLicenseStatus: () => LicenseStatus;
elasticsearchService: ElasticsearchServiceSetup;
elasticsearch: IClusterClient;
+ config: {
+ isCloudEnabled: boolean;
+ };
}
export interface LicenseStatus {