Skip to content

Commit

Permalink
Merge branch 'esql-docs-flyout' into esql-docs-flyout-expandable2
Browse files Browse the repository at this point in the history
  • Loading branch information
stratoula authored Sep 17, 2024
2 parents 236e22e + 86c81d3 commit 5f1a828
Show file tree
Hide file tree
Showing 2,395 changed files with 64,349 additions and 82,936 deletions.
4 changes: 3 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"repoName": "kibana",
"targetBranchChoices": [
"main",
"8.x",
"8.15",
"8.14",
"8.13",
Expand Down Expand Up @@ -52,7 +53,8 @@
"backport"
],
"branchLabelMapping": {
"^v8.16.0$": "main",
"^v9.0.0$": "main",
"^v8.16.0$": "8.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/ftr_security_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ disabled:
- x-pack/test/osquery_cypress/visual_config.ts
- x-pack/test/security_solution_cypress/cli_config.ts
- x-pack/test/security_solution_cypress/config.ts
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
- x-pack/test/threat_intelligence_cypress/config.ts

# Playwright
- x-pack/test/security_solution_playwright/playwright.config.ts
Expand Down
10 changes: 7 additions & 3 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.15 7.17
branch_configuration: main 8.x 8.15 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
Expand All @@ -49,6 +49,10 @@ spec:
cronline: 0 9 * * * America/New_York
message: Daily build
branch: main
Daily build (8.x):
cronline: 0 9 * * * America/New_York
message: Daily build
branch: '8.x'
Daily build (8.15):
cronline: 0 9 * * * America/New_York
message: Daily build
Expand Down Expand Up @@ -82,7 +86,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.15 7.17
branch_configuration: main 8.x 8.15 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
Expand Down Expand Up @@ -130,7 +134,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
allow_rebuilds: true
branch_configuration: main 8.15 7.17
branch_configuration: main 8.x 8.15 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ spec:
teams:
kibana-operations:
access_level: MANAGE_BUILD_AND_READ
kibana-security:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 8.15 7.17
branch_configuration: main 8.x 8.15 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: main 7.17 8.15
branch_configuration: main 8.x 8.15 7.17
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge.yml
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/pipeline-utils/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ describe('getVersionsFile', () => {
const versionsFile = getVersionsFile();

expect(versionsFile.prevMajors).to.be.an('array');
expect(versionsFile.prevMajors.length).to.eql(1);
expect(versionsFile.prevMajors[0].branch).to.eql('7.17');

expect(versionsFile.prevMinors).to.be.an('array');
});

Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipeline-utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const getVersionsFile = (() => {
prevMinors: Version[];
prevMajors: Version[];
current: Version;
versions: Version[];
};
const versionsFileName = 'versions.json';
try {
Expand Down
18 changes: 0 additions & 18 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -386,24 +386,6 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/threat_intelligence.sh
label: 'Threat Intelligence Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
- quick_checks
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/osquery_cypress.sh
label: 'Osquery Cypress Tests'
agents:
Expand Down
17 changes: 0 additions & 17 deletions .buildkite/pipelines/pointer_compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -321,23 +321,6 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/threat_intelligence.sh
label: 'Threat Intelligence Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/osquery_cypress.sh
label: 'Osquery Cypress Tests'
agents:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
SKIP_NODE_SETUP: true
TEAM_CHANNEL: "#kibana-mission-control"
ENVIRONMENT: ${ENVIRONMENT?}
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}

steps:
- label: ":pipeline::grey_question::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ steps:
CHECK_SLO_TAG: kibana
CHECK_SLO_WAITING_PERIOD: 15m
CHECK_SLO_BURN_RATE_THRESHOLD: 0.1
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}
soft_fail: true

- label: ":rocket: control-plane e2e tests"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ steps:
CHECK_SYNTHETICS_MINIMUM_RUNS: 3
MAX_FAILURES: 2
CHECK_SYNTHETIC_MAX_POLL: 50
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}
soft_fail: true

- wait: ~
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
SKIP_NODE_SETUP: true
TEAM_CHANNEL: "#kibana-mission-control"
ENVIRONMENT: ${ENVIRONMENT?}
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}

steps:
- label: ":pipeline::grey_question::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ steps:
CHECK_SLO_TAG: kibana
CHECK_SLO_WAITING_PERIOD: 15m
CHECK_SLO_BURN_RATE_THRESHOLD: 0.1
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}
soft_fail: true

- label: ":rocket: control-plane e2e tests"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ steps:
CHECK_SYNTHETICS_MINIMUM_RUNS: 3
MAX_FAILURES: 2
CHECK_SYNTHETIC_MAX_POLL: 50
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}
soft_fail: true

- wait: ~
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ steps:
localSsds: 1
localSsdInterface: nvme
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 300
parallelism: 5
retry:
Expand Down Expand Up @@ -102,6 +103,7 @@ steps:
localSsds: 1
localSsdInterface: nvme
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -119,6 +121,7 @@ steps:
localSsds: 1
localSsdInterface: nvme
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -136,6 +139,7 @@ steps:
localSsds: 1
localSsdInterface: nvme
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 120
retry:
automatic:
Expand All @@ -156,6 +160,7 @@ steps:
localSsds: 1
localSsdInterface: nvme
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 300
parallelism: 3
retry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 8
retry:
automatic:
- exit_status: "-1"
limit: 1

- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:detection_engine:exceptions
label: "Cypress MKI - Detection Engine - Exceptions"
Expand All @@ -35,10 +31,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 6
retry:
automatic:
- exit_status: "-1"
limit: 1

- group: "API MKI - Detection Engine - "
key: api_test_detections_engine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 2
retry:
automatic:
- exit_status: '-1'
limit: 1

- group: "API MKI - Entity Analytics"
key: api_test_entity_analytics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 4
retry:
automatic:
- exit_status: '-1'
limit: 1

- group: "API MKI - Explore"
key: api_test_explore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 1
retry:
automatic:
- exit_status: "-1"
limit: 1

- group: "API MKI - GenAI"
key: api_test_ai_assistant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 8
retry:
automatic:
- exit_status: '-1'
limit: 1

- group: "API MKI - Investigations"
key: api_test_investigations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 8
retry:
automatic:
- exit_status: "-1"
limit: 1

- command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:rule_management:prebuilt_rules
label: "Cypress MKI - Rule Management - Prebuilt Rules"
Expand All @@ -35,10 +31,6 @@ steps:
# TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
timeout_in_minutes: 300
parallelism: 4
retry:
automatic:
- exit_status: "-1"
limit: 1

- group: "API MKI - Rule Management"
key: api_test_rule_management
Expand Down
Loading

0 comments on commit 5f1a828

Please sign in to comment.