moving files

cauemarcondes · Jun 23, 2021 · 7baf6a2 · 7baf6a2
1 parent d22b841
commit 7baf6a2
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 11 deletions.
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
@@ -177,12 +177,12 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
 
     pluginSetupDeps.home?.tutorials.registerCustomComponent(
       'TutorialConfigAgent',
-      () => import('./components/shared/tutorial/config_agent')
+      () => import('./tutorial/config_agent')
     );
 
     pluginSetupDeps.home?.tutorials.registerCustomComponent(
       'TutorialConfigAgentRumScript',
-      () => import('./components/shared/tutorial/config_agent/rum_script')
+      () => import('./tutorial/config_agent/rum_script')
     );
 
     plugins.observability.dashboard.register({

diff --git a/.../tutorial/config_agent/commands/django.ts → .../tutorial/config_agent/commands/django.ts b/.../tutorial/config_agent/commands/django.ts → .../tutorial/config_agent/commands/django.ts
diff --git a/.../tutorial/config_agent/commands/dotnet.ts → .../tutorial/config_agent/commands/dotnet.ts b/.../tutorial/config_agent/commands/dotnet.ts → .../tutorial/config_agent/commands/dotnet.ts
@@ -4,8 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-// TODO: ${'http://localhost:8200'}' fallback server_url
-
 export const dotnet = `{
 "ElasticApm": {
 "SecretToken": "{{{secretToken}}}",

diff --git a/...d/tutorial/config_agent/commands/flask.ts → ...c/tutorial/config_agent/commands/flask.ts b/...d/tutorial/config_agent/commands/flask.ts → ...c/tutorial/config_agent/commands/flask.ts
diff --git a/...onfig_agent/commands/get_commands.test.ts → ...onfig_agent/commands/get_commands.test.ts b/...onfig_agent/commands/get_commands.test.ts → ...onfig_agent/commands/get_commands.test.ts
diff --git a/...ial/config_agent/commands/get_commands.ts → ...ial/config_agent/commands/get_commands.ts b/...ial/config_agent/commands/get_commands.ts → ...ial/config_agent/commands/get_commands.ts
diff --git a/...ared/tutorial/config_agent/commands/go.ts → ...blic/tutorial/config_agent/commands/go.ts b/...ared/tutorial/config_agent/commands/go.ts → ...blic/tutorial/config_agent/commands/go.ts
diff --git a/...ed/tutorial/config_agent/commands/java.ts → ...ic/tutorial/config_agent/commands/java.ts b/...ed/tutorial/config_agent/commands/java.ts → ...ic/tutorial/config_agent/commands/java.ts
diff --git a/...ed/tutorial/config_agent/commands/node.ts → ...ic/tutorial/config_agent/commands/node.ts b/...ed/tutorial/config_agent/commands/node.ts → ...ic/tutorial/config_agent/commands/node.ts
diff --git a/...red/tutorial/config_agent/commands/php.ts → ...lic/tutorial/config_agent/commands/php.ts b/...red/tutorial/config_agent/commands/php.ts → ...lic/tutorial/config_agent/commands/php.ts
diff --git a/...ed/tutorial/config_agent/commands/rack.ts → ...ic/tutorial/config_agent/commands/rack.ts b/...ed/tutorial/config_agent/commands/rack.ts → ...ic/tutorial/config_agent/commands/rack.ts
diff --git a/...d/tutorial/config_agent/commands/rails.ts → ...c/tutorial/config_agent/commands/rails.ts b/...d/tutorial/config_agent/commands/rails.ts → ...c/tutorial/config_agent/commands/rails.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-// TODO: ${'http://localhost:8200'}' fallback server_url
 export const rails = `# config/elastic_apm.yml:
 
 # Set the service name - allowed characters: a-z, A-Z, 0-9, -, _ and space

diff --git a/...red/tutorial/config_agent/commands/rum.ts → ...lic/tutorial/config_agent/commands/rum.ts b/...red/tutorial/config_agent/commands/rum.ts → ...lic/tutorial/config_agent/commands/rum.ts
@@ -7,7 +7,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-// TODO: doesn't have token
 export const rum = `import { init as initApm } from '@elastic/apm-rum'
 var apm = initApm({
 
@@ -48,13 +47,12 @@ var apm = initApm({
   environment: 'production'
 })`;
 
-// TODO: doesn't have token/url
 export const rumScript = `\
 <script src="https://your-cdn-host.com/path/to/elastic-apm-rum.umd.min.js" crossorigin></script>
 <script>
   elasticApm.init({
     serviceName: 'your-app-name',
-    serverUrl: 'http://localhost:8200',
+    serverUrl: '{{{apmServerUrl}}}',
   })
 </script>
 `;
diff --git a/...ponents/shared/tutorial/copy_commands.tsx → ...c/tutorial/config_agent/copy_commands.tsx b/...ponents/shared/tutorial/copy_commands.tsx → ...c/tutorial/config_agent/copy_commands.tsx
diff --git a/...l/config_agent/get_policy_options.test.ts → ...l/config_agent/get_policy_options.test.ts b/...l/config_agent/get_policy_options.test.ts → ...l/config_agent/get_policy_options.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { getPolicyOptions } from './get_policy_options';
-import { APIReturnType } from '../../../../services/rest/createCallApmApi';
+import { APIReturnType } from '../../services/rest/createCallApmApi';
 
 type APIResponseType = APIReturnType<'GET /api/apm/fleet/agents'>;
 

diff --git a/...torial/config_agent/get_policy_options.ts → ...torial/config_agent/get_policy_options.ts b/...torial/config_agent/get_policy_options.ts → ...torial/config_agent/get_policy_options.ts
diff --git a/...ared/tutorial/config_agent/index.test.tsx → ...blic/tutorial/config_agent/index.test.tsx b/...ared/tutorial/config_agent/index.test.tsx → ...blic/tutorial/config_agent/index.test.tsx
diff --git a/...ts/shared/tutorial/config_agent/index.tsx → ...pm/public/tutorial/config_agent/index.tsx b/...ts/shared/tutorial/config_agent/index.tsx → ...pm/public/tutorial/config_agent/index.tsx
@@ -15,8 +15,8 @@ import { i18n } from '@kbn/i18n';
 import { HttpStart } from 'kibana/public';
 import React, { useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
-import { APIReturnType } from '../../../../services/rest/createCallApmApi';
-import { CopyCommands } from '../copy_commands';
+import { APIReturnType } from '../..//services/rest/createCallApmApi';
+import { CopyCommands } from './copy_commands';
 import { PolicySelectorOption, PolicySelector } from './policy_selector';
 import { getCommands } from './commands/get_commands';
 import { getPolicyOptions } from './get_policy_options';
@@ -58,6 +58,7 @@ function TutorialConfigAgent({
   });
   const [isLoading, setIsLoading] = useState(true);
   const [selectedOption, setSelectedOption] = useState<PolicySelectorOption>();
+  console.log('### caue ~ selectedOption', selectedOption);
 
   useEffect(() => {
     async function fetchData() {

diff --git a/...tutorial/config_agent/policy_selector.tsx → ...tutorial/config_agent/policy_selector.tsx b/...tutorial/config_agent/policy_selector.tsx → ...tutorial/config_agent/policy_selector.tsx
@@ -62,6 +62,7 @@ export function PolicySelector({
         options={options}
         selectedOptions={selectedOption ? [selectedOption] : []}
         onChange={(selectedOptions) => {
+          console.log('### caue ~ selectedOptions', selectedOptions);
           onChange(selectedOptions[0]);
         }}
       />

diff --git a/...ared/tutorial/config_agent/rum_script.tsx → ...blic/tutorial/config_agent/rum_script.tsx b/...ared/tutorial/config_agent/rum_script.tsx → ...blic/tutorial/config_agent/rum_script.tsx
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
      * 2.0.
      */
-    // TODO: ${'http://localhost:8200'}' fallback server_url
     export const rails = `# config/elastic_apm.yml:
     # Set the service name - allowed characters: a-z, A-Z, 0-9, -, _ and space
@@ Expand Down @@