Skip to content

[APM] Removes the apm_oss plugin and deprecates related configs#113364

Merged
ogupte merged 26 commits intoelastic:masterfrom
ogupte:apm-109104-hardcoded-data-streams
Oct 13, 2021
Merged

[APM] Removes the apm_oss plugin and deprecates related configs#113364
ogupte merged 26 commits intoelastic:masterfrom
ogupte:apm-109104-hardcoded-data-streams

Conversation

@ogupte
Copy link
Contributor

@ogupte ogupte commented Sep 29, 2021 •
edited
Loading

Closes #108160 and #109104.

Deletes the apm_oss plugin and removes it as a dependency of the apm plugin. Configurations related to apm_oss have been deprecated and moved to the xpack.apm.indices* config path. The new configurations are supported in the APMEventClient when targeting events. Also updates the saved objects mapping to save the index settings where the index config names are implied to be under the xpack.apm.indices.* path. The saved object mapping for apm-indices are migrated on kibana setup.

Also updates the default index configurations to target data streams at the config schema level.

Configuration changes:
apm_oss.errorIndices -> xpack.apm.indices.error
apm_oss.metricsIndices -> xpack.apm.indices.metric
apm_oss.onboardingIndices -> xpack.apm.indices.onboarding
apm_oss.sourcemapIndices -> xpack.apm.indices.sourcemap
apm_oss.spanIndices -> xpack.apm.indices.span
apm_oss.transactionIndices -> xpack.apm.indices.transaction

@ogupte ogupte requested a review from a team September 29, 2021 08:27
@botelastic botelastic bot added the Team:APM - DEPRECATED Use Team:obs-ux-infra_services. label Sep 29, 2021
@ogupte ogupte force-pushed the apm-109104-hardcoded-data-streams branch from 1a65513 to 7483967 Compare September 29, 2021 08:30
sorenlouv
sorenlouv reviewed Sep 29, 2021
View reviewed changes
sorenlouv
sorenlouv reviewed Sep 29, 2021
View reviewed changes
sorenlouv
sorenlouv reviewed Sep 29, 2021
View reviewed changes
sorenlouv
sorenlouv requested changes Sep 29, 2021
View reviewed changes
Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

I might be mistaken but it looks like we are not migrating the saved object. I think we should do that so we can remove all references of the old apm_oss names

@ogupte ogupte requested review from a team as code owners October 1, 2021 21:50
@botelastic botelastic bot added the Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability label Oct 1, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 1, 2021

Pinging @elastic/uptime (Team:uptime)

@kibanamachine
Copy link
Contributor

kibanamachine commented Oct 1, 2021

⏳ Build in-progress, with failures

Failed CI Steps

History

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

sorenlouv
sorenlouv approved these changes Oct 1, 2021
View reviewed changes
Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

lgtm

jportner
jportner approved these changes Oct 4, 2021
View reviewed changes
Copy link
Contributor

@jportner jportner left a comment

Choose a reason for hiding this comment

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

Security changes (modifying functional test mappings files to change apm_oss to xpack.apm) LGTM

@smith smith mentioned this pull request Oct 11, 2021
Closed
100 tasks
sorenlouv
sorenlouv reviewed Oct 12, 2021
View reviewed changes
sorenlouv
sorenlouv reviewed Oct 12, 2021
View reviewed changes
x-pack/plugins/apm/server/index.ts
] = `metrics-apm*,${mergedConfig['apm_oss.metricsIndices']}`;

return mergedConfig;
}
Copy link
Member

@sorenlouv sorenlouv Oct 12, 2021

Choose a reason for hiding this comment

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

Nice 👍

@sorenlouv sorenlouv mentioned this pull request Oct 12, 2021
Merged
@ogupte ogupte enabled auto-merge (squash) October 13, 2021 05:25
@ogupte ogupte added the auto-backport Deprecated - use backport:version if exact versions are needed label Oct 13, 2021
@kibanamachine
Copy link
Contributor

kibanamachine commented Oct 13, 2021

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
apmOss 5 - -5

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
apm 42 39 -3
apmOss 6 - -6
total -9

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.7MB 2.7MB -68.0B
observability 363.2KB 363.1KB -18.0B
total -86.0B

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
apmOss 1.3KB - -1.3KB

Saved Objects .kibana field count

