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

[APM] Auto attachment for java agent beta in APM integration settings #119131

Merged
merged 27 commits into from
Dec 7, 2021

Conversation

ogupte
Copy link
Contributor

@ogupte ogupte commented Nov 19, 2021

Closes #108513.

RuntimeAttachment component can be tested in storybook: yarn storybook apm

Screen Shot 2021-12-03 at 4 57 08 PM

Screen Shot 2021-12-03 at 4 56 47 PM

Remaining Tasks

This requires the pre-release version of the APM package which exist in the staging and snapshot package-registry deployments (https://epr-snapshot.elastic.co/package/apm/8.0.0-dev4/), to point to snapshot package registry in kibana, set:

// kibana.dev.yml

xpack.fleet.registryUrl: https://epr-snapshot.elastic.co

@ogupte ogupte added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes skip-ci labels Nov 19, 2021
@ogupte ogupte force-pushed the apm-108513-auto-attach-java-agent branch from bce908a to 4497c91 Compare December 2, 2021 06:29
@ogupte ogupte removed the skip-ci label Dec 3, 2021
@ogupte ogupte marked this pull request as ready for review December 3, 2021 22:03
@ogupte ogupte requested review from a team as code owners December 3, 2021 22:03
@@ -8,7 +8,7 @@ import semverParse from 'semver/functions/parse';

export const POLICY_ELASTIC_AGENT_ON_CLOUD = 'policy-elastic-agent-on-cloud';

export const SUPPORTED_APM_PACKAGE_VERSION = '7.16.0';
export const SUPPORTED_APM_PACKAGE_VERSION = '8.0.0-dev4'; // TODO update to just '8.0.0' once published
Copy link
Contributor Author

Choose a reason for hiding this comment

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

once 8.0.0 is published in staging or snapshot deployments of the package-registry, this needs to be updated.

@botelastic botelastic bot added Team:APM All issues that need APM UI Team support Team:Fleet Team label for Observability Data Collection Fleet team labels Dec 3, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@cauemarcondes cauemarcondes added auto-backport Deprecated - use backport:version if exact versions are needed release_note:enhancement and removed release_note:skip Skip the PR/issue when compiling release notes labels Dec 7, 2021
@cauemarcondes cauemarcondes requested a review from smith December 7, 2021 20:33
@cauemarcondes cauemarcondes enabled auto-merge (squash) December 7, 2021 20:33
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
apm 1174 1215 +41

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
apm 2.8MB 3.0MB ⚠️ +209.0KB
fleet 643.4KB 643.4KB +24.0B
total +209.1KB

History

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

@cauemarcondes cauemarcondes merged commit 2a937d0 into elastic:main Dec 7, 2021
@kibanamachine
Copy link
Contributor

The following labels were identified as gaps in your version labels and will be added automatically:

  • v8.1.0

If any of these should not be on your pull request, please manually remove them.

kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Dec 7, 2021
…elastic#119131)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* adds initial discovery rule for `include-vmargs elastic.apm.attach=true`

* adds support for type descriptions

* adding java_attacher_agent_version field

* fixing some stuff

* adding link to doc

* adding internationalization

* updating user description

* fixing default version

* setting to null when disabled

* - fixes encoding and decoding discovery rules yaml
- adds workaround for extra 'elasticsearch' field on integration policy updates
- updates migration package version from 7.16.0 to 8.0.0-dev4

* addressing pr comments

* fixing ci

* fixing elements not visible while dragging

* addressing PR changes

* beta

* adding tooltip back

* addressing pr comments

Co-authored-by: cauemarcondes <[email protected]>
Co-authored-by: Kibana Machine <[email protected]>
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
8.0

This backport PR will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Dec 7, 2021
…#119131) (#120691)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* adds initial discovery rule for `include-vmargs elastic.apm.attach=true`

* adds support for type descriptions

* adding java_attacher_agent_version field

* fixing some stuff

* adding link to doc

* adding internationalization

* updating user description

* fixing default version

* setting to null when disabled

* - fixes encoding and decoding discovery rules yaml
- adds workaround for extra 'elasticsearch' field on integration policy updates
- updates migration package version from 7.16.0 to 8.0.0-dev4

* addressing pr comments

* fixing ci

* fixing elements not visible while dragging

* addressing PR changes

* beta

* adding tooltip back

* addressing pr comments

Co-authored-by: cauemarcondes <[email protected]>
Co-authored-by: Kibana Machine <[email protected]>

Co-authored-by: Oliver Gupte <[email protected]>
Co-authored-by: cauemarcondes <[email protected]>
hop-dev added a commit to hop-dev/kibana that referenced this pull request Dec 16, 2021
Although this field is returned in the GET response, we do not allow it to be set through the policy update API, so it must be omitted first.
Originally fixed in elastic#119131.

Co-authored-by: ogupte <[email protected]>
hop-dev added a commit that referenced this pull request Dec 16, 2021
Although this field is returned in the GET response, we do not allow it to be set through the policy update API, so it must be omitted first.
Originally fixed in #119131.

Co-authored-by: ogupte <[email protected]>

Co-authored-by: ogupte <[email protected]>
@cauemarcondes cauemarcondes added the apm:test-plan-done Pull request that was successfully tested during the test plan label Dec 20, 2021
@cauemarcondes
Copy link
Contributor

tests okay
Screen Shot 2021-12-20 at 1 58 34 PM
Screen Shot 2021-12-20 at 2 01 20 PM

TinLe pushed a commit to TinLe/kibana that referenced this pull request Dec 22, 2021
…elastic#119131)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* adds initial discovery rule for `include-vmargs elastic.apm.attach=true`

* adds support for type descriptions

* adding java_attacher_agent_version field

* fixing some stuff

* adding link to doc

* adding internationalization

* updating user description

* fixing default version

* setting to null when disabled

* - fixes encoding and decoding discovery rules yaml
- adds workaround for extra 'elasticsearch' field on integration policy updates
- updates migration package version from 7.16.0 to 8.0.0-dev4

* addressing pr comments

* fixing ci

* fixing elements not visible while dragging

* addressing PR changes

* beta

* adding tooltip back

* addressing pr comments

Co-authored-by: cauemarcondes <[email protected]>
Co-authored-by: Kibana Machine <[email protected]>
ogupte added a commit to ogupte/kibana that referenced this pull request Jan 19, 2022
Although this field is returned in the GET response, we do not allow it to be set through the policy update API, so it must be omitted first.
Originally fixed in elastic#119131.

Co-authored-by: ogupte <[email protected]>

Co-authored-by: ogupte <[email protected]>
ogupte added a commit that referenced this pull request Jan 19, 2022
Although this field is returned in the GET response, we do not allow it to be set through the policy update API, so it must be omitted first.
Originally fixed in #119131.

Co-authored-by: ogupte <[email protected]>

Co-authored-by: ogupte <[email protected]>

Co-authored-by: Mark Hopkin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
apm:test-plan-8.0.0 apm:test-plan-done Pull request that was successfully tested during the test plan auto-backport Deprecated - use backport:version if exact versions are needed release_note:enhancement Team:APM All issues that need APM UI Team support Team:Fleet Team label for Observability Data Collection Fleet team v8.0.0 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[APM] Fleet: Auto attachment for java agent beta