Skip to content
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

Jump to bottom

[UII] Replace kibanaVersionCheckEnabled default value instead of config setting #198172

Merged
merged 4 commits into from
Oct 30, 2024
Merged

[UII] Replace kibanaVersionCheckEnabled default value instead of config setting #198172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
483dba8
Turn off EPR Kibana version check for 9.0
jen-huang Oct 29, 2024
65cfbcf
Replace value in kibana.yml
jen-huang Oct 29, 2024
96dc38b
Merge branch 'main' into fix/9.0-version-check
jen-huang Oct 29, 2024
75e958b
Make `internal` config schema non-optional so that default values are…
jen-huang Oct 30, 2024
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
5 changes: 0 additions & 5 deletions config/kibana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,3 @@
# Maximum number of documents loaded by each shard to generate autocomplete suggestions.
# This value must be a whole number greater than zero. Defaults to 100_000
#unifiedSearch.autocomplete.valueSuggestions.terminateAfter: 100000

# Must be removed before v9 release
# Requires all registry packages to add v9 as a compatible semver range
# https://github.com/elastic/kibana/issues/192624
xpack.fleet.internal.registry.kibanaVersionCheckEnabled: false
114 changes: 59 additions & 55 deletions x-pack/plugins/fleet/server/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,64 +201,68 @@ export const config: PluginConfigDescriptor = {
defaultValue: () => [],
}),

internal: schema.maybe(
schema.object({
disableILMPolicies: schema.boolean({
defaultValue: false,
}),
fleetServerStandalone: schema.boolean({
defaultValue: false,
}),
onlyAllowAgentUpgradeToKnownVersions: schema.boolean({
defaultValue: false,
}),
activeAgentsSoftLimit: schema.maybe(
schema.number({
min: 0,
})
),
retrySetupOnBoot: schema.boolean({ defaultValue: false }),
registry: schema.object(
{
kibanaVersionCheckEnabled: schema.boolean({ defaultValue: true }),
excludePackages: schema.arrayOf(schema.string(), { defaultValue: [] }),
spec: schema.object(
{
min: schema.maybe(schema.string()),
max: schema.string({ defaultValue: REGISTRY_SPEC_MAX_VERSION }),
},
{
defaultValue: {
max: REGISTRY_SPEC_MAX_VERSION,
},
}
),
capabilities: schema.arrayOf(
schema.oneOf([
// See package-spec for the list of available capiblities https://github.com/elastic/package-spec/blob/dcc37b652690f8a2bca9cf8a12fc28fd015730a0/spec/integration/manifest.spec.yml#L113
schema.literal('apm'),
schema.literal('enterprise_search'),
schema.literal('observability'),
schema.literal('security'),
schema.literal('serverless_search'),
schema.literal('uptime'),
]),
{ defaultValue: [] }
),
},
{
defaultValue: {
kibanaVersionCheckEnabled: true,
capabilities: [],
excludePackages: [],
spec: {
internal: schema.object({
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made this schema object non-optional (removed schema.maybe wrapper), because the default values do not populate when it is optional, i.e. kibanaVersionCheckEnabled is undefined instead of false

disableILMPolicies: schema.boolean({
defaultValue: false,
}),
fleetServerStandalone: schema.boolean({
defaultValue: false,
}),
onlyAllowAgentUpgradeToKnownVersions: schema.boolean({
defaultValue: false,
}),
activeAgentsSoftLimit: schema.maybe(
schema.number({
min: 0,
})
),
retrySetupOnBoot: schema.boolean({ defaultValue: false }),
registry: schema.object(
{
// Must be set back to `true` before v9 release
// Requires all registry packages to add v9 as a compatible semver range
// https://github.com/elastic/kibana/issues/192624
kibanaVersionCheckEnabled: schema.boolean({ defaultValue: false }),
excludePackages: schema.arrayOf(schema.string(), { defaultValue: [] }),
spec: schema.object(
{
min: schema.maybe(schema.string()),
max: schema.string({ defaultValue: REGISTRY_SPEC_MAX_VERSION }),
},
{
defaultValue: {
max: REGISTRY_SPEC_MAX_VERSION,
},
}
),
capabilities: schema.arrayOf(
schema.oneOf([
// See package-spec for the list of available capiblities https://github.com/elastic/package-spec/blob/dcc37b652690f8a2bca9cf8a12fc28fd015730a0/spec/integration/manifest.spec.yml#L113
schema.literal('apm'),
schema.literal('enterprise_search'),
schema.literal('observability'),
schema.literal('security'),
schema.literal('serverless_search'),
schema.literal('uptime'),
]),
{ defaultValue: [] }
),
},
{
defaultValue: {
// Must be set back to `true` before v9 release
// Requires all registry packages to add v9 as a compatible semver range
// https://github.com/elastic/kibana/issues/192624
kibanaVersionCheckEnabled: false,
capabilities: [],
excludePackages: [],
spec: {
max: REGISTRY_SPEC_MAX_VERSION,
},
}
),
})
),
},
}
),
}),
enabled: schema.boolean({ defaultValue: true }),
/**
* The max size of the artifacts encoded_size sum in a batch when more than one (there is at least one artifact in a batch).
Expand Down
Loading