Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/elastic/kibana into rule-re…
Browse files Browse the repository at this point in the history
…gistry/log-es-errors
  • Loading branch information
ymao1 committed Jul 12, 2022
2 parents 0853f6a + 8acc146 commit c31451e
Show file tree
Hide file tree
Showing 1,195 changed files with 66,619 additions and 38,394 deletions.
10 changes: 5 additions & 5 deletions .buildkite/pipelines/performance/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ steps:
depends_on: build
key: tests

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

- label: ':chart_with_upwards_trend: Report performance metrics to ci-stats'
command: .buildkite/scripts/steps/functional/report_performance_metrics.sh
Expand Down
7 changes: 0 additions & 7 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,3 @@ steps:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
label: 'Build Webpack Bundle Analyzer reports'
agents:
queue: c2-16
key: webpack_bundle_analyzer
timeout_in_minutes: 60
7 changes: 7 additions & 0 deletions .buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
steps:
- command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
label: 'Build Webpack Bundle Analyzer reports'
agents:
queue: n2-4-spot
key: webpack_bundle_analyzer
timeout_in_minutes: 60
4 changes: 4 additions & 0 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ const uploadPipeline = (pipelineContent: string | object) => {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/deploy_cloud.yml'));
}

if (GITHUB_PR_LABELS.includes('ci:build-webpack-bundle-analyzer')) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml'));
}

pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml'));

