Skip to content

Commit

Permalink
Merge branch 'main' of github.com:elastic/kibana into alert-sm
Browse files Browse the repository at this point in the history
  • Loading branch information
XavierM committed Jul 19, 2022
2 parents 43bbcea + 6af683a commit e43f6ed
Show file tree
Hide file tree
Showing 12,611 changed files with 405,819 additions and 306,211 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
},
"autoMerge": true,
"autoMergeMethod": "squash",
"backportBinary": "node scripts/backport"
"backportBinary": "node scripts/backport",
"prDescription": "{defaultPrDescription}\n\n<!--BACKPORT {commits} BACKPORT-->"
}
10 changes: 10 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,26 @@
# Issues are opened for to include that feature but not available yet
# https://github.com/bazelbuild/bazel/issues/7093
# https://github.com/bazelbuild/bazel/issues/8106
.buildkite
.ci
.chromium
.git
.github
.idea
.native_modules
.teamcity
.yarn-local-mirror
.vscode
api_docs
bazel-bin
bazel-kibana
bazel-out
bazel-testlogs
build
data
dev_docs
docs
legacy_rfcs
node_modules
target
vars
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.0
5.1.1
5 changes: 5 additions & 0 deletions .buildkite/.mocharc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"extension": ["ts"],
"spec": "**/*.test.ts",
"require": "ts-node/register"
}
1 change: 1 addition & 0 deletions .buildkite/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
1 change: 1 addition & 0 deletions .buildkite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Directory Structure

- `hooks` - special directory used by Buildkite agents for [hooks](https://buildkite.com/docs/agent/v3/hooks)
- `pipeline-utils` - Shared TypeScript utils for use in pipeline scripts
- `pipelines` - contains pipeline definitions
- `scripts/common` - scripts that get `source`d by other scripts to set environment variables or import shared functions
- `scripts/lifecycle` - general scripts for tasks that run before or after individual steps or the entire build
Expand Down
8 changes: 8 additions & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ disabled:
- x-pack/plugins/synthetics/e2e/config.ts
- x-pack/plugins/synthetics/e2e/synthetics_run.ts
- x-pack/plugins/ux/e2e/synthetics_run.ts
- x-pack/plugins/observability/e2e/synthetics_run.ts

# Configs that exist but weren't running in CI when this file was introduced
- test/visual_regression/config.ts
Expand All @@ -54,7 +55,9 @@ disabled:
- x-pack/test/load/config.ts
- x-pack/test/plugin_api_perf/config.js
- x-pack/test/screenshot_creation/config.ts
- x-pack/test/fleet_packages/config.ts

defaultQueue: 'n2-4-spot'
enabled:
- test/accessibility/config.ts
- test/analytics/config.ts
Expand All @@ -73,6 +76,7 @@ enabled:
- test/functional/apps/discover/config.ts
- test/functional/apps/getting_started/config.ts
- test/functional/apps/home/config.ts
- test/functional/apps/kibana_overview/config.ts
- test/functional/apps/management/config.ts
- test/functional/apps/saved_objects_management/config.ts
- test/functional/apps/status_page/config.ts
Expand All @@ -94,6 +98,9 @@ enabled:
- test/interactive_setup_functional/manual_configuration.config.ts
- test/interpreter_functional/config.ts
- test/new_visualize_flow/config.ts
- test/node_roles_functional/all.config.ts
- test/node_roles_functional/background_tasks.config.ts
- test/node_roles_functional/ui.config.ts
- test/plugin_functional/config.ts
- test/server_integration/http/platform/config.status.ts
- test/server_integration/http/platform/config.ts
Expand Down Expand Up @@ -204,6 +211,7 @@ enabled:
- x-pack/test/reporting_functional/reporting_and_deprecated_security.config.ts
- x-pack/test/reporting_functional/reporting_and_security.config.ts
- x-pack/test/reporting_functional/reporting_without_security.config.ts
- x-pack/test/reporting_functional/reporting_and_timeout.config.ts
- x-pack/test/rule_registry/security_and_spaces/config_basic.ts
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
- x-pack/test/rule_registry/spaces_only/config_basic.ts
Expand Down
Loading

0 comments on commit e43f6ed

Please sign in to comment.