Skip to content

Commit 24d4e7e

Browse files
[9.1] Allow xpack.spaces.defaultSolution to be configured via docker (#236570) (#236598)
# Backport This will backport the following commits from `main` to `9.1`: - [Allow xpack.spaces.defaultSolution to be configured via docker (#236570)](#236570) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Larry Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2025-09-26T13:14:19Z","message":"Allow xpack.spaces.defaultSolution to be configured via docker (#236570)","sha":"7e3586e0c265b4a52856c1a9826c8c1d8f6ad7a8","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Security","backport:version","v9.2.0","v8.18.8","v8.19.5","v9.1.5","v9.3.0"],"title":"Allow xpack.spaces.defaultSolution to be configured via docker","number":236570,"url":"https://github.com/elastic/kibana/pull/236570","mergeCommit":{"message":"Allow xpack.spaces.defaultSolution to be configured via docker (#236570)","sha":"7e3586e0c265b4a52856c1a9826c8c1d8f6ad7a8"}},"sourceBranch":"main","suggestedTargetBranches":["8.18","8.19","9.1","9.3"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/236570","number":236570,"mergeCommit":{"message":"Allow xpack.spaces.defaultSolution to be configured via docker (#236570)","sha":"7e3586e0c265b4a52856c1a9826c8c1d8f6ad7a8"}},{"branch":"8.18","label":"v8.18.8","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.3","label":"v9.3.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Larry Gregory <larry.gregory@elastic.co>
1 parent 63df2e5 commit 24d4e7e

File tree

1 file changed

+1
-0
lines changed
  • src/dev/build/tasks/os_packages/docker_generator/resources/base/bin

1 file changed

+1
-0
lines changed

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ kibana_vars=(
414414
xpack.securitySolution.packagerTaskInterval
415415
xpack.securitySolution.prebuiltRulesPackageVersion
416416
xpack.spaces.maxSpaces
417+
xpack.spaces.defaultSolution
417418
xpack.task_manager.capacity
418419
xpack.task_manager.claim_strategy
419420
xpack.task_manager.auto_calculate_default_ech_capacity

0 commit comments

Comments
 (0)