Every field in each saved object type adds overhead to Elasticsearch. Kibana needs to keep the total field count below Elasticsearch's default limit of 1000 fields. Only specify field mappings for the fields you wish to search on or query. See https://www.elastic.co/guide/en/kibana/master/development-plugin-saved-objects.html#_mappings

id before after diff
apm-indices 8 7 -1
Unknown metric groups

API count

id before after diff
apm 42 39 -3
apmOss 6 - -6
total -9

History

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

@ogupte ogupte merged commit 3d75154 into elastic:master Oct 13, 2021
@kibanamachine
Copy link
Contributor

kibanamachine commented Oct 13, 2021

💔 Backport failed

Status Branch Result
❌ 7.x Commit could not be cherrypicked due to conflicts

To backport manually run:
node scripts/backport --pr 113364

@ogupte ogupte mentioned this pull request Oct 13, 2021
Merged
ogupte added a commit to ogupte/kibana that referenced this pull request Oct 13, 2021
@ogupte
[APM] Removes the apm_oss plugin and deprecates related configs (elas…
255fa41 
…tic#113364)

* [APM] Removes the apm_oss plugin and deprecates related configs (elastic#108160)

* removes commented lines

* fixes typescript errors

* performs start up migration on the saved objects mapping for apm-indices

* removes all references to the deprecated apm_oss.* config paths in APM

* fixes missing bundle error

* fixes type error

* fixes eslint error with disabled rules

* fixes saved object mappings for es_archvices for tests

* fixes eslint error

* Updates default index values to include the more general apm-*. Fixes broken tests.

* removing unused configs from the config path migration: apm_oss.indexPattern and apm_oss.fleetMode

* - replaces full index configuration paths with references in the `xpack.apm.indices` namespace
- removes mergeConfig function and test

* fixes proxy mock object in unit test

* fixes linting issues

* PR feedback and failed test

* changes the configs at `xpack.apm.indices.*` from plural to singular to match `processor.event` values
# Conflicts:
#	x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
#	x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
@bmorelli25 bmorelli25 mentioned this pull request Oct 13, 2021
Closed
@ogupte ogupte mentioned this pull request Oct 13, 2021
Closed
@bmorelli25 bmorelli25 mentioned this pull request Oct 13, 2021
Merged
@ogupte ogupte mentioned this pull request Oct 13, 2021
Merged
ogupte added a commit that referenced this pull request Oct 13, 2021
@ogupte
[APM] Removes the apm_oss plugin and deprecates related configs (#113364
61dc25d 
) (#114873)

* [APM] Removes the apm_oss plugin and deprecates related configs (#108160)

* removes commented lines

* fixes typescript errors

* performs start up migration on the saved objects mapping for apm-indices

* removes all references to the deprecated apm_oss.* config paths in APM

* fixes missing bundle error

* fixes type error

* fixes eslint error with disabled rules

* fixes saved object mappings for es_archvices for tests

* fixes eslint error

* Updates default index values to include the more general apm-*. Fixes broken tests.

* removing unused configs from the config path migration: apm_oss.indexPattern and apm_oss.fleetMode

* - replaces full index configuration paths with references in the `xpack.apm.indices` namespace
- removes mergeConfig function and test

* fixes proxy mock object in unit test

* fixes linting issues

* PR feedback and failed test

* changes the configs at `xpack.apm.indices.*` from plural to singular to match `processor.event` values
# Conflicts:
#	x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
#	x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
@gbamparop gbamparop mentioned this pull request Oct 21, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smith smith smith left review comments

@sorenlouv sorenlouv sorenlouv approved these changes

@tsullivan tsullivan tsullivan approved these changes

@justinkambic justinkambic justinkambic approved these changes

@jonathan-buttner jonathan-buttner jonathan-buttner approved these changes

+2 more reviewers

@spalger spalger spalger approved these changes

@jportner jportner jportner approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

auto-backport Deprecated - use backport:version if exact versions are needed release_note:deprecation Team:APM - DEPRECATED Use Team:obs-ux-infra_services. Team:Uptime - DEPRECATED Synthetics & RUM sub-team of Application Observability v7.16.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[APM] Deprecate apm_oss app

10 participants

@ogupte @elasticmachine @kibanamachine @sorenlouv @smith @tsullivan @spalger @jportner @justinkambic @jonathan-buttner