Skip to content
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.

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

Change remote_clusters ID to remoteClusters #59246

Merged

Conversation

cjcenizal
Copy link
Contributor

Fixes #59183

Also, use human readable name for license check.

@cjcenizal cjcenizal added chore Feature:CCR and Remote Clusters v8.0.0 Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more release_note:skip Skip the PR/issue when compiling release notes v7.7.0 labels Mar 3, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/es-ui (Team:Elasticsearch UI)

Copy link
Contributor

@alisonelizabeth alisonelizabeth left a comment

Choose a reason for hiding this comment

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

@cjcenizal code LGTM. Did not test locally. I actually had this on my list to do tomorrow, so thanks for taking care of it 😄

Copy link
Contributor

@joshdover joshdover left a comment

Choose a reason for hiding this comment

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

NP changes LGTM, you might want to also change the legacy ID to make them consistent: x-pack/legacy/plugins/remote_clusters/common/index.ts

I'm not aware of anything that would break, but just to be sure.

@cjcenizal cjcenizal force-pushed the chore/camelcase_remote_clusters_id branch from 11c5826 to f84b9a7 Compare March 4, 2020 20:17
@cjcenizal cjcenizal force-pushed the chore/camelcase_remote_clusters_id branch from f84b9a7 to 58a0fc3 Compare March 5, 2020 01:55
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

  • 💔 Build #30878 failed f84b9a73425dfb39cac17e1659c6b3feb6365438
  • 💚 Build #30582 succeeded 11c5826311d88073f9a7c29ff315264cad3f0b3c

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@@ -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

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

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.

@cjcenizal cjcenizal merged commit bb86bf2 into elastic:master Mar 5, 2020
@cjcenizal cjcenizal deleted the chore/camelcase_remote_clusters_id branch March 5, 2020 03:53
jloleysens added a commit to jloleysens/kibana that referenced this pull request Mar 5, 2020
…re/files-and-filetree

* 'master' of github.com:elastic/kibana: (254 commits)
  Convert discover_page to ts, remove redundunt methods (elastic#59312)
  [Fix for Vis Editor] Revert setting time field to empty string when it's undefined (elastic#58873)
  Delete legacy search endpoint (elastic#59341)
  [Uptime] Improve duration chart (elastic#58404)
  [Snapshot & Restore] NP migration (elastic#59109)
  [ML] Add support for date_nanos time field in anomaly job wizard (elastic#59017)
  Revert "Makes alerting and actions optional properties for interface RequestH… (elastic#59264)"
  Change remote_clusters ID to remoteClusters (elastic#59246)
  Makes alerting and actions optional properties for interface RequestH… (elastic#59264)
  Clean up date histogram agg type. (elastic#58805)
  [ML] Management: fix license unsubscribe (elastic#59365)
  Remove documentation for server.cors settings (elastic#59096)
  Edit alert flyout (elastic#58964)
  [SIEM] Fix rule delete/duplicate actions (elastic#59306)
  move mouse to close obstructing tooltip (elastic#59214)
  Reset page after deleting (elastic#59310)
  Make sure phrases input filter triggers autosuggestons (elastic#59299)
  Add loading count source for http requests (elastic#59245)
  Revert "[ML] Transforms: Deprecate custom KibanaContext. (elastic#59133)"
  Expose metrics service to public API (elastic#59294)
  ...

# Conflicts:
#	src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 6, 2020
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

cjcenizal added a commit that referenced this pull request Mar 6, 2020
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Feature:CCR and Remote Clusters release_note:skip Skip the PR/issue when compiling release notes Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more v7.7.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change plugin id for remote_clusters to remoteClusters
5 participants