Skip to content

[7.x] [APM] Change plugin id for apm_oss to apmOss (#66164) #66330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 18, 2020
Merged

[7.x] [APM] Change plugin id for apm_oss to apmOss (#66164) #66330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5710fb
[APM] Change plugin id for `apm_oss` to `apmOss` (#66164)
ogupte May 12, 2020
86dc34c
Merge branch '7.x' into backport/7.x/pr-66164
elasticmachine May 13, 2020
1a8d012
Merge branch '7.x' into backport/7.x/pr-66164
elasticmachine May 14, 2020
c990698
Merge branch '7.x' into backport/7.x/pr-66164
elasticmachine May 18, 2020
943c648
Updates apm_oss -> apmOss plugin id in upgrade_assistant
ogupte May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/apm_oss/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "apm_oss",
"id": "apmOss",
"version": "8.0.0",
"server": true,
"kibanaVersion": "kibana",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"kibanaVersion": "kibana",
"requiredPlugins": [
"features",
"apm_oss",
"apmOss",
"data",
"home",
"licensing",
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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))
);

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/upgrade_assistant/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"server": true,
"ui": true,
"configPath": ["xpack", "upgrade_assistant"],
"requiredPlugins": ["management", "licensing", "apm_oss"],
"requiredPlugins": ["management", "licensing", "apmOss"],
"optionalPlugins": ["cloud", "usageCollection"]
}
4 changes: 2 additions & 2 deletions x-pack/plugins/upgrade_assistant/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { RouteDependencies } from './types';
interface PluginsSetup {
usageCollection: UsageCollectionSetup;
licensing: LicensingPluginSetup;
apm_oss: APMOSSPluginSetup;
apmOss: APMOSSPluginSetup;
cloud?: CloudSetup;
}

Expand Down Expand Up @@ -68,7 +68,7 @@ export class UpgradeAssistantServerPlugin implements Plugin {

setup(
{ http, getStartServices, capabilities, savedObjects }: CoreSetup,
{ usageCollection, cloud, licensing, apm_oss: apmOSS }: PluginsSetup
{ usageCollection, cloud, licensing, apmOss: apmOSS }: PluginsSetup
) {
this.licensing = licensing;
this.apmOSS = apmOSS;
Expand Down