Skip to content

Commit

Permalink
Merge branch 'main' into oas/connector-response-body
Browse files Browse the repository at this point in the history
  • Loading branch information
@doakalexi
doakalexi authored Sep 16, 2024
2 parents 847f708 + 1f673dc commit f81a590
Show file tree
Hide file tree
Showing 1,674 changed files with 25,282 additions and 20,634 deletions.
4 changes: 3 additions & 1 deletion .backportrc.json
View file
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
10 changes: 7 additions & 3 deletions .buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
View file
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
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-fips-daily.yml
View file
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
2 changes: 1 addition & 1 deletion .buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
View file
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
2 changes: 1 addition & 1 deletion .buildkite/pipeline-resource-definitions/kibana-on-merge.yml
View file
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
View file
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
View file
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
1 change: 1 addition & 0 deletions .buildkite/pull_requests.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"enabled": true,
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["elastic-vault-github-plugin-prod[bot]"],
"set_commit_status": true,
"commit_status_context": "kibana-ci",
"build_on_commit": true,
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/lifecycle/post_command.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
buildkite-agent artifact upload '.es/**/*.hprof'
buildkite-agent artifact upload 'data/es_debug_*.tar.gz'
buildkite-agent artifact upload '.es/es*.log'

if [[ $BUILDKITE_COMMAND_EXIT_STATUS -ne 0 ]]; then
if [[ $BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG == 'elasticsearch-serverless-intake' ]]; then
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('pipeline trigger combinations', () => {
it('should trigger the correct pipelines for "es-forward"', () => {
const esForwardTriggers = getESForwardPipelineTriggers();
// tests 7.17 against 8.x versions
const targets = versionsFile.versions.filter((v) => v.currentMajor === true);
const targets = versionsFile.versions.filter((v) => v.branch.startsWith('8.'));

expect(esForwardTriggers.length).to.eql(targets.length);

Expand All @@ -43,7 +43,6 @@ describe('pipeline trigger combinations', () => {
const snapshotTriggers = getArtifactSnapshotPipelineTriggers();
// triggers for all open branches
const branches = versionsFile.versions.map((v) => v.branch);

expect(snapshotTriggers.length).to.eql(branches.length);

branches.forEach((b) => {
Expand All @@ -53,9 +52,10 @@ describe('pipeline trigger combinations', () => {

it('should trigger the correct pipelines for "artifacts-trigger"', () => {
const triggerTriggers = getArtifactBuildTriggers();
// all currentMajor+prevMinor branches
// all branches that have fixed versions, and excluding 7.17 (i.e. not 7.17, [0-9].x and main)
const branches = versionsFile.versions
.filter((v) => v.currentMajor === true && v.previousMinor === true)
.filter((v) => v.branch.match(/[0-9]{1,2}\.[0-9]{1,2}/))
.filter((v) => v.previousMajor === true)
.map((v) => v.branch);

expect(triggerTriggers.length).to.eql(branches.length);
Expand All @@ -66,9 +66,9 @@ describe('pipeline trigger combinations', () => {

it('should trigger the correct pipelines for "artifacts-staging"', () => {
const stagingTriggers = getArtifactStagingPipelineTriggers();
// all branches that are not currentMajor+currentMinor
// all branches that have fixed versions (i.e. not [0-9].x and main)
const branches = versionsFile.versions
.filter((v) => !v.currentMajor || !v.currentMinor)
.filter((v) => v.branch.match(/[0-9]{1,2}\.[0-9]{1,2}/))
.map((v) => v.branch);

expect(stagingTriggers.length).to.eql(branches.length);
Expand Down
27 changes: 17 additions & 10 deletions .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,20 @@ async function main() {
*/
export function getESForwardPipelineTriggers(): BuildkiteTriggerStep[] {
const versions = getVersionsFile();
const kibanaPrevMajor = versions.prevMajors[0];
const targetESVersions = [versions.prevMinors, versions.current].flat();
const KIBANA_7_17 = versions.versions.find((v) => v.branch === '7.17');
if (!KIBANA_7_17) {
throw new Error('Update ES forward compatibility pipeline to remove 7.17 and add version 8');
}
const targetESVersions = versions.versions.filter((v) => v.branch.startsWith('8.'));

return targetESVersions.map(({ version }) => {
return {
trigger: pipelineSets['es-forward'],
async: true,
label: `Triggering Kibana ${kibanaPrevMajor.version} + ES ${version} forward compatibility`,
label: `Triggering Kibana ${KIBANA_7_17.version} + ES ${version} forward compatibility`,
build: {
message: process.env.MESSAGE || `ES forward-compatibility test for ES ${version}`,
branch: kibanaPrevMajor.branch,
branch: KIBANA_7_17.branch,
commit: 'HEAD',
env: {
ES_SNAPSHOT_MANIFEST: `https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${version}/manifest-latest-verified.json`,
Expand All @@ -89,12 +92,12 @@ export function getESForwardPipelineTriggers(): BuildkiteTriggerStep[] {

/**
* This pipeline creates Kibana artifact snapshots for all open branches.
* Should be triggered for all open branches in the versions.json: 7.x, 8.x
* Should be triggered for all open branches in the versions.json
*/
export function getArtifactSnapshotPipelineTriggers() {
// Trigger for all named branches
const versions = getVersionsFile();
const targetVersions = [versions.prevMajors, versions.prevMinors, versions.current].flat();
const targetVersions = versions.versions;

return targetVersions.map(({ branch }) => {
return {
Expand All @@ -115,12 +118,14 @@ export function getArtifactSnapshotPipelineTriggers() {

/**
* This pipeline creates Kibana artifacts for branches that are not the current main.
* Should be triggered for all open branches in the versions.json: 7.x, 8.x, but not main.
* Should be triggered for all open branches with a fixed version: not main and 8.x.
*/
export function getArtifactStagingPipelineTriggers() {
// Trigger for all branches, that are not current minor+major
const versions = getVersionsFile();
const targetVersions = [versions.prevMajors, versions.prevMinors].flat();
const targetVersions = versions.versions.filter((version) =>
Boolean(version.branch.match(/[0-9]{1,2}\.[0-9]{1,2}/))
);

return targetVersions.map(({ branch }) => {
return {
Expand All @@ -142,13 +147,15 @@ export function getArtifactStagingPipelineTriggers() {
/**
* This pipeline checks if there are any changes in the incorporated $BEATS_MANIFEST_LATEST_URL (beats version)
* and triggers a staging artifact build.
* Should be triggered only for the active minor versions that are not `main` and not `7.17`.
* Should be triggered for all open branches with a fixed version excluding 7.17: not main, 7.17 and 8.x.
*
* TODO: we could basically do the check logic of .buildkite/scripts/steps/artifacts/trigger.sh in here, and remove kibana-artifacts-trigger
*/
export function getArtifactBuildTriggers() {
const versions = getVersionsFile();
const targetVersions = versions.prevMinors;
const targetVersions = versions.prevMajors.filter((version) =>
Boolean(version.branch.match(/[0-9]{1,2}\.[0-9]{1,2}/))
);

return targetVersions.map(
({ branch }) =>
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/serverless/create_deploy_tag/info_sections/commit_info.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export async function getCurrentQARelease() {
// @ts-ignore
const fileContent = Buffer.from(releasesFile.data.content, 'base64').toString('utf8');

const sha = fileContent.match(`qa: "([a-z0-9]+)"`)?.[1];
const sha = fileContent.match(`qa-ds-1: "([a-z0-9]+)"`)?.[1];

if (!sha) {
throw new Error('Could not find QA hash in current releases file');
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ x-pack/plugins/enterprise_search @elastic/search-kibana
x-pack/plugins/observability_solution/entities_data_access @elastic/obs-entities
x-pack/packages/kbn-entities-schema @elastic/obs-entities
x-pack/test/api_integration/apis/entity_manager/fixture_plugin @elastic/obs-entities
x-pack/plugins/observability_solution/entity_manager @elastic/obs-entities
x-pack/plugins/entity_manager @elastic/obs-entities
examples/error_boundary @elastic/appex-sharedux
packages/kbn-es @elastic/kibana-operations
packages/kbn-es-archiver @elastic/kibana-operations @elastic/appex-qa
Expand Down Expand Up @@ -508,8 +508,8 @@ src/plugins/image_embeddable @elastic/appex-sharedux
packages/kbn-import-locator @elastic/kibana-operations
packages/kbn-import-resolver @elastic/kibana-operations
x-pack/plugins/index_lifecycle_management @elastic/kibana-management
x-pack/packages/index-management @elastic/kibana-management
x-pack/plugins/index_management @elastic/kibana-management
x-pack/packages/index-management/index_management_shared_types @elastic/kibana-management
test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
x-pack/packages/ml/inference_integration_flyout @elastic/ml-ui
x-pack/plugins/inference @elastic/appex-ai-infra
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2024-09-12
date: 2024-09-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2024-09-12
date: 2024-09-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_selection.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
title: "aiAssistantManagementSelection"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementSelection plugin
date: 2024-09-12
date: 2024-09-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
---
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2024-09-12
date: 2024-09-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
title: "alerting"
image: https://source.unsplash.com/400x175/?github
description: API docs for the alerting plugin
date: 2024-09-12
date: 2024-09-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
---
import alertingObj from './alerting.devdocs.json';
Expand Down
Loading

0 comments on commit f81a590

Please sign in to comment.