github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "disabling ccr and remote clusters when index mgmt is disabled (#32203) (#32236)" (#32242)

Browse source 
This reverts commit 2932490f5f.
This commit is contained in:
Bill McConaghy 2019-02-28 14:27:12 -05:00 • committed by GitHub
parent 98b991c3c8
commit bfe22d830b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
x-pack/plugins/cross_cluster_replication/index.js
View file

@ -22,10 +22,7 @@ export function crossClusterReplication(kibana) {
injectDefaultVars(server) {
const config = server.config();
return {
ccrUiEnabled: (
config.get('xpack.ccr.ui.enabled')
&& config.get('xpack.remote_clusters.ui.enabled')
),
ccrUiEnabled: config.get('xpack.ccr.ui.enabled'),
};
},
},
@ -41,13 +38,7 @@ export function crossClusterReplication(kibana) {
enabled: Joi.boolean().default(true),
}).default();
},
isEnabled(config) {
return (
config.get('xpack.ccr.enabled') &&
config.get('xpack.index_management.enabled') &&
config.get('xpack.remote_clusters.enabled')
);
},
init: function initCcrPlugin(server) {
registerLicenseChecker(server);
registerRoutes(server);

7
x-pack/plugins/remote_clusters/index.js
View file

@ -44,12 +44,7 @@ export function remoteClusters(kibana) {
enabled: Joi.boolean().default(true),
}).default();
},
isEnabled(config) {
return (
config.get('xpack.remote_clusters.enabled') &&
config.get('xpack.index_management.enabled')
);
},
init: function (server) {
registerLicenseChecker(server);
registerListRoute(server);