Skip to content

Commit 1749092

Browse files
JordanShJordanSh
committed
Merge branch 'main' of https://github.com/elastic/kibana into telemetry-improvements
2 parents 8927342 + 777897c commit 1749092

1,213 files changed

Lines changed: 16649 additions & 6432 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.

‎.backportrc.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"9.0",
67
"8.x",
8+
"8.18",
79
"8.17",
810
"8.16",
911
"8.15",
@@ -55,8 +57,8 @@
5557
"backport"
5658
],
5759
"branchLabelMapping": {
58-
"^v9.0.0$": "main",
59-
"^v8.18.0$": "8.x",
60+
"^v9.1.0$": "main",
61+
"^v8.19.0$": "8.x",
6062
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
6163
},
6264
"autoMerge": true,

‎.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.x 8.17 8.16 7.17
25+
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -48,10 +48,18 @@ spec:
4848
cronline: 0 22 * * * America/New_York
4949
message: Daily build
5050
branch: main
51+
Daily build (9.0):
52+
cronline: 0 22 * * * America/New_York
53+
message: Daily build
54+
branch: '9.0'
5155
Daily build (8.x):
5256
cronline: 0 22 * * * America/New_York
5357
message: Daily build
5458
branch: '8.x'
59+
Daily build (8.18):
60+
cronline: 0 22 * * * America/New_York
61+
message: Daily build
62+
branch: '8.18'
5563
Daily build (8.17):
5664
cronline: 0 22 * * * America/New_York
5765
message: Daily build
@@ -95,7 +103,7 @@ spec:
95103
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
96104
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
97105
allow_rebuilds: true
98-
branch_configuration: main 8.x 8.17 8.16 7.17
106+
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
99107
default_branch: main
100108
repository: elastic/kibana
101109
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -144,7 +152,7 @@ spec:
144152
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
145153
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
146154
allow_rebuilds: true
147-
branch_configuration: main 8.x 8.17 8.16 7.17
155+
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
148156
default_branch: main
149157
repository: elastic/kibana
150158
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

‎.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.x 8.17 8.16 7.17
25+
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

‎.buildkite/pipeline-resource-definitions/kibana-on-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2727
SCOUT_REPORTER_ENABLED: 'true'
2828
allow_rebuilds: true
29-
branch_configuration: main 8.x 8.17 8.16 7.17
29+
branch_configuration: main 9.0 8.x 8.18 8.17 8.16 7.17
3030
default_branch: main
3131
repository: elastic/kibana
3232
pipeline_file: .buildkite/pipelines/on_merge.yml

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ steps:
5555
provider: gcp
5656
machineType: n2-standard-2
5757
preemptible: true
58-
diskSizeGb: 75
58+
diskSizeGb: 80
5959
timeout_in_minutes: 60
6060
retry:
6161
automatic:
@@ -117,7 +117,7 @@ steps:
117117
provider: gcp
118118
machineType: n2-standard-4
119119
preemptible: true
120-
diskSizeGb: 75
120+
diskSizeGb: 80
121121
timeout_in_minutes: 60
122122
retry:
123123
automatic:

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
agents:
4242
machineType: n2-standard-2
4343
preemptible: true
44-
diskSizeGb: 75
44+
diskSizeGb: 80
4545
timeout_in_minutes: 60
4646
retry:
4747
automatic:
@@ -79,7 +79,7 @@ steps:
7979
agents:
8080
machineType: n2-standard-4
8181
preemptible: true
82-
diskSizeGb: 75
82+
diskSizeGb: 80
8383
key: check_oas_snapshot
8484
timeout_in_minutes: 60
8585
retry:

‎.buildkite/scripts/steps/artifacts/env.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ VERSION_QUALIFIER="${VERSION_QUALIFIER:=""}"
77

88
BASE_VERSION="$(jq -r '.version' package.json)"
99

10-
if [[ "$VERSION_QUALIFIER" == "" ]]; then
11-
QUALIFIER_VERSION="$BASE_VERSION"
10+
if [[ -z "$VERSION_QUALIFIER" ]]; then
11+
# NOTE: this is temporary and make sure we always produce 9.0.0 staging builds with qualifier tag -beta1 at the moment
12+
if [[ "$BASE_VERSION" == "9.0.0" && "$RELEASE_BUILD" == "true" ]]; then
13+
QUALIFIER_VERSION="$BASE_VERSION-beta1"
14+
else
15+
QUALIFIER_VERSION="$BASE_VERSION"
16+
fi
1217
else
1318
QUALIFIER_VERSION="$BASE_VERSION-$VERSION_QUALIFIER"
1419
fi

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ x-pack/solutions/security/packages/kbn-securitysolution-lists-common @elastic/se
995995
x-pack/solutions/security/packages/kbn-securitysolution-t-grid @elastic/security-detection-engine
996996
x-pack/solutions/security/packages/kbn-securitysolution-utils @elastic/security-detection-engine @elastic/security-detection-rule-management
997997
x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-explore
998+
x-pack/solutions/security/packages/security-ai-prompts @elastic/security-generative-ai
998999
x-pack/solutions/security/packages/side_nav @elastic/security-threat-hunting-explore
9991000
x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-explore
10001001
x-pack/solutions/security/packages/upselling @elastic/security-threat-hunting-explore
@@ -1588,6 +1589,9 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
15881589
/.eslintignore @elastic/kibana-operations
15891590

15901591
# QA - Appex QA
1592+
/packages/kbn-es/src/serverless_resources/project_roles/es/roles.yml @elastic/appex-qa
1593+
/packages/kbn-es/src/serverless_resources/project_roles/oblt/roles.yml @elastic/appex-qa
1594+
/packages/kbn-es/src/serverless_resources/project_roles/security/roles.yml @elastic/appex-qa
15911595
/x-pack/platform/plugins/shared/maps/ui_tests @elastic/appex-qa # temporarily
15921596
/x-pack/platform/plugins/private/discover_enhanced/ui_tests/ @elastic/appex-qa # temporarily
15931597
/x-pack/test/functional/fixtures/package_registry_config.yml @elastic/appex-qa # No usages found
@@ -2332,6 +2336,11 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout @elastic/
23322336

23332337
/x-pack/test/functional/es_archives/auditbeat/uncommon_processes @elastic/security-threat-hunting-explore
23342338

2339+
## The Hive Connector
2340+
/x-pack/platform/plugins/shared/stack_connectors/public/connector_types/thehive @elastic/security-threat-hunting
2341+
/x-pack/platform/plugins/shared/stack_connectors/server/connector_types/thehive @elastic/security-threat-hunting
2342+
/x-pack/platform/plugins/shared/stack_connectors/common/thehive @elastic/security-threat-hunting
2343+
23352344
## Generative AI owner connectors
23362345
# OpenAI
23372346
/x-pack/platform/plugins/shared/stack_connectors/public/connector_types/openai @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra

‎.github/workflows/comment-on-asciidoc-changes.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Comment on PR for .asciidoc changes
3+
4+
on:
5+
# We need to use pull_request_target to be able to comment on PRs from forks
6+
pull_request_target:
7+
types:
8+
- synchronize
9+
- opened
10+
- reopened
11+
branches:
12+
- main
13+
- master
14+
- "9.0"
15+
16+
jobs:
17+
comment-on-asciidoc-change:
18+
permissions:
19+
contents: read
20+
pull-requests: write
21+
uses: elastic/docs-builder/.github/workflows/comment-on-asciidoc-changes.yml@main

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2025-01-30
11+
date: 2025-02-02
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

0 commit comments

Comments
 (0)