Skip to content

Change remote_clusters ID to remoteClusters #59246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjcenizal merged 2 commits into from
Mar 5, 2020
Merged

Change remote_clusters ID to remoteClusters #59246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
148d9d2
Change remote_clusters ID to remoteClusters and use human readable na…
cjcenizal Mar 3, 2020
58a0fc3
Camelcase legacy plugin ID.
cjcenizal Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/cross_cluster_replication/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function crossClusterReplication(kibana) {
id: PLUGIN.ID,
configPrefix: 'xpack.ccr',
publicDir: resolve(__dirname, 'public'),
require: ['kibana', 'elasticsearch', 'xpack_main', 'remote_clusters', 'index_management'],
require: ['kibana', 'elasticsearch', 'xpack_main', 'remoteClusters', 'index_management'],
Copy link
Contributor Author

@cjcenizal cjcenizal Mar 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joshdover Do you know how this require config option works?

Copy link
Contributor

@joshdover joshdover Mar 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah just saw this. In legacy it causes Kibana to crash if an enabled plugin depends on a plugin that is not enabled. I believe it only looks at other legacy plugins.

uiExports: {
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
managementSections: ['plugins/cross_cluster_replication'],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/remote_clusters/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
*/

export const PLUGIN = {
ID: 'remote_clusters',
ID: 'remoteClusters',
};
1 change: 0 additions & 1 deletion x-pack/plugins/remote_clusters/common/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { LicenseType } from '../../licensing/common/types';
const basicLicense: LicenseType = 'basic';

export const PLUGIN = {
id: 'remote_clusters',
// Remote Clusters are used in both CCS and CCR, and CCS is available for all licenses.
minimumLicenseType: basicLicense,
getI18nName: (): string => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/remote_clusters/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "remote_clusters",
"id": "remoteClusters",
"version": "kibana",
"configPath": [
"xpack",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/remote_clusters/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class RemoteClustersServerPlugin implements Plugin<void, void, any, any>
registerDeleteRoute(routeDependencies);

licensing.license$.subscribe(license => {
const { state, message } = license.check(PLUGIN.id, PLUGIN.minimumLicenseType);
const { state, message } = license.check(PLUGIN.getI18nName(), PLUGIN.minimumLicenseType);
const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid;
if (hasRequiredLicense) {
this.licenseStatus = { valid: true };
Expand Down