Skip to content

Commit d5710fb

Browse files
oguptemohinderps
andcommitted
[APM] Change plugin id for apm_oss to apmOss (#66164)
* Change apm oss plugin name from apm_oss to apmOss * change plugin name * update apm_oss -> apmOss inn requiredPlugins Co-authored-by: mohinderps <[email protected]>
1 parent 28790c5 commit d5710fb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/plugins/apm_oss/kibana.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "apm_oss",
2+
"id": "apmOss",
33
"version": "8.0.0",
44
"server": true,
55
"kibanaVersion": "kibana",

x-pack/plugins/apm/kibana.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"kibanaVersion": "kibana",
55
"requiredPlugins": [
66
"features",
7-
"apm_oss",
7+
"apmOss",
88
"data",
99
"home",
1010
"licensing",

x-pack/plugins/apm/server/plugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
5050
public async setup(
5151
core: CoreSetup,
5252
plugins: {
53-
apm_oss: APMOSSPluginSetup;
53+
apmOss: APMOSSPluginSetup;
5454
home: HomeServerPluginSetup;
5555
licensing: LicensingPluginSetup;
5656
cloud?: CloudSetup;
@@ -65,7 +65,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
6565
) {
6666
this.logger = this.initContext.logger.get();
6767
const config$ = this.initContext.config.create<APMXPackConfig>();
68-
const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe(
68+
const mergedConfig$ = combineLatest(plugins.apmOss.config$, config$).pipe(
6969
map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
7070
);
7171

0 commit comments

Comments
 (0)