Skip to content

Commit 3439e4f

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into siem-ea-7920
2 parents 069f284 + dc29fb7 commit 3439e4f

855 files changed

Lines changed: 6457 additions & 3042 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/artifacts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ steps:
8888
- exit_status: -1
8989
agents:
9090
queue: n2-2
91-
timeout_in_minutes: 60
91+
timeout_in_minutes: 30
9292
if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
9393
retry:
9494
automatic:

‎.buildkite/scripts/steps/storybooks/build_and_upload.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const STORYBOOKS = [
1616
'canvas',
1717
'cases',
1818
'cell_actions',
19-
'ci_composite',
2019
'cloud_chat',
2120
'coloring',
2221
'chart_icons',
@@ -93,14 +92,12 @@ const upload = () => {
9392
console.log('--- Generating Storybooks HTML');
9493

9594
process.chdir(path.join('.', 'built_assets', 'storybook'));
96-
fs.renameSync('ci_composite', 'composite');
9795

9896
const storybooks = execSync(`ls -1d */`)
9997
.toString()
10098
.trim()
10199
.split('\n')
102-
.map((filePath) => filePath.replace('/', ''))
103-
.filter((filePath) => filePath !== 'composite');
100+
.map((filePath) => filePath.replace('/', ''));
104101

105102
const listHtml = storybooks
106103
.map((storybook) => `<li><a href="${STORYBOOK_BASE_URL}/${storybook}">${storybook}</a></li>`)
@@ -110,8 +107,6 @@ const upload = () => {
110107
<html>
111108
<body>
112109
<h1>Storybooks</h1>
113-
<p><a href="${STORYBOOK_BASE_URL}/composite">Composite Storybook</a></p>
114-
<h2>All</h2>
115110
<ul>
116111
${listHtml}
117112
</ul>

‎.ci/.storybook/main.js‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=20.9.0
4+
ARG NODE_VERSION=18.18.2
55

66
FROM node:${NODE_VERSION} AS base
77

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ x-pack/packages/ml/route_utils @elastic/ml-ui
536536
x-pack/packages/ml/runtime_field_utils @elastic/ml-ui
537537
x-pack/packages/ml/string_hash @elastic/ml-ui
538538
x-pack/packages/ml/trained_models_utils @elastic/ml-ui
539+
x-pack/packages/ml/ui_actions @elastic/ml-ui
539540
x-pack/packages/ml/url_state @elastic/ml-ui
540541
packages/kbn-monaco @elastic/appex-sharedux
541542
x-pack/plugins/monitoring_collection @elastic/obs-ux-infra_services-team
@@ -1466,6 +1467,7 @@ x-pack/plugins/security_solution/public/overview/components/entity_analytics
14661467
x-pack/plugins/security_solution/server/lib/entity_analytics @elastic/security-entity-analytics
14671468
x-pack/plugins/security_solution/server/lib/risk_score @elastic/security-entity-analytics
14681469
x-pack/test/security_solution_api_integration/test_suites/entity_analytics @elastic/security-entity-analytics
1470+
x-pack/plugins/security_solution/public/flyout/entity_details @elastic/security-entity-analytics
14691471

14701472
# Security Defend Workflows - OSQuery Ownership
14711473
/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_response_actions @elastic/security-defend-workflows

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.9.0
1+
18.18.2

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.9.0
1+
18.18.2

‎WORKSPACE.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install
2222
# Setup the Node.js toolchain for the architectures we want to support
2323
node_repositories(
2424
node_repositories = {
25-
"20.9.0-darwin_amd64": ("node-v20.9.0-darwin-x64.tar.gz", "node-v20.9.0-darwin-x64", "fc5b73f2a78c17bbe926cdb1447d652f9f094c79582f1be6471b4b38a2e1ccc8"),
26-
"20.9.0-darwin_arm64": ("node-v20.9.0-darwin-arm64.tar.gz", "node-v20.9.0-darwin-arm64", "31d2d46ae8d8a3982f54e2ff1e60c2e4a8e80bf78a3e8b46dcaac95ac5d7ce6a"),
27-
"20.9.0-linux_arm64": ("node-v20.9.0-linux-arm64.tar.xz", "node-v20.9.0-linux-arm64", "79c07c41c9f2410e35fd8dec61491ba63762e428bffa2ee0ff3aec1afe05d4b1"),
28-
"20.9.0-linux_amd64": ("node-v20.9.0-linux-x64.tar.xz", "node-v20.9.0-linux-x64", "d11a5e06d6fda8d0cb1a759365d2b5e33c609f3c9f333fdc63e0522475dc0c89"),
29-
"20.9.0-windows_amd64": ("node-v20.9.0-win-x64.zip", "node-v20.9.0-win-x64", "70d87dad2378c63216ff83d5a754c61d2886fc39d32ce0d2ea6de763a22d3780"),
25+
"18.18.2-darwin_amd64": ("node-v18.18.2-darwin-x64.tar.gz", "node-v18.18.2-darwin-x64", "5bb8da908ed590e256a69bf2862238c8a67bc4600119f2f7721ca18a7c810c0f"),
26+
"18.18.2-darwin_arm64": ("node-v18.18.2-darwin-arm64.tar.gz", "node-v18.18.2-darwin-arm64", "9f982cc91b28778dd8638e4f94563b0c2a1da7aba62beb72bd427721035ab553"),
27+
"18.18.2-linux_arm64": ("node-v18.18.2-linux-arm64.tar.xz", "node-v18.18.2-linux-arm64", "8a5a03f6a742159c9aa0ae3a99b368cd938cf62f3a5522a2e5acbe6313710efe"),
28+
"18.18.2-linux_amd64": ("node-v18.18.2-linux-x64.tar.xz", "node-v18.18.2-linux-x64", "f7cf590bc7153f3beaa9e1138d00e50d74df223f0bec61f63e7df65f7315b76a"),
29+
"18.18.2-windows_amd64": ("node-v18.18.2-win-x64.zip", "node-v18.18.2-win-x64", "3bb0e51e579a41a22b3bf6cb2f3e79c03801aa17acbe0ca00fc555d1282e7acd"),
3030
},
31-
node_version = "20.9.0",
31+
node_version = "18.18.2",
3232
node_urls = [
3333
"https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v{version}/{filename}",
3434
],

‎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-11-21
11+
date: 2023-11-22
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-11-21
11+
date: 2023-11-22
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

0 commit comments

Comments
 (0)