Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Add xpack.apm.enabled to whitelist #72

Merged
merged 3 commits into from Feb 4, 2018
Merged

Conversation

sorenlouv
Copy link
Member

@sorenlouv sorenlouv commented Feb 2, 2018

APM in x-pack currently uses xpack.apm.ui.enabled but the plan is to move to xpack.apm.enabled for consistency with the other options. Since this is a breaking change we have to keep both until 7.0 before we can remove xpack.apm.ui.enabled.

cc @dadoonet

This is dependent on https://github.com/elastic/x-pack-kibana/pull/4489

@sorenlouv sorenlouv requested a review from jarpy February 2, 2018 23:23
@tylersmalley
Copy link
Contributor

@sqren, outside of adding this to the docker whitelist xpack.apm.enabled should already work, right?

@sorenlouv
Copy link
Member Author

sorenlouv commented Feb 2, 2018

@tylersmalley Ahh, I think you are right. Something just dawned on me - correct me if the following is wrong:

  1. there is a global Kibana setting that interprets xpack.<plugin-name>.enabled (eg. the plugin doesn't have to actively add support for it)

  2. The following is just a hack to hide APM from the menu - not actually disable APM https://github.com/elastic/x-pack-kibana/blob/2acc0ffc5c7733506c59f32b605726560c5b8a06/plugins/apm/index.js#L22-L28

So in short:

@sorenlouv
Copy link
Member Author

sorenlouv commented Feb 2, 2018

xpack.apm.ui.enabled was a hack we added for Cloud, so they can disable hide APM without triggering a restart of the server.

@tylersmalley
Copy link
Contributor

@sqren, yup that's exactly correct. This PR LGTM and https://github.com/elastic/x-pack-kibana/pull/4489 can be closed since Kibana handles it internally.

@jarpy jarpy merged commit 1de5e80 into master Feb 4, 2018
@jarpy jarpy self-assigned this Feb 4, 2018
@jarpy jarpy deleted the xpack-apm-enabled-whitelist branch February 4, 2018 22:44
Copy link
Contributor

@jarpy jarpy left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the help and persistence here.

@jarpy
Copy link
Contributor

jarpy commented Feb 4, 2018

6.1 c918997
6.2 e63704c
6.x fc7d358

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants