github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-28 11:05:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
## Summary

This PR removes
`xpack.fleet.internal.registry.kibanaVersionCheckEnabled: false` from
`kibana.yml` in favor of changing the default value that Fleet
populates, so that we do not apply the Kibana version constraint to EPR
requests for >= 9.0 deployments.

Prior to this change, this setting was not applied to ESS deployments as
`kibana.yml` is overridden there.

I updated the related task in
https://github.com/elastic/kibana/issues/192624 to reflect this change.
This commit is contained in:
Jen Huang 2024-10-30 14:22:52 -07:00 • committed by GitHub
parent ed81e4334f
commit 950ee166da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 59 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/kibana.yml
View file

@ -181,8 +181,3 @@
# Maximum number of documents loaded by each shard to generate autocomplete suggestions. # 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 # This value must be a whole number greater than zero. Defaults to 100_000
#unifiedSearch.autocomplete.valueSuggestions.terminateAfter: 100000 #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

16
x-pack/plugins/fleet/server/config.ts
View file

@ -201,8 +201,7 @@ export const config: PluginConfigDescriptor = {
defaultValue: () => [], defaultValue: () => [],
}), }),
internal: schema.maybe( internal: schema.object({
schema.object({
disableILMPolicies: schema.boolean({ disableILMPolicies: schema.boolean({
defaultValue: false, defaultValue: false,
}), }),
@ -220,7 +219,10 @@ export const config: PluginConfigDescriptor = {
retrySetupOnBoot: schema.boolean({ defaultValue: false }), retrySetupOnBoot: schema.boolean({ defaultValue: false }),
registry: schema.object( registry: schema.object(
{ {
kibanaVersionCheckEnabled: schema.boolean({ defaultValue: true }), // 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: [] }), excludePackages: schema.arrayOf(schema.string(), { defaultValue: [] }),
spec: schema.object( spec: schema.object(
{ {
@ -248,7 +250,10 @@ export const config: PluginConfigDescriptor = {
}, },
{ {
defaultValue: { defaultValue: {
kibanaVersionCheckEnabled: true, // 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: [], capabilities: [],
excludePackages: [], excludePackages: [],
spec: { spec: {
@ -257,8 +262,7 @@ export const config: PluginConfigDescriptor = {
}, },
} }
), ),
}) }),
),
enabled: schema.boolean({ defaultValue: true }), 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). * 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).