Skip to content

Commit c405e94

Browse files
PhilippeObertiPhilippeOberti
authored
Merge branch '9.1' into backport/9.1/pr-245449
2 parents 226af39 + 17679c2 commit c405e94

55 files changed

Lines changed: 875 additions & 627 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎oas_docs/output/kibana.serverless.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58784,6 +58784,9 @@ components:
5878458784
reader:
5878558785
$ref: '#/components/schemas/Security_AI_Assistant_API_Reader'
5878658786
description: Message content.
58787+
refusal:
58788+
description: Refusal reason returned by the model when content is filtered.
58789+
type: string
5878758790
role:
5878858791
$ref: '#/components/schemas/Security_AI_Assistant_API_MessageRole'
5878958792
description: Message role.

‎oas_docs/output/kibana.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68212,6 +68212,9 @@ components:
6821268212
reader:
6821368213
$ref: '#/components/schemas/Security_AI_Assistant_API_Reader'
6821468214
description: Message content.
68215+
refusal:
68216+
description: Refusal reason returned by the model when content is filtered.
68217+
type: string
6821568218
role:
6821668219
$ref: '#/components/schemas/Security_AI_Assistant_API_MessageRole'
6821768220
description: Message role.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dashboarding"
1212
],
1313
"private": true,
14-
"version": "9.1.9",
14+
"version": "9.1.10",
1515
"branch": "9.1",
1616
"types": "./kibana.d.ts",
1717
"tsdocMetadata": "./build/tsdoc-metadata.json",

‎src/core/server/integration_tests/saved_objects/migrations/archives/9.1.10_baseline_1.2k_docs.zip‎

312 KB
Binary file not shown.

src/core/server/integration_tests/saved_objects/migrations/archives/9.1.9_baseline_600k_docs.zip renamed to src/core/server/integration_tests/saved_objects/migrations/archives/9.1.10_baseline_600k_docs.zip

35.3 MB
Binary file not shown.

‎src/core/server/integration_tests/saved_objects/migrations/archives/9.1.9_baseline_1.2k_docs.zip‎

-312 KB
Binary file not shown.

‎src/core/server/integration_tests/saved_objects/migrations/group1/__snapshots__/v2_migration.test.ts.snap‎

Lines changed: 500 additions & 500 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/server/integration_tests/saved_objects/migrations/group3/actions/actions_test_suite.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,8 @@ export const runActionTestSuite = ({
15101510
});
15111511
});
15121512

1513-
describe('updateAndPickupMappings', () => {
1513+
// FLAKY: https://github.com/elastic/kibana/issues/176846
1514+
describe.skip('updateAndPickupMappings', () => {
15141515
it('resolves right when mappings were updated and picked up', async () => {
15151516
// Create an index without any mappings and insert documents into it
15161517
await createIndex({

‎src/core/server/integration_tests/saved_objects/migrations/kibana_migrator_archive_utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
import { delay } from './test_utils';
2626
import { baselineTypes, getBaselineDocuments } from './kibana_migrator_test_kit.fixtures';
2727

28-
export const BASELINE_ELASTICSEARCH_VERSION = '9.1.9';
28+
export const BASELINE_ELASTICSEARCH_VERSION = '9.1.10';
2929
export const BASELINE_DOCUMENTS_PER_TYPE_SMALL = 200;
3030
export const BASELINE_DOCUMENTS_PER_TYPE_LARGE = 100_000;
3131
// we discard the second half with exclude on upgrade (firstHalf !== true)

‎src/platform/packages/shared/kbn-scout/src/servers/configs/default/serverless/serverless.base.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ export const defaultConfig: ScoutServerConfig = {
8383
'xpack.security.authc.realms.jwt.jwt1.order=-98',
8484
`xpack.security.authc.realms.jwt.jwt1.pkc_jwkset_path=${getDockerFileMountPath(JWKS_PATH)}`,
8585
`xpack.security.authc.realms.jwt.jwt1.token_type=access_token`,
86-
'serverless.indices.validate_dot_prefixes=true',
8786
// controller cluster-settings
8887
`cluster.service.slow_task_logging_threshold=15s`,
8988
`cluster.service.slow_task_thread_dump_timeout=5s`,

0 commit comments

Comments
 (0)