Skip to content

Commit

Permalink
Revert "[APM] Collect telemetry about data/API performance (elastic#5…
Browse files Browse the repository at this point in the history
…1612)"

This reverts commit 13baa51.
  • Loading branch information
spalger committed Mar 24, 2020
1 parent 35b222a commit 6de7f2a
Show file tree
Hide file tree
Showing 31 changed files with 206 additions and 2,387 deletions.
2 changes: 0 additions & 2 deletions src/dev/run_check_lockfile_symlinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ const IGNORE_FILE_GLOBS = [
'**/*fixtures*/**/*',
// cypress isn't used in production, ignore it
'x-pack/legacy/plugins/apm/e2e/*',
// apm scripts aren't used in production, ignore them
'x-pack/legacy/plugins/apm/scripts/*',
];

run(async ({ log }) => {
Expand Down
19 changes: 4 additions & 15 deletions x-pack/legacy/plugins/apm/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@ import mappings from './mappings.json';

export const apm: LegacyPluginInitializer = kibana => {
return new kibana.Plugin({
require: [
'kibana',
'elasticsearch',
'xpack_main',
'apm_oss',
'task_manager'
],
require: ['kibana', 'elasticsearch', 'xpack_main', 'apm_oss'],
id: 'apm',
configPrefix: 'xpack.apm',
publicDir: resolve(__dirname, 'public'),
Expand Down Expand Up @@ -77,10 +71,7 @@ export const apm: LegacyPluginInitializer = kibana => {
autocreateApmIndexPattern: Joi.boolean().default(true),

// service map
serviceMapEnabled: Joi.boolean().default(true),

// telemetry
telemetryCollectionEnabled: Joi.boolean().default(true)
serviceMapEnabled: Joi.boolean().default(true)
}).default();
},

Expand Down Expand Up @@ -116,12 +107,10 @@ export const apm: LegacyPluginInitializer = kibana => {
}
}
});

const apmPlugin = server.newPlatform.setup.plugins
.apm as APMPluginContract;

apmPlugin.registerLegacyAPI({
server
});
apmPlugin.registerLegacyAPI({ server });
}
});
};
Loading

0 comments on commit 6de7f2a

Please sign in to comment.