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

add critical level to all fleet deprecations (#117332) (#117477)

Browse source 
Co-authored-by: Mark Hopkin <mark.hopkin@elastic.co>
This commit is contained in:
Kibana Machine 2021-11-04 07:58:24 -04:00 committed by GitHub
parent 83075007b1
commit e620fec087
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
x-pack/plugins/fleet/server/index.ts
View file

@ -45,42 +45,59 @@ export const config: PluginConfigDescriptor = {
},
deprecations: ({ renameFromRoot, unused, unusedFromRoot }) => [
// Fleet plugin was named ingestManager before
renameFromRoot('xpack.ingestManager.enabled', 'xpack.fleet.enabled'),
renameFromRoot('xpack.ingestManager.registryUrl', 'xpack.fleet.registryUrl'),
renameFromRoot('xpack.ingestManager.registryProxyUrl', 'xpack.fleet.registryProxyUrl'),
renameFromRoot('xpack.ingestManager.fleet', 'xpack.ingestManager.agents'),
renameFromRoot('xpack.ingestManager.agents.enabled', 'xpack.fleet.agents.enabled'),
renameFromRoot('xpack.ingestManager.agents.elasticsearch', 'xpack.fleet.agents.elasticsearch'),
renameFromRoot('xpack.ingestManager.enabled', 'xpack.fleet.enabled', { level: 'critical' }),
renameFromRoot('xpack.ingestManager.registryUrl', 'xpack.fleet.registryUrl', {
level: 'critical',
}),
renameFromRoot('xpack.ingestManager.registryProxyUrl', 'xpack.fleet.registryProxyUrl', {
level: 'critical',
}),
renameFromRoot('xpack.ingestManager.fleet', 'xpack.ingestManager.agents', {
level: 'critical',
}),
renameFromRoot('xpack.ingestManager.agents.enabled', 'xpack.fleet.agents.enabled', {
level: 'critical',
}),
renameFromRoot('xpack.ingestManager.agents.elasticsearch', 'xpack.fleet.agents.elasticsearch', {
level: 'critical',
}),
renameFromRoot(
'xpack.ingestManager.agents.tlsCheckDisabled',
'xpack.fleet.agents.tlsCheckDisabled'
'xpack.fleet.agents.tlsCheckDisabled',
{ level: 'critical' }
),
renameFromRoot(
'xpack.ingestManager.agents.pollingRequestTimeout',
'xpack.fleet.agents.pollingRequestTimeout'
'xpack.fleet.agents.pollingRequestTimeout',
{ level: 'critical' }
),
renameFromRoot(
'xpack.ingestManager.agents.maxConcurrentConnections',
'xpack.fleet.agents.maxConcurrentConnections'
'xpack.fleet.agents.maxConcurrentConnections',
{ level: 'critical' }
),
renameFromRoot('xpack.ingestManager.agents.kibana', 'xpack.fleet.agents.kibana'),
renameFromRoot('xpack.ingestManager.agents.kibana', 'xpack.fleet.agents.kibana', {
level: 'critical',
}),
renameFromRoot(
'xpack.ingestManager.agents.agentPolicyRolloutRateLimitIntervalMs',
'xpack.fleet.agents.agentPolicyRolloutRateLimitIntervalMs'
'xpack.fleet.agents.agentPolicyRolloutRateLimitIntervalMs',
{ level: 'critical' }
),
renameFromRoot(
'xpack.ingestManager.agents.agentPolicyRolloutRateLimitRequestPerInterval',
'xpack.fleet.agents.agentPolicyRolloutRateLimitRequestPerInterval'
'xpack.fleet.agents.agentPolicyRolloutRateLimitRequestPerInterval',
{ level: 'critical' }
),
unusedFromRoot('xpack.ingestManager'),
unusedFromRoot('xpack.ingestManager', { level: 'critical' }),
// Unused settings before Fleet server exists
unused('agents.kibana'),
unused('agents.maxConcurrentConnections'),
unused('agents.agentPolicyRolloutRateLimitIntervalMs'),
unused('agents.agentPolicyRolloutRateLimitRequestPerInterval'),
unused('agents.pollingRequestTimeout'),
unused('agents.tlsCheckDisabled'),
unused('agents.fleetServerEnabled'),
unused('agents.kibana', { level: 'critical' }),
unused('agents.maxConcurrentConnections', { level: 'critical' }),
unused('agents.agentPolicyRolloutRateLimitIntervalMs', { level: 'critical' }),
unused('agents.agentPolicyRolloutRateLimitRequestPerInterval', { level: 'critical' }),
unused('agents.pollingRequestTimeout', { level: 'critical' }),
unused('agents.tlsCheckDisabled', { level: 'critical' }),
unused('agents.fleetServerEnabled', { level: 'critical' }),
// Renaming elasticsearch.host => elasticsearch.hosts
(fullConfig, fromPath, addDeprecation) => {
const oldValue = fullConfig?.xpack?.fleet?.agents?.elasticsearch?.host;
@ -95,6 +112,7 @@ export const config: PluginConfigDescriptor = {
`Use [xpack.fleet.agents.elasticsearch.hosts] with an array of host instead.`,
],
},
level: 'critical',
});
}