Skip to content

[7.8] Move apm tutorial from apm plugin into apm_oss plugin (#66432)#67619

Merged
DianaDerevyankina merged 7 commits intoelastic:7.8from
DianaDerevyankina:backport/7.8/pr-66432
Jun 2, 2020
Merged

[7.8] Move apm tutorial from apm plugin into apm_oss plugin (#66432)#67619
DianaDerevyankina merged 7 commits intoelastic:7.8from
DianaDerevyankina:backport/7.8/pr-66432

Conversation

@DianaDerevyankina
Copy link
Copy Markdown
Contributor

Backports the following commits to 7.8:

* Move apm tutorial from apm plugin into apm_oss plugin

Closes elastic#65629

* Fix types issues and some paths

* Add unregisterTutorial to tutorials_registry.mock

* Add apm path to .i18nrc.json to fix internationalization error

* Rename apm path in .i18nrc.json into apmOss and revert some imports paths
# Conflicts:
#	x-pack/plugins/apm/server/plugin.ts
#	x-pack/plugins/apm/server/tutorial/elastic_cloud.ts
#	x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
#	x-pack/plugins/apm/server/tutorial/index.ts
#	x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
#	x-pack/plugins/apm/server/tutorial/instructions/apm_server_instructions.ts
#	x-pack/plugins/translations/translations/ja-JP.json
#	x-pack/plugins/translations/translations/zh-CN.json
@DianaDerevyankina DianaDerevyankina added the backport This PR is a backport of another PR label May 28, 2020
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

History

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

@DianaDerevyankina DianaDerevyankina merged commit 3fc974b into elastic:7.8 Jun 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants