Skip to content

Conversation

@pgayvallet
Copy link
Contributor

@pgayvallet pgayvallet commented Sep 10, 2020

Summary

Follow up of #76730.

Add cGroupOverrides to the legacy config to avoid config validation failures when using it, and update kibana-docker script to use the new config keys

@pgayvallet pgayvallet requested a review from a team as a code owner September 10, 2020 14:28
@pgayvallet pgayvallet added release_note:skip Skip the PR/issue when compiling release notes Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v7.10.0 labels Sep 10, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-platform (Team:Platform)

@pgayvallet pgayvallet requested a review from a team as a code owner September 10, 2020 15:14
Comment on lines +21 to 24
ops.cGroupOverrides.cpuPath
ops.cGroupOverrides.cpuAcctPath
cpu.cgroup.path.override
cpuacct.cgroup.path.override
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added the new ones, but also kept the deprecated name to avoid a breaking change


ops: Joi.object({
interval: Joi.number().default(5000),
cGroupOverrides: HANDLED_IN_NEW_PLATFORM,
Copy link
Contributor

Choose a reason for hiding this comment

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

We can probably remove old the schema up on lines 52-66 now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right. I had to add the explicit definition in ops though, as

cpuPath: this.config.get('ops.cGroupOverrides.cpuPath'),
cpuAcctPath: this.config.get('ops.cGroupOverrides.cpuAcctPath'),

is throwing error when trying to access the property if the schema is undefined (which make sense, HANDLED_IN_NEW_PLATFORM is only meant to be used for config values that are ONLY used in KP)

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@pgayvallet pgayvallet merged commit 1bdff6e into elastic:master Sep 11, 2020
pgayvallet added a commit to pgayvallet/kibana that referenced this pull request Sep 11, 2020
* add  cGroupOverrides to the legacy config

* update missing usages

* remove old cpu/cgroup schema
pgayvallet added a commit that referenced this pull request Sep 11, 2020
* add  cGroupOverrides to the legacy config

* update missing usages

* remove old cpu/cgroup schema
jloleysens added a commit to jloleysens/kibana that referenced this pull request Sep 14, 2020
…s-for-710

* 'master' of github.com:elastic/kibana: (65 commits)
  Separate url forwarding logic and legacy services (elastic#76892)
  Bump yargs-parser to v13.1.2+ (elastic#77009)
  [Ingest Manager] Shared Fleet agent policy action (elastic#76013)
  [Search] Re-add support for aborting when a connection is closed (elastic#76470)
  [Search] Remove long-running query pop-up (elastic#75385)
  [Monitoring] Fix UI error when alerting is not available (elastic#77179)
  do not log plugin id format warning in dist mode (elastic#77134)
  [ML] Improving client side error handling (elastic#76743)
  [Alerting][Connectors] Refactor IBM Resilient: Generic Implementation (phase one) (elastic#74357)
  [Docs] some basic searchsource api docs (elastic#77038)
  add  cGroupOverrides to the legacy config (elastic#77180)
  Change saved object bulkUpdate to work across multiple namespaces (elastic#75478)
  [Security Solution][Resolver] Replace Selectable popover with badges (elastic#76997)
  Removing ml-state index from archive (elastic#77143)
  [Security Solution] Add unit tests for histograms (elastic#77081)
  [Lens] Filters aggregation  (elastic#75635)
  [Enterprise Search] Update WS Overview logic to use new config data (elastic#77122)
  Cleanup type output before building new types (elastic#77211)
  [Security Solution] Use safe type in resolver backend (elastic#76969)
  Use proper lodash syntax (elastic#77105)
  ...

# Conflicts:
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:skip Skip the PR/issue when compiling release notes Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v7.10.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants