maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[APM] Fleet: adding support for legacy fields (#110136)

Browse source 
* supporting legacy fields

* addressing PR comments

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Cauê Marcondes 2021-08-31 18:02:00 -04:00 committed by GitHub
parent 72f6700270
commit 634c272edd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
x-pack/plugins/apm/server/lib/fleet/get_apm_package_policy_definition.ts
View file

@ -16,6 +16,7 @@ interface GetApmPackagePolicyDefinitionOptions {
export function getApmPackagePolicyDefinition(
options: GetApmPackagePolicyDefinitionOptions
) {
const { apmServerSchema, cloudPluginSetup } = options;
return {
name: 'Elastic APM',
namespace: 'default',
@ -27,7 +28,10 @@ export function getApmPackagePolicyDefinition(
type: 'apm',
enabled: true,
streams: [],
vars: getApmPackageInputVars(options),
vars: getApmPackageInputVars({
cloudPluginSetup,
apmServerSchema: preprocessLegacyFields({ apmServerSchema }),
}),
},
],
package: {
@ -38,6 +42,34 @@ export function getApmPackagePolicyDefinition(
};
}
function preprocessLegacyFields({
apmServerSchema,
}: {
apmServerSchema: Record<string, any>;
}) {
const copyOfApmServerSchema = { ...apmServerSchema };
[
{
key: 'apm-server.auth.anonymous.rate_limit.event_limit',
legacyKey: 'apm-server.rum.event_rate.limit',
},
{
key: 'apm-server.auth.anonymous.rate_limit.ip_limit',
legacyKey: 'apm-server.rum.event_rate.lru_size',
},
{
key: 'apm-server.auth.anonymous.allow_service',
legacyKey: 'apm-server.rum.allow_service_names',
},
].forEach(({ key, legacyKey }) => {
if (!copyOfApmServerSchema[key]) {
copyOfApmServerSchema[key] = copyOfApmServerSchema[legacyKey];
delete copyOfApmServerSchema[legacyKey];
}
});
return copyOfApmServerSchema;
}
function getApmPackageInputVars(options: GetApmPackagePolicyDefinitionOptions) {
const { apmServerSchema } = options;
const apmServerConfigs = Object.entries(
@ -90,6 +122,18 @@ export const apmConfigMapping: Record<
name: 'rum_allow_headers',
type: 'text',
},
'apm-server.rum.event_rate.limit': {
name: 'rum_event_rate_limit',
type: 'integer',
},
'apm-server.rum.allow_service_names': {
name: 'rum_allow_service_names',
type: 'text',
},
'apm-server.rum.event_rate.lru_size': {
name: 'rum_event_rate_lru_size',
type: 'integer',
},
'apm-server.rum.response_headers': {
name: 'rum_response_headers',
type: 'yaml',