uploadPipeline(pipeline.join('\n'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ set -euo pipefail

.buildkite/scripts/bootstrap.sh

export NODE_OPTIONS="--max-old-space-size=8192"

node scripts/build_kibana_platform_plugins.js --dist --profile

mkdir -p built_assets/webpack_bundle_analyzer
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
on:
pull_request_target:
branches:
- main
types:
- closed
- labeled
Expand All @@ -12,12 +10,7 @@ jobs:
runs-on: ubuntu-latest
if: |
github.event.pull_request.merged == true
&& (
contains(github.event.pull_request.labels.*.name, 'backport:prev-minor')
|| contains(github.event.pull_request.labels.*.name, 'backport:prev-major')
|| contains(github.event.pull_request.labels.*.name, 'backport:all-open')
|| contains(github.event.pull_request.labels.*.name, 'backport:auto-version')
)
&& !contains(github.event.pull_request.labels.*.name, 'auto-backport')
&& (
(
github.event.action == 'labeled' && (
Expand Down
48 changes: 6 additions & 42 deletions api_docs/actions.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -762,13 +762,7 @@
"description": [],
"signature": [
"(source: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>) => ",
"HttpRequestExecutionSource"
],
Expand All @@ -783,13 +777,7 @@
"label": "source",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/actions/server/lib/action_execution_source.ts",
Expand Down Expand Up @@ -2278,13 +2266,7 @@
"description": [],
"signature": [
"(request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>) => Promise<",
"PublicMethodsOf",
"<",
Expand All @@ -2308,13 +2290,7 @@
"label": "request",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/actions/server/plugin.ts",
Expand All @@ -2333,13 +2309,7 @@
"description": [],
"signature": [
"(request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>) => ",
"PublicMethodsOf",
"<",
Expand All @@ -2363,13 +2333,7 @@
"label": "request",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/actions/server/plugin.ts",
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
summary: API docs for the actions plugin
date: 2022-07-11
date: 2022-07-12
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
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.
---
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
summary: API docs for the advancedSettings plugin
date: 2022-07-11
date: 2022-07-12
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
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.
---
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
summary: API docs for the aiops plugin
date: 2022-07-11
date: 2022-07-12
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
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.
---
Expand Down
34 changes: 5 additions & 29 deletions api_docs/alerting.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1510,13 +1510,7 @@
"description": [],
"signature": [
"(request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>) => ",
"RulesClientApi"
],
Expand All @@ -1531,13 +1525,7 @@
"label": "request",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/alerting/server/plugin.ts",
Expand All @@ -1556,13 +1544,7 @@
"description": [],
"signature": [
"(request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>) => ",
"PublicMethodsOf",
"<",
Expand All @@ -1586,13 +1568,7 @@
"label": "request",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/alerting/server/plugin.ts",
Expand Down Expand Up @@ -3075,7 +3051,7 @@
"section": "def-common.RuleSnoozeSchedule",
"text": "RuleSnoozeSchedule"
},
"; }) => Promise<void>; unsnooze: ({ id, scheduleIds, }: { id: string; scheduleIds?: string[] | undefined; }) => Promise<void>; updateSnoozedUntilTime: ({ id }: { id: string; }) => Promise<void>; unmuteAll: ({ id }: { id: string; }) => Promise<void>; muteInstance: ({ alertId, alertInstanceId }: ",
"; }) => Promise<void>; unsnooze: ({ id, scheduleIds, }: { id: string; scheduleIds?: string[] | undefined; }) => Promise<void>; updateSnoozedUntilTime: ({ id }: { id: string; }) => Promise<void>; clearExpiredSnoozes: ({ id }: { id: string; }) => Promise<void>; unmuteAll: ({ id }: { id: string; }) => Promise<void>; muteInstance: ({ alertId, alertInstanceId }: ",
"MuteOptions",
") => Promise<void>; unmuteInstance: ({ alertId, alertInstanceId }: ",
"MuteOptions",
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/alerting
title: "alerting"
image: https://source.unsplash.com/400x175/?github
summary: API docs for the alerting plugin
date: 2022-07-11
date: 2022-07-12
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
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.
---
Expand Down
40 changes: 5 additions & 35 deletions api_docs/apm.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,7 @@
"; telemetryCollectionEnabled: boolean; metricsInterval: number; profilingEnabled: boolean; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }>>; getApmIndices: () => Promise<",
"ApmIndicesConfig",
">; createApmEventClient: ({ request, context, debug, }: { debug?: boolean | undefined; request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>; context: ",
"ApmPluginRequestHandlerContext",
"; }) => Promise<",
Expand Down Expand Up @@ -342,13 +336,7 @@
"label": "request",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/apm/server/routes/typings.ts",
Expand Down Expand Up @@ -543,13 +531,7 @@
"text": "LicensingApiRequestHandlerContext"
},
">; }, request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>) => Promise<{ readonly index: string; create: (createParams: { annotation: { type: string; }; '@timestamp': string; message: string; } & { tags?: string[] | undefined; service?: { name?: string | undefined; environment?: string | undefined; version?: string | undefined; } | undefined; }) => Promise<{ _id: string; _index: string; _source: ",
"Annotation",
"; }>; getById: (getByIdParams: { id: string; }) => Promise<",
Expand Down Expand Up @@ -5340,13 +5322,7 @@
"description": [],
"signature": [
"(params: { debug?: boolean | undefined; request: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>; context: ",
"ApmPluginRequestHandlerContext",
"; }) => Promise<",
Expand Down Expand Up @@ -5387,13 +5363,7 @@
"label": "request",
"description": [],
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaRequest",
"text": "KibanaRequest"
},
"KibanaRequest",
"<unknown, unknown, unknown, any>"
],
"path": "x-pack/plugins/apm/server/types.ts",
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/apm
title: "apm"
image: https://source.unsplash.com/400x175/?github
summary: API docs for the apm plugin
date: 2022-07-11
date: 2022-07-12
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
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.
---
Expand Down
2 changes: 1 addition & 1 deletion api_docs/banners.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ slug: /kibana-dev-docs/api/banners
title: "banners"
image: https://source.unsplash.com/400x175/?github
summary: API docs for the banners plugin
date: 2022-07-11
date: 2022-07-12
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
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.
---
Expand Down
Loading

0 comments on commit c31451e

Please sign in to comment.