diff --git a/src/plugins/apm_oss/kibana.json b/src/plugins/apm_oss/kibana.json index 5853ba198e717..7d9f0652a1139 100644 --- a/src/plugins/apm_oss/kibana.json +++ b/src/plugins/apm_oss/kibana.json @@ -1,5 +1,5 @@ { - "id": "apm_oss", + "id": "apmOss", "version": "8.0.0", "server": true, "kibanaVersion": "kibana", diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json index 7c267efedf1af..dd89fac66f6e8 100644 --- a/x-pack/plugins/apm/kibana.json +++ b/x-pack/plugins/apm/kibana.json @@ -4,7 +4,7 @@ "kibanaVersion": "kibana", "requiredPlugins": [ "features", - "apm_oss", + "apmOss", "data", "home", "licensing", diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts index b17bffea812fc..f5755f998dd32 100644 --- a/x-pack/plugins/apm/server/plugin.ts +++ b/x-pack/plugins/apm/server/plugin.ts @@ -50,7 +50,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> { public async setup( core: CoreSetup, plugins: { - apm_oss: APMOSSPluginSetup; + apmOss: APMOSSPluginSetup; home: HomeServerPluginSetup; licensing: LicensingPluginSetup; cloud?: CloudSetup; @@ -65,7 +65,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> { ) { this.logger = this.initContext.logger.get(); const config$ = this.initContext.config.create<APMXPackConfig>(); - const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe( + const mergedConfig$ = combineLatest(plugins.apmOss.config$, config$).pipe( map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig)) );