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

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

Merged

Conversation

DianaDerevyankina
Copy link
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
@kibanamachine
Copy link
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants