Skip to content

Commit 82e1d4e

Browse files
Merge branch 'master' into issue-56872
2 parents cab9176 + 2623976 commit 82e1d4e

File tree

240 files changed

+5152
-7932
lines changed

Some content is hidden

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

240 files changed

+5152
-7932
lines changed

.ci/Jenkinsfile_coverage

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
1313
]) {
1414
parallel([
1515
'kibana-intake-agent': {
16-
withEnv([
17-
'NODE_ENV=test' // Needed for jest tests only
18-
]) {
19-
kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
20-
}
16+
kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
2117
},
2218
'x-pack-intake-agent': {
2319
withEnv([

.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
/x-pack/plugins/ingest_manager/ @elastic/ingest
7676
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest
7777
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest
78+
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
7879

7980
# Machine Learning
8081
/x-pack/legacy/plugins/ml/ @elastic/ml-ui
@@ -184,3 +185,10 @@
184185
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
185186
/x-pack/test/functional/apps/endpoint/ @elastic/endpoint-app-team
186187
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
188+
189+
# SIEM
190+
/x-pack/legacy/plugins/siem/ @elastic/siem
191+
/x-pack/plugins/siem/ @elastic/siem
192+
/x-pack/test/detection_engine_api_integration @elastic/siem
193+
/x-pack/test/api_integration/apis/siem @elastic/siem
194+
/x-pack/plugins/case @elastic/siem

docs/management/advanced-options.asciidoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ into the document when displaying it.
7070
`metrics:max_buckets`:: The maximum numbers of buckets that a single
7171
data source can return. This might arise when the user selects a
7272
short interval (for example, 1s) for a long time period (1 year).
73-
`pageNavigation`:: The style of navigation menu for Kibana.
74-
Choices are Individual, the legacy style where every plugin is represented in the nav,
75-
and Grouped, a new format that bundles related plugins together in nested navigation.
7673
`query:allowLeadingWildcards`:: Allows a wildcard (*) as the first character
7774
in a query clause. Only applies when experimental query features are
7875
enabled in the query bar. To disallow leading wildcards in Lucene queries,

packages/kbn-optimizer/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* under the License.
1818
*/
1919

20+
// cache buster - https://github.com/elastic/kibana/issues/58077 - 1
2021
export { OptimizerConfig } from './optimizer';
2122
export * from './run_optimizer';
2223
export * from './log_optimizer_state';

packages/kbn-storybook/index.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const { first } = require('rxjs/operators');
2424
const storybook = require('@storybook/react/standalone');
2525
const { run } = require('@kbn/dev-utils');
2626
const { generateStorybookEntry } = require('./lib/storybook_entry');
27-
const { REPO_ROOT, CURRENT_CONFIG } = require('./lib/constants');
27+
const { REPO_ROOT, ASSET_DIR, CURRENT_CONFIG } = require('./lib/constants');
2828
const { buildDll } = require('./lib/dll');
2929

3030
exports.runStorybookCli = config => {
@@ -62,21 +62,25 @@ exports.runStorybookCli = config => {
6262
// route errors
6363
subj.toPromise(),
6464

65-
new Promise(() => {
65+
new Promise(async () => {
6666
// storybook never completes, so neither will this promise
6767
const configDir = join(__dirname, 'storybook_config');
6868
log.debug('Config dir:', configDir);
69-
storybook({
70-
mode: 'dev',
69+
await storybook({
70+
mode: flags.site ? 'static' : 'dev',
7171
port: 9001,
7272
configDir,
73+
outputDir: flags.site ? join(ASSET_DIR, name) : undefined,
7374
});
75+
76+
// Line is only reached when building the static version
77+
if (flags.site) process.exit();
7478
}),
7579
]);
7680
},
7781
{
7882
flags: {
79-
boolean: ['rebuildDll'],
83+
boolean: ['rebuildDll', 'site'],
8084
},
8185
description: `
8286
Run the storybook examples for ${name}

packages/kbn-storybook/storybook_config/preview-head.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
This file is looked for by Storybook and included in the HEAD element
33
if it exists. This is how we load the DLL content into the Storybook UI.
44
-->
5-
<script src="/dll.js"></script>
6-
<link href="/dll.css" rel="stylesheet" />
5+
<script src="./dll.js"></script>
6+
<link href="./dll.css" rel="stylesheet" />

packages/kbn-ui-shared-deps/entry.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ export const ReactDom = require('react-dom');
4040
export const ReactIntl = require('react-intl');
4141
export const ReactRouter = require('react-router'); // eslint-disable-line
4242
export const ReactRouterDom = require('react-router-dom');
43+
export const Monaco = require('./monaco.ts');
44+
export const MonacoBare = require('monaco-editor/esm/vs/editor/editor.api');
4345

4446
// load timezone data into moment-timezone
4547
Moment.tz.load(require('moment-timezone/data/packed/latest.json'));

packages/kbn-ui-shared-deps/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,7 @@ exports.externals = {
4141
'react-intl': '__kbnSharedDeps__.ReactIntl',
4242
'react-router': '__kbnSharedDeps__.ReactRouter',
4343
'react-router-dom': '__kbnSharedDeps__.ReactRouterDom',
44+
'@kbn/ui-shared-deps/monaco': '__kbnSharedDeps__.Monaco',
45+
// this is how plugins/consumers from npm load monaco
46+
'monaco-editor/esm/vs/editor/editor.api': '__kbnSharedDeps__.MonacoBare',
4447
};
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
21+
22+
import 'monaco-editor/esm/vs/base/common/worker/simpleWorker';
23+
import 'monaco-editor/esm/vs/base/worker/defaultWorkerFactory';
24+
25+
import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js';
26+
import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
27+
28+
import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js'; // Needed for suggestions
29+
import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js'; // Needed for hover
30+
import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js'; // Needed for signature
31+
32+
export { monaco };

packages/kbn-ui-shared-deps/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"@elastic/charts": "^17.0.2",
1313
"abortcontroller-polyfill": "^1.4.0",
1414
"@elastic/eui": "19.0.0",
15+
"@kbn/babel-preset": "1.0.0",
1516
"@kbn/dev-utils": "1.0.0",
1617
"@kbn/i18n": "1.0.0",
1718
"@yarnpkg/lockfile": "^1.1.0",

0 commit comments

Comments
 (0)