Skip to content

Commit 43bc0b5

Browse files
Merge branch 'main' into apm-breadcrumbs
2 parents b7dd1b3 + 4ad614c commit 43bc0b5

File tree

876 files changed

+53887
-26880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

876 files changed

+53887
-26880
lines changed

.buildkite/pipelines/performance/daily.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ steps:
1919
depends_on: build
2020
key: tests
2121

22-
- label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
23-
command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh
24-
agents:
25-
queue: n2-2
26-
depends_on: tests
22+
# - label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
23+
# command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh
24+
# agents:
25+
# queue: n2-2
26+
# depends_on: tests
2727

2828
- label: ':chart_with_upwards_trend: Report performance metrics to ci-stats'
2929
command: .buildkite/scripts/steps/functional/report_performance_metrics.sh

.buildkite/pipelines/pull_request/base.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,3 @@ steps:
7575
automatic:
7676
- exit_status: '-1'
7777
limit: 3
78-
79-
- command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
80-
label: 'Build Webpack Bundle Analyzer reports'
81-
agents:
82-
queue: c2-16
83-
key: webpack_bundle_analyzer
84-
timeout_in_minutes: 60
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
3+
label: 'Build Webpack Bundle Analyzer reports'
4+
agents:
5+
queue: n2-4-spot
6+
key: webpack_bundle_analyzer
7+
timeout_in_minutes: 60

.buildkite/scripts/pipelines/pull_request/pipeline.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ const uploadPipeline = (pipelineContent: string | object) => {
126126
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/deploy_cloud.yml'));
127127
}
128128

129+
if (GITHUB_PR_LABELS.includes('ci:build-webpack-bundle-analyzer')) {
130+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml'));
131+
}
132+
129133
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml'));
130134

131135
uploadPipeline(pipeline.join('\n'));

.buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -euo pipefail
44

55
.buildkite/scripts/bootstrap.sh
66

7+
export NODE_OPTIONS="--max-old-space-size=8192"
8+
79
node scripts/build_kibana_platform_plugins.js --dist --profile
810

911
mkdir -p built_assets/webpack_bundle_analyzer

.github/workflows/on-merge.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
on:
22
pull_request_target:
3-
branches:
4-
- main
53
types:
64
- closed
75
- labeled
@@ -12,12 +10,7 @@ jobs:
1210
runs-on: ubuntu-latest
1311
if: |
1412
github.event.pull_request.merged == true
15-
&& (
16-
contains(github.event.pull_request.labels.*.name, 'backport:prev-minor')
17-
|| contains(github.event.pull_request.labels.*.name, 'backport:prev-major')
18-
|| contains(github.event.pull_request.labels.*.name, 'backport:all-open')
19-
|| contains(github.event.pull_request.labels.*.name, 'backport:auto-version')
20-
)
13+
&& !contains(github.event.pull_request.labels.*.name, 'auto-backport')
2114
&& (
2215
(
2316
github.event.action == 'labeled' && (

api_docs/actions.devdocs.json

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -762,13 +762,7 @@
762762
"description": [],
763763
"signature": [
764764
"(source: ",
765-
{
766-
"pluginId": "core",
767-
"scope": "server",
768-
"docId": "kibCoreHttpPluginApi",
769-
"section": "def-server.KibanaRequest",
770-
"text": "KibanaRequest"
771-
},
765+
"KibanaRequest",
772766
"<unknown, unknown, unknown, any>) => ",
773767
"HttpRequestExecutionSource"
774768
],
@@ -783,13 +777,7 @@
783777
"label": "source",
784778
"description": [],
785779
"signature": [
786-
{
787-
"pluginId": "core",
788-
"scope": "server",
789-
"docId": "kibCoreHttpPluginApi",
790-
"section": "def-server.KibanaRequest",
791-
"text": "KibanaRequest"
792-
},
780+
"KibanaRequest",
793781
"<unknown, unknown, unknown, any>"
794782
],
795783
"path": "x-pack/plugins/actions/server/lib/action_execution_source.ts",
@@ -2278,13 +2266,7 @@
22782266
"description": [],
22792267
"signature": [
22802268
"(request: ",
2281-
{
2282-
"pluginId": "core",
2283-
"scope": "server",
2284-
"docId": "kibCoreHttpPluginApi",
2285-
"section": "def-server.KibanaRequest",
2286-
"text": "KibanaRequest"
2287-
},
2269+
"KibanaRequest",
22882270
"<unknown, unknown, unknown, any>) => Promise<",
22892271
"PublicMethodsOf",
22902272
"<",
@@ -2308,13 +2290,7 @@
23082290
"label": "request",
23092291
"description": [],
23102292
"signature": [
2311-
{
2312-
"pluginId": "core",
2313-
"scope": "server",
2314-
"docId": "kibCoreHttpPluginApi",
2315-
"section": "def-server.KibanaRequest",
2316-
"text": "KibanaRequest"
2317-
},
2293+
"KibanaRequest",
23182294
"<unknown, unknown, unknown, any>"
23192295
],
23202296
"path": "x-pack/plugins/actions/server/plugin.ts",
@@ -2333,13 +2309,7 @@
23332309
"description": [],
23342310
"signature": [
23352311
"(request: ",
2336-
{
2337-
"pluginId": "core",
2338-
"scope": "server",
2339-
"docId": "kibCoreHttpPluginApi",
2340-
"section": "def-server.KibanaRequest",
2341-
"text": "KibanaRequest"
2342-
},
2312+
"KibanaRequest",
23432313
"<unknown, unknown, unknown, any>) => ",
23442314
"PublicMethodsOf",
23452315
"<",
@@ -2363,13 +2333,7 @@
23632333
"label": "request",
23642334
"description": [],
23652335
"signature": [
2366-
{
2367-
"pluginId": "core",
2368-
"scope": "server",
2369-
"docId": "kibCoreHttpPluginApi",
2370-
"section": "def-server.KibanaRequest",
2371-
"text": "KibanaRequest"
2372-
},
2336+
"KibanaRequest",
23732337
"<unknown, unknown, unknown, any>"
23742338
],
23752339
"path": "x-pack/plugins/actions/server/plugin.ts",

api_docs/actions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/actions
44
title: "actions"
55
image: https://source.unsplash.com/400x175/?github
66
summary: API docs for the actions plugin
7-
date: 2022-07-11
7+
date: 2022-07-12
88
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
99
warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
1010
---

api_docs/advanced_settings.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/advancedSettings
44
title: "advancedSettings"
55
image: https://source.unsplash.com/400x175/?github
66
summary: API docs for the advancedSettings plugin
7-
date: 2022-07-11
7+
date: 2022-07-12
88
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
99
warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
1010
---

api_docs/aiops.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/aiops
44
title: "aiops"
55
image: https://source.unsplash.com/400x175/?github
66
summary: API docs for the aiops plugin
7-
date: 2022-07-11
7+
date: 2022-07-12
88
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
99
warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
1010
---

0 commit comments

Comments
 (0)