Skip to content

Commit 97f8488

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into 200538-so-names
2 parents 75f792a + 8ba2179 commit 97f8488

859 files changed

Lines changed: 11775 additions & 5783 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.

‎.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.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-management'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: false
25-
branch_configuration: main
25+
branch_configuration: main 8.x
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/console_definitions_sync.yml

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,6 @@ steps:
487487
provider: gcp
488488
machineType: n2-standard-4
489489
preemptible: true
490-
depends_on: build
491490
timeout_in_minutes: 120
492491
parallelism: 3
493492
retry:
@@ -503,7 +502,6 @@ steps:
503502
provider: gcp
504503
machineType: n2-standard-4
505504
preemptible: true
506-
depends_on: build
507505
timeout_in_minutes: 120
508506
parallelism: 3
509507
retry:

‎.buildkite/scripts/steps/console_definitions_sync.sh‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ main () {
1313
report_main_step "Cloning repositories"
1414

1515
rm -rf elasticsearch-specification
16-
if ! git clone https://github.com/elastic/elasticsearch-specification --depth 1; then
16+
if ! git clone --branch "$BUILDKITE_BRANCH" https://github.com/elastic/elasticsearch-specification --depth 1; then
1717
echo "Error: Failed to clone the elasticsearch-specification repository."
1818
exit 1
1919
fi
@@ -40,7 +40,7 @@ main () {
4040
git config --global user.name "$KIBANA_MACHINE_USERNAME"
4141
git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
4242

43-
PR_TITLE='[Console] Update console definitions'
43+
PR_TITLE="[Console] Update console definitions (${branch_name})"
4444
PR_BODY='This PR updates the console definitions to match the latest ones from the @elastic/elasticsearch-specification repo.'
4545

4646
# Check if a PR already exists
@@ -66,7 +66,15 @@ main () {
6666
git push origin "$BRANCH_NAME"
6767

6868
# Create PR
69-
gh pr create --title "$PR_TITLE" --body "$PR_BODY" --base main --head "${BRANCH_NAME}" --label 'release_note:skip' --label 'Feature:Console' --label 'Team:Kibana Management'
69+
gh pr create \
70+
--title "$PR_TITLE" \
71+
--body "$PR_BODY" \
72+
--base "$BUILDKITE_BRANCH" \
73+
--head "$BRANCH_NAME" \
74+
--label 'backport:skip' \
75+
--label 'release_note:skip' \
76+
--label 'Feature:Console' \
77+
--label 'Team:Kibana Management'
7078
}
7179

7280
main

‎.eslintrc.js‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,21 +1019,6 @@ module.exports = {
10191019
],
10201020
},
10211021
},
1022-
{
1023-
// disable imports from legacy uptime plugin
1024-
files: [
1025-
'x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}',
1026-
],
1027-
rules: {
1028-
'no-restricted-imports': [
1029-
'error',
1030-
{
1031-
patterns: ['**/legacy_uptime/*'],
1032-
paths: RESTRICTED_IMPORTS,
1033-
},
1034-
],
1035-
},
1036-
},
10371022
{
10381023
files: [
10391024
'x-pack/solutions/observability/plugins/apm/**/*.{js,mjs,ts,tsx}',
@@ -1074,8 +1059,8 @@ module.exports = {
10741059
{
10751060
// front end and common typescript and javascript files only
10761061
files: [
1077-
'x-pack/platform/plugins/shared/integration_assistant/public/**/*.{js,mjs,ts,tsx}',
1078-
'x-pack/platform/plugins/shared/integration_assistant/common/**/*.{js,mjs,ts,tsx}',
1062+
'x-pack/platform/plugins/shared/automatic_import/public/**/*.{js,mjs,ts,tsx}',
1063+
'x-pack/platform/plugins/shared/automatic_import/common/**/*.{js,mjs,ts,tsx}',
10791064
],
10801065
rules: {
10811066
'import/no-nodejs-modules': 'error',
@@ -1159,7 +1144,7 @@ module.exports = {
11591144
files: [
11601145
'x-pack/solutions/security/plugins/ecs_data_quality_dashboard/**/*.{ts,tsx}',
11611146
'x-pack/solutions/security/plugins/elastic_assistant/**/*.{ts,tsx}',
1162-
'x-pack/platform/plugins/shared/integration_assistant/**/*.{ts,tsx}',
1147+
'x-pack/platform/plugins/shared/automatic_import/**/*.{ts,tsx}',
11631148
'x-pack/platform/packages/shared/kbn-elastic-assistant/**/*.{ts,tsx}',
11641149
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{ts,tsx}',
11651150
'x-pack/platform/packages/shared/kbn-langchain/**/*.{ts,tsx}',
@@ -1174,7 +1159,7 @@ module.exports = {
11741159
excludedFiles: [
11751160
'x-pack/solutions/security/plugins/ecs_data_quality_dashboard/**/*.{test,mock,test_helper}.{ts,tsx}',
11761161
'x-pack/solutions/security/plugins/elastic_assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
1177-
'x-pack/platform/plugins/shared/integration_assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
1162+
'x-pack/platform/plugins/shared/automatic_import/**/*.{test,mock,test_helper}.{ts,tsx}',
11781163
'x-pack/platform/packages/shared/kbn-elastic-assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
11791164
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{test,mock,test_helper}.{ts,tsx}',
11801165
'x-pack/platform/packages/shared/kbn-langchain/**/*.{test,mock,test_helper}.{ts,tsx}',
@@ -1195,7 +1180,7 @@ module.exports = {
11951180
files: [
11961181
'x-pack/solutions/security/plugins/ecs_data_quality_dashboard/**/*.{ts,tsx}',
11971182
'x-pack/solutions/security/plugins/elastic_assistant/**/*.{ts,tsx}',
1198-
'x-pack/platform/plugins/shared/integration_assistant/**/*.{ts,tsx}',
1183+
'x-pack/platform/plugins/shared/automatic_import/**/*.{ts,tsx}',
11991184
'x-pack/platform/packages/shared/kbn-elastic-assistant/**/*.{ts,tsx}',
12001185
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{ts,tsx}',
12011186
'x-pack/platform/packages/shared/kbn-langchain/**/*.{ts,tsx}',
@@ -1229,7 +1214,7 @@ module.exports = {
12291214
files: [
12301215
'x-pack/solutions/security/plugins/ecs_data_quality_dashboard/**/*.{js,mjs,ts,tsx}',
12311216
'x-pack/solutions/security/plugins/elastic_assistant/**/*.{js,mjs,ts,tsx}',
1232-
'x-pack/platform/plugins/shared/integration_assistant/**/*.{js,mjs,ts,tsx}',
1217+
'x-pack/platform/plugins/shared/automatic_import/**/*.{js,mjs,ts,tsx}',
12331218
'x-pack/platform/packages/shared/kbn-elastic-assistant/**/*.{js,mjs,ts,tsx}',
12341219
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{js,mjs,ts,tsx}',
12351220
'x-pack/platform/packages/shared/kbn-langchain/**/*.{js,mjs,ts,tsx}',

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ x-pack/platform/plugins/shared/ai_infra/llm_tasks @elastic/appex-ai-infra
871871
x-pack/platform/plugins/shared/ai_infra/product_doc_base @elastic/appex-ai-infra
872872
x-pack/platform/plugins/shared/aiops @elastic/ml-ui
873873
x-pack/platform/plugins/shared/alerting @elastic/response-ops
874+
x-pack/platform/plugins/shared/automatic_import @elastic/security-scalability
874875
x-pack/platform/plugins/shared/cases @elastic/response-ops
875876
x-pack/platform/plugins/shared/cloud @elastic/kibana-core
876877
x-pack/platform/plugins/shared/dashboard_enhanced @elastic/kibana-presentation
@@ -888,7 +889,6 @@ x-pack/platform/plugins/shared/index_management @elastic/kibana-management
888889
x-pack/platform/plugins/shared/inference @elastic/appex-ai-infra
889890
x-pack/platform/plugins/shared/inference_endpoint @elastic/ml-ui
890891
x-pack/platform/plugins/shared/ingest_pipelines @elastic/kibana-management
891-
x-pack/platform/plugins/shared/integration_assistant @elastic/security-scalability
892892
x-pack/platform/plugins/shared/lens @elastic/kibana-visualizations
893893
x-pack/platform/plugins/shared/license_management @elastic/kibana-management
894894
x-pack/platform/plugins/shared/licensing @elastic/kibana-core

0 commit comments

Comments
 (0)