From 5b099b5790f7a02f6debff5910608188b6f13cc7 Mon Sep 17 00:00:00 2001
From: mohinderps <mohin19derp@gmail.com>
Date: Mon, 16 Mar 2020 23:25:53 +0530
Subject: [PATCH 1/3] Change apm oss plugin name from apm_oss to apmOss

---
 src/plugins/apm_oss/kibana.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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",

From 595d8ac72ece0ed94f72c19630876fceab28717a Mon Sep 17 00:00:00 2001
From: mohinderps <mohin19derp@gmail.com>
Date: Tue, 24 Mar 2020 22:36:25 +0530
Subject: [PATCH 2/3] change plugin name

---
 x-pack/plugins/apm/server/plugin.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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))
     );
 

From a105f1451603bbe84d2c903fbadaa1b2ce951f8a Mon Sep 17 00:00:00 2001
From: Oliver Gupte <olivergupte@gmail.com>
Date: Tue, 12 May 2020 01:51:04 -0700
Subject: [PATCH 3/3] update apm_oss -> apmOss inn requiredPlugins

---
 x-pack/plugins/apm/kibana.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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",