Skip to content

Commit 1147b7d

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into case-cleanups
2 parents a51c776 + 5238493 commit 1147b7d

120 files changed

Lines changed: 1580 additions & 762 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.

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
/src/plugins/ui_actions/ @elastic/kibana-app-arch
5555
/src/plugins/visualizations/ @elastic/kibana-app-arch
5656
/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
57+
/x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
5758

5859
# APM
5960
/x-pack/legacy/plugins/apm/ @elastic/apm-ui
@@ -185,3 +186,10 @@
185186
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
186187
/x-pack/test/functional/apps/endpoint/ @elastic/endpoint-app-team
187188
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
189+
190+
# SIEM
191+
/x-pack/legacy/plugins/siem/ @elastic/siem
192+
/x-pack/plugins/siem/ @elastic/siem
193+
/x-pack/test/detection_engine_api_integration @elastic/siem
194+
/x-pack/test/api_integration/apis/siem @elastic/siem
195+
/x-pack/plugins/case @elastic/siem

‎docs/development/core/public/kibana-plugin-public.ibasepath.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ export interface IBasePath
1919
| [get](./kibana-plugin-public.ibasepath.get.md) | <code>() =&gt; string</code> | Gets the <code>basePath</code> string. |
2020
| [prepend](./kibana-plugin-public.ibasepath.prepend.md) | <code>(url: string) =&gt; string</code> | Prepends <code>path</code> with the basePath. |
2121
| [remove](./kibana-plugin-public.ibasepath.remove.md) | <code>(url: string) =&gt; string</code> | Removes the prepended basePath from the <code>path</code>. |
22+
| [serverBasePath](./kibana-plugin-public.ibasepath.serverbasepath.md) | <code>string</code> | Returns the server's root basePath as configured, without any namespace prefix.<!-- -->See for getting the basePath value for a specific request |
2223

‎docs/development/core/public/kibana-plugin-public.ibasepath.serverbasepath.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [IBasePath](./kibana-plugin-public.ibasepath.md) &gt; [serverBasePath](./kibana-plugin-public.ibasepath.serverbasepath.md)
4+
5+
## IBasePath.serverBasePath property
6+
7+
Returns the server's root basePath as configured, without any namespace prefix.
8+
9+
See for getting the basePath value for a specific request
10+
11+
<b>Signature:</b>
12+
13+
```typescript
14+
readonly serverBasePath: string;
15+
```

‎docs/development/core/public/kibana-plugin-public.ihttpfetcherror.name.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [IHttpFetchError](./kibana-plugin-public.ihttpfetcherror.md) &gt; [name](./kibana-plugin-public.ihttpfetcherror.name.md)
4+
5+
## IHttpFetchError.name property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
readonly name: string;
11+
```

‎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
};

src/plugins/embeddable/public/components/embeddable_panel/index.tsx renamed to packages/kbn-ui-shared-deps/monaco.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
import { EuiPanel } from '@elastic/eui';
21-
import * as React from 'react';
20+
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
2221

23-
export const EmbeddablePanel = () => {
24-
return (
25-
<EuiPanel data-test-subj="embeddablePanel" paddingSize="none" role="figure">
26-
Hello world
27-
</EuiPanel>
28-
);
29-
};
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 };

0 commit comments

Comments
 (0)