Merge branch 'master' into reporting/prevent-sending-telemetry

src/plugins/apm_oss/public/index.ts

@@ -14,5 +14,3 @@ export function plugin() {
   return new ApmOssPlugin();
 }
 export { ApmOssPluginSetup, ApmOssPluginStart } from './types';
-
-export { APM_STATIC_INDEX_PATTERN_ID } from '../common/index_pattern_constants';

src/plugins/apm_oss/server/index.ts

@@ -7,7 +7,6 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import apmIndexPattern from './tutorial/index_pattern.json';
 import { PluginInitializerContext } from '../../../core/server';
 import { APMOSSPlugin } from './plugin';
 
@@ -32,20 +31,3 @@ export function plugin(initializerContext: PluginInitializerContext) {
 export type APMOSSConfig = TypeOf<typeof config.schema>;
 
 export { APMOSSPluginSetup } from './plugin';
-
-export { apmIndexPattern };
-
-export { APM_STATIC_INDEX_PATTERN_ID } from '../common/index_pattern_constants';
-
-export {
-  createNodeAgentInstructions,
-  createDjangoAgentInstructions,
-  createFlaskAgentInstructions,
-  createRailsAgentInstructions,
-  createRackAgentInstructions,
-  createJsAgentInstructions,
-  createGoAgentInstructions,
-  createJavaAgentInstructions,
-  createDotNetAgentInstructions,
-  createPhpAgentInstructions,
-} from './tutorial/instructions/apm_agent_instructions';

src/plugins/apm_oss/server/plugin.ts

@@ -6,38 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
 import { Observable } from 'rxjs';
+import { Plugin, PluginInitializerContext } from 'src/core/server';
 import { APMOSSConfig } from './';
-import { HomeServerPluginSetup, TutorialProvider } from '../../home/server';
-import { tutorialProvider } from './tutorial';
 
 export class APMOSSPlugin implements Plugin<APMOSSPluginSetup> {
   constructor(private readonly initContext: PluginInitializerContext) {
     this.initContext = initContext;
   }
-  public setup(core: CoreSetup, plugins: { home: HomeServerPluginSetup }) {
+  public setup() {
     const config$ = this.initContext.config.create<APMOSSConfig>();
-
     const config = this.initContext.config.get<APMOSSConfig>();
-
-    const apmTutorialProvider = tutorialProvider({
-      indexPatternTitle: config.indexPattern,
-      indices: {
-        errorIndices: config.errorIndices,
-        metricsIndices: config.metricsIndices,
-        onboardingIndices: config.onboardingIndices,
-        sourcemapIndices: config.sourcemapIndices,
-        transactionIndices: config.transactionIndices,
-      },
-    });
-    plugins.home.tutorials.registerTutorial(apmTutorialProvider);
-
-    return {
-      config,
-      config$,
-      getRegisteredTutorialProvider: () => apmTutorialProvider,
-    };
+    return { config, config$ };
   }
 
   start() {}
@@ -47,5 +27,4 @@ export class APMOSSPlugin implements Plugin<APMOSSPluginSetup> {
 export interface APMOSSPluginSetup {
   config: APMOSSConfig;
   config$: Observable<APMOSSConfig>;
-  getRegisteredTutorialProvider(): TutorialProvider;
 }