Skip to content

Commit 924c565

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/custom-formatter
2 parents cf68fe0 + b08c322 commit 924c565

1,281 files changed

Lines changed: 25617 additions & 8392 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/pipelines/flaky_tests/pipeline.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ for (const testSuite of testSuites) {
177177
// by setting chunks vars to value 1, which means all test will run in one job
178178
CLI_NUMBER: 1,
179179
CLI_COUNT: 1,
180+
// The security solution cypress tests don't recognize CLI_NUMBER and CLI_COUNT, they use `BUILDKITE_PARALLEL_JOB_COUNT` and `BUILDKITE_PARALLEL_JOB`, which cannot be overridden here.
181+
// Use `RUN_ALL_TESTS` to make Security Solution Cypress tests run all tests instead of a subset.
182+
RUN_ALL_TESTS: 'true',
180183
},
181184
});
182185
break;

.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -euo pipefail
44

55
echo "--- Trigger unsupported ftr tests"
6-
ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-on-merge-unsupported-ftrs "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT"
6+
ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-on-merge-unsupported-ftrs "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT" "$BUILDKITE_BUILD_ID"

.buildkite/scripts/steps/trigger_pipeline.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ import { BuildkiteClient } from '#pipeline-utils';
1111
const pipelineSlug = process.argv[2];
1212
const branch = process.argv[3] || 'main';
1313
const commit = process.argv[4] || 'HEAD';
14+
const kibanaBuildId = process.argv[5] || '';
1415

1516
(async () => {
1617
try {
1718
const client = new BuildkiteClient();
1819
const build = await client.triggerBuild(pipelineSlug, {
1920
commit,
2021
branch,
22+
env: {
23+
...(kibanaBuildId && { KIBANA_BUILD_ID: kibanaBuildId }),
24+
},
2125
ignore_pipeline_branch_filters: true, // Required because of a Buildkite bug
2226
});
2327
console.log(`Triggered build: ${build.web_url}`);

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: 2023-06-09
11+
date: 2023-06-12
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

api_docs/advanced_settings.mdx

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

api_docs/aiops.mdx

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

api_docs/alerting.devdocs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,6 +2660,10 @@
26602660
"plugin": "observability",
26612661
"path": "x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.ts"
26622662
},
2663+
{
2664+
"plugin": "observability",
2665+
"path": "x-pack/plugins/observability/server/lib/rules/threshold/threshold_executor.ts"
2666+
},
26632667
{
26642668
"plugin": "ml",
26652669
"path": "x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts"

api_docs/alerting.mdx

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

api_docs/apm.mdx

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

api_docs/asset_manager.mdx

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

0 commit comments

Comments
 (0)