Skip to content

[7.x] [Alerting] Track deprecated configs (#113015) #114147

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
chrisronline merged 1 commit into from
Oct 6, 2021
Merged

[7.x] [Alerting] Track deprecated configs (#113015) #114147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 25 additions & 3 deletions x-pack/plugins/actions/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
if (
customHostSettings.find(
(customHostSchema: CustomHostSettings) =>
!!customHostSchema.ssl && !!customHostSchema.ssl.rejectUnauthorized
customHostSchema.hasOwnProperty('ssl') &&
customHostSchema.ssl?.hasOwnProperty('rejectUnauthorized')
)
) {
addDeprecation({
Expand All @@ -82,11 +83,18 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
],
},
});
return {
unset: [
{
path: `xpack.actions.customHostSettings.ssl.rejectUnauthorized`,
},
],
};
}
},
(settings, fromPath, addDeprecation) => {
const actions = get(settings, fromPath);
if (!!actions?.rejectUnauthorized) {
if (actions?.hasOwnProperty('rejectUnauthorized')) {
addDeprecation({
message:
`"xpack.actions.rejectUnauthorized" is deprecated. Use "xpack.actions.verificationMode" instead, ` +
Expand All @@ -101,11 +109,18 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
],
},
});
return {
unset: [
{
path: `xpack.actions.rejectUnauthorized`,
},
],
};
}
},
(settings, fromPath, addDeprecation) => {
const actions = get(settings, fromPath);
if (!!actions?.proxyRejectUnauthorizedCertificates) {
if (actions?.hasOwnProperty('proxyRejectUnauthorizedCertificates')) {
addDeprecation({
message:
`"xpack.actions.proxyRejectUnauthorizedCertificates" is deprecated. Use "xpack.actions.proxyVerificationMode" instead, ` +
Expand All @@ -120,6 +135,13 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
],
},
});
return {
unset: [
{
path: `xpack.actions.proxyRejectUnauthorizedCertificates`,
},
],
};
}
},
(settings, fromPath, addDeprecation) => {
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/task_manager/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ export type {

export const config: PluginConfigDescriptor<TaskManagerConfig> = {
schema: configSchema,
exposeToUsage: {
max_workers: true,
},
deprecations: () => [
(settings, fromPath, addDeprecation) => {
const taskManager = get(settings, fromPath);
Expand Down