[7.x] Move apm tutorial from apm plugin into apm_oss plugin (#66432)#67179
Merged
DianaDerevyankina merged 4 commits intoelastic:7.xfrom May 26, 2020
Merged
Conversation
* 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/tutorial/instructions/apm_agent_instructions.ts
Member
|
Let me know when this goes in and I will hold off on backporting #66506 to reduce the merge conflicts. |
Contributor
|
@elasticmachine merge upstream |
Contributor
|
merge conflict between base and head |
a0ea7ee to
64f8997
Compare
# 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
64f8997 to
2ebe0ec
Compare
Contributor
💚 Build SucceededHistory
To update your PR or re-run it, just comment with: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backports the following commits to 7.x: