Move apm tutorial from apm plugin into apm_oss plugin #66432

DianaDerevyankina · 2020-05-13T15:53:27Z

Closes #65629

Summary

Moved tutorial and assets from apm to apm_oss plugin
Generated client side for apm_oss plugin to display the picture in apm tutorial
Added unregisterTutorial function in tutorials_registry.ts to let the apm plugin re-register the tutorial
Renamed some messages in translations files removing the xpack from their names

Checklist

Delete any items that are not applicable to this PR.

Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
Documentation was added for features that require explanation or tutorials
Unit or functional tests were updated or added to match the most common scenarios
This was checked for keyboard-only and screenreader accessibility
This renders correctly on smaller devices using a responsive layout. (You can test this in your browser
This was checked for cross-browser compatibility, including a check against IE11

For maintainers

This was checked for breaking API changes and was labeled appropriately

Closes elastic#65629

elasticmachine · 2020-05-13T15:53:31Z

Pinging @elastic/apm-ui (Team:apm)

flash1293 · 2020-05-14T11:39:34Z

src/plugins/apm_oss/public/index.ts

+ * under the License.
+ */
+
+import { ApmOssPlugin } from './plugin';


Why did you add the public plugin boilerplate? It looks like this is just a server side thing

@flash1293 I think it's ok cause we have one asset here: src/plugins/apm_oss/public/assets/apm.png

Ah, good point, missed that.

# Conflicts: # x-pack/plugins/translations/translations/ja-JP.json # x-pack/plugins/translations/translations/zh-CN.json

flash1293

Tested with the following config:

xpack.apm.enabled: false
xpack.cloud.enabled: false

and this looks mostly good to me (besides a bunch of nits).

flash1293 · 2020-05-18T15:43:05Z

x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts

@@ -4,7 +4,7 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-import { APICaller } from 'kibana/server';
+import { APICaller } from 'src/core/server';


This change seems like it's not necessary

flash1293 · 2020-05-18T15:43:13Z

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts

@@ -4,7 +4,7 @@
 * you may not use this file except in compliance with the Elastic License.
 */
 import { merge } from 'lodash';
-import { Logger, CallAPIOptions } from 'kibana/server';
+import { Logger, CallAPIOptions } from 'src/core/server';


This change seems like it's not necessary

flash1293 · 2020-05-18T15:43:20Z

x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts

@@ -21,7 +21,8 @@ import yaml from 'js-yaml';
 import { Client } from 'elasticsearch';
 import { argv } from 'yargs';
 import { promisify } from 'util';
-import { Logger } from 'kibana/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Logger } from 'src/core/server';


This change seems like it's not necessary

flash1293 · 2020-05-18T15:46:19Z

x-pack/plugins/apm/public/components/shared/Links/DiscoverLinks/DiscoverLink.tsx

@@ -11,7 +11,7 @@ import url from 'url';
 import rison, { RisonValue } from 'rison-node';
 import { useLocation } from '../../../../hooks/useLocation';
 import { getTimepickerRisonData } from '../rison_helpers';
-import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../../common/index_pattern_constants';
+import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../../../../../src/plugins/apm_oss/common/index_pattern_constants';


That's a small thing, but could you re-export this from apm_oss/public/index.ts? Same like here in the data plugin: https://github.com/flash1293/kibana/blob/15c0644c9756eb58e86cef7e7cd1ce8266bc7ed0/src/plugins/data/public/index.ts#L443

It's not done right everywhere, but we try to get there.

flash1293 · 2020-05-18T15:47:22Z

.i18nrc.json

@@ -56,7 +56,8 @@
    "visTypeVislib": "src/plugins/vis_type_vislib",
    "visTypeXy": "src/plugins/vis_type_xy",
    "visualizations": "src/plugins/visualizations",
-    "visualize": "src/plugins/visualize"
+    "visualize": "src/plugins/visualize",
+    "apm": "src/plugins/apm_oss"


Could you change that to apmOss to be consistent with other prefixes?

…aths

flash1293

LGTM, I think we can run this by the APM team

# Conflicts: # x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts

kibanamachine · 2020-05-20T10:34:35Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: b0e08ae

History

💚 Build #48718 succeeded ff2345e
💚 Build #48674 succeeded d85152f
💔 Build #48288 failed 3ee097a
💔 Build #48265 failed 0b87b9a
💔 Build #47714 failed 286a45f

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

cauemarcondes

LGTM

…ent/add-support-in-url-for-hidden-toggle * 'master' of github.com:elastic/kibana: (49 commits) [Uptime] Improve responsiveness details page (elastic#67034) skip flaky suite (elastic#66669) Revert "Integration of a static filesystem for the node_modules (elastic#47998)" (elastic#67124) Support api_integration/kibana/stats against remote hosts (elastic#53000) chore(NA): add module name mapper for src plugins on x-pack (elastic#67103) Change the error message on TSVB in order to be more user friendly (elastic#67090) [kbn/optimizer] poll parent process to avoid zombie processes (elastic#67059) [Visualize] Lazy load default editor, fix duplicated styles (elastic#66732) Bump styled-component dependencies (elastic#66611) Bump react-markdown dependencies (elastic#66615) Fix Core docs links (elastic#66977) Timelion graph is not refreshing content after searching or filtering (elastic#67023) Remove `--xpack.endpoint.enabled=true` from README.md file (elastic#67053) Move apm tutorial from apm plugin into apm_oss plugin (elastic#66432) [Logs UI] Restore call to `UsageCollector.countLogs` (elastic#67051) Remove unused license check result from LP Security plugin (elastic#66966) [Saved Objects] adds support for including hidden types in saved objects client (elastic#66879) [Discover] Deangularize timechart header (elastic#66532) [Discover] Improve and unskip a11y context view test (elastic#66959) [SIEM] Refactor Timeline.timelineType draft to Timeline.status draft (elastic#66864) ... # Conflicts: # x-pack/plugins/index_management/__jest__/client_integration/helpers/home.helpers.ts

Introduced in elastic#66432 and I have a more thorough PR to prevent imports in server from public in elastic#67149 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

* master: [apm] Annotation API documentation (elastic#65963) [Uptime] Improve responsiveness details page (elastic#67034) skip flaky suite (elastic#66669) Revert "Integration of a static filesystem for the node_modules (elastic#47998)" (elastic#67124) Support api_integration/kibana/stats against remote hosts (elastic#53000) chore(NA): add module name mapper for src plugins on x-pack (elastic#67103) Change the error message on TSVB in order to be more user friendly (elastic#67090) [kbn/optimizer] poll parent process to avoid zombie processes (elastic#67059) [Visualize] Lazy load default editor, fix duplicated styles (elastic#66732) Bump styled-component dependencies (elastic#66611) Bump react-markdown dependencies (elastic#66615) Fix Core docs links (elastic#66977) Timelion graph is not refreshing content after searching or filtering (elastic#67023) Remove `--xpack.endpoint.enabled=true` from README.md file (elastic#67053) Move apm tutorial from apm plugin into apm_oss plugin (elastic#66432) [Logs UI] Restore call to `UsageCollector.countLogs` (elastic#67051) Remove unused license check result from LP Security plugin (elastic#66966)

* master: (21 commits) [Alerting] Hides the `alert` SavedObjects type (elastic#66719) skip flaky suite (elastic#66869) fix visual baseline tests [kbn/optimizer] require fsevents on macos (elastic#67147) [APM] Fix obscured service map connections (elastic#67129) [apm] Annotation API documentation (elastic#65963) [Uptime] Improve responsiveness details page (elastic#67034) skip flaky suite (elastic#66669) Revert "Integration of a static filesystem for the node_modules (elastic#47998)" (elastic#67124) Support api_integration/kibana/stats against remote hosts (elastic#53000) chore(NA): add module name mapper for src plugins on x-pack (elastic#67103) Change the error message on TSVB in order to be more user friendly (elastic#67090) [kbn/optimizer] poll parent process to avoid zombie processes (elastic#67059) [Visualize] Lazy load default editor, fix duplicated styles (elastic#66732) Bump styled-component dependencies (elastic#66611) Bump react-markdown dependencies (elastic#66615) Fix Core docs links (elastic#66977) Timelion graph is not refreshing content after searching or filtering (elastic#67023) Remove `--xpack.endpoint.enabled=true` from README.md file (elastic#67053) Move apm tutorial from apm plugin into apm_oss plugin (elastic#66432) ...

* 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

kibanamachine · 2020-05-22T11:48:44Z

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

kibanamachine · 2020-05-25T11:58:44Z

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

kibanamachine · 2020-05-26T12:08:44Z

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

…67179) * Move apm tutorial from apm plugin into apm_oss plugin (#66432) * Move apm tutorial from apm plugin into apm_oss plugin Closes #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 * Fixed some eslint issues * Fix apmOSSPluginSetupMock

* 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 · 2020-06-02T14:28:44Z

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

…67619) * Move apm tutorial from apm plugin into apm_oss plugin (#66432) * Move apm tutorial from apm plugin into apm_oss plugin Closes #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 * Fix issues produced by mistake through merge conflict * Fix some eslint issues * Fix type check * Remove unused translations

Move apm tutorial from apm plugin into apm_oss plugin

286a45f

Closes elastic#65629

DianaDerevyankina added Feature:Home Kibana home application v8.0.0 v7.9.0 labels May 13, 2020

DianaDerevyankina requested a review from alexwizp May 13, 2020 15:53

DianaDerevyankina self-assigned this May 13, 2020

botelastic bot added the Team:APM All issues that need APM UI Team support label May 13, 2020

DianaDerevyankina requested a review from flash1293 May 13, 2020 15:54

flash1293 reviewed May 14, 2020

View reviewed changes

DianaDerevyankina added 5 commits May 15, 2020 10:54

Merge branch 'DianaDerevyankina' into Diana/65629

a0cf025

Fix types issues and some paths

0b87b9a

Add unregisterTutorial to tutorials_registry.mock

3ee097a

Merge branch 'DianaDerevyankina' into Diana/65629

09fa018

# Conflicts: # x-pack/plugins/translations/translations/ja-JP.json # x-pack/plugins/translations/translations/zh-CN.json

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

d85152f

flash1293 reviewed May 18, 2020

View reviewed changes

Rename apm path in .i18nrc.json into apmOss and revert some imports p…

ff2345e

…aths

DianaDerevyankina force-pushed the Diana/65629 branch from 11c4a2c to ff2345e Compare May 18, 2020 17:07

flash1293 approved these changes May 19, 2020

View reviewed changes

alexwizp approved these changes May 19, 2020

View reviewed changes

DianaDerevyankina marked this pull request as ready for review May 20, 2020 07:49

DianaDerevyankina requested a review from a team as a code owner May 20, 2020 07:49

flash1293 added the release_note:skip Skip the PR/issue when compiling release notes label May 20, 2020

Merge branch 'DianaDerevyankina' into Diana/65629

b0e08ae

# Conflicts: # x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts

cauemarcondes approved these changes May 20, 2020

View reviewed changes

DianaDerevyankina merged commit 27fe265 into elastic:master May 20, 2020

DianaDerevyankina mentioned this pull request May 20, 2020

[7.x] Move apm tutorial from apm plugin into apm_oss plugin (#66432) #67100

Closed

DianaDerevyankina mentioned this pull request May 21, 2020

[7.x] Move apm tutorial from apm plugin into apm_oss plugin (#66432) #67179

Merged

kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 22, 2020

kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 26, 2020

DianaDerevyankina mentioned this pull request May 28, 2020

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

Merged

flash1293 added the v7.8.0 label May 29, 2020

kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jun 2, 2020

kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jun 2, 2020

cauemarcondes mentioned this pull request Aug 3, 2020

Broken/Missing images #72317

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move apm tutorial from apm plugin into apm_oss plugin #66432

Move apm tutorial from apm plugin into apm_oss plugin #66432

DianaDerevyankina commented May 13, 2020

elasticmachine commented May 13, 2020

flash1293 May 14, 2020

alexwizp May 15, 2020

flash1293 May 15, 2020

flash1293 left a comment

flash1293 May 18, 2020

flash1293 May 18, 2020

flash1293 May 18, 2020

flash1293 May 18, 2020

flash1293 May 18, 2020

flash1293 left a comment

kibanamachine commented May 20, 2020

cauemarcondes left a comment

kibanamachine commented May 22, 2020

kibanamachine commented May 25, 2020

kibanamachine commented May 26, 2020

kibanamachine commented Jun 2, 2020

Move apm tutorial from apm plugin into apm_oss plugin #66432

Move apm tutorial from apm plugin into apm_oss plugin #66432

Conversation

DianaDerevyankina commented May 13, 2020

Summary

Checklist

For maintainers

elasticmachine commented May 13, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flash1293 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flash1293 left a comment

Choose a reason for hiding this comment

kibanamachine commented May 20, 2020

💚 Build Succeeded

History

cauemarcondes left a comment

Choose a reason for hiding this comment

kibanamachine commented May 22, 2020

kibanamachine commented May 25, 2020

kibanamachine commented May 26, 2020

kibanamachine commented Jun 2, 2020