Skip to content

Commit 1b3d0b4

Browse files
gmmorrisgmmorris
committed
Merge branch 'master' into alerting/tls-warning
* master: (34 commits) [APM] add service map config options to legacy plugin (elastic#61002) [App Arch] migrate legacy CSS to new platform (core_plugins/kibana_react) (elastic#59882) Migrated styles for "share" plugin to new platform (elastic#59981) [ML] Module setup with dynamic model memory estimation (elastic#60656) Drilldowns (elastic#59632) Upgrade mocha dev-dependency from 6.2.2 to 7.1.1 (elastic#60779) [SIEM] Overview: Recent cases widget (elastic#60993) [ML] Functional tests - stabilize df analytics clone tests (elastic#60497) [SIEM] Updates process and TLS tables to use ECS 1.5 fields (elastic#60854) Migrate doc view part of discover (elastic#58094) Revert "[APM] Collect telemetry about data/API performance (elastic#51612)" fix(NA): log rotation watchers usage (elastic#60956) [SIEM] [CASES] Build lego blocks case details view (elastic#60864) Create Painless Lab app (elastic#57538) [SIEM] Move Timeline Template field to first step of rule creation (elastic#60840) [Reporting/New Platform Migration] Use a new config service on server-side (elastic#55882) [Alerting] allow email action to not require auth (elastic#60839) [Maps] Default ES document layer scaling type to clusters and show scaling UI in the create wizard (elastic#60668) [APM] Collect telemetry about data/API performance (elastic#51612) Implement Kibana Login Selector (elastic#53010) ...
2 parents 2ecf4a9 + 8ef35c8 commit 1b3d0b4

File tree

808 files changed

+35983
-9357
lines changed

Some content is hidden

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

808 files changed

+35983
-9357
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

55
# App
6+
/x-pack/legacy/plugins/dashboard_enhanced/ @elastic/kibana-app
67
/x-pack/legacy/plugins/lens/ @elastic/kibana-app
78
/x-pack/legacy/plugins/graph/ @elastic/kibana-app
89
/src/legacy/server/url_shortening/ @elastic/kibana-app
@@ -181,6 +182,7 @@
181182
/x-pack/plugins/remote_clusters/ @elastic/es-ui
182183
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
183184
/x-pack/plugins/searchprofiler/ @elastic/es-ui
185+
/x-pack/plugins/painless_lab/ @elastic/es-ui
184186
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
185187
/x-pack/legacy/plugins/upgrade_assistant/ @elastic/es-ui
186188
/x-pack/plugins/upgrade_assistant/ @elastic/es-ui

‎.i18nrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"common.ui": "src/legacy/ui",
44
"console": "src/plugins/console",
55
"core": "src/core",
6+
"discover": "src/plugins/discover",
67
"dashboard": "src/plugins/dashboard",
78
"data": "src/plugins/data",
89
"embeddableApi": "src/plugins/embeddable",

‎docs/setup/settings.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ that feature would not take any effect.
193193

194194
`logging.rotate.everyBytes:`:: [experimental] *Default: 10485760* The maximum size of a log file (that is `not an exact` limit). After the
195195
limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB) and
196-
this option should be in the range of 102400 (100KB) to 1073741824 (1GB).
196+
this option should be in the range of 1048576 (1 MB) to 1073741824 (1 GB).
197197

198198
`logging.rotate.keepFiles:`:: [experimental] *Default: 7* The number of most recent rotated log files to keep
199199
on disk. Older files are deleted during log rotation. The default value is 7. The `logging.rotate.keepFiles`
@@ -203,7 +203,7 @@ option has to be in the range of 2 to 1024 files.
203203
the `logging.rotate.usePolling` is enabled. That option has to be in the range of 5000 to 3600000 milliseconds.
204204

205205
`logging.rotate.usePolling:`:: [experimental] *Default: false* By default we try to understand the best way to monitoring
206-
the log file. However, there is some systems where it could not be always accurate. In those cases, if needed,
206+
the log file and warning about it. Please be aware there are some systems where watch api is not accurate. In those cases, in order to get the feature working,
207207
the `polling` method could be used enabling that option.
208208

209209
`logging.silent:`:: *Default: false* Set the value of this setting to `true` to

‎examples/ui_action_examples/public/plugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class UiActionExamplesPlugin
4646
}));
4747

4848
uiActions.registerAction(helloWorldAction);
49-
uiActions.attachAction(helloWorldTrigger.id, helloWorldAction);
49+
uiActions.addTriggerAction(helloWorldTrigger.id, helloWorldAction);
5050
}
5151

5252
public start() {}

‎examples/ui_actions_explorer/public/app.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
9595
);
9696
},
9797
});
98-
uiActionsApi.registerAction(dynamicAction);
99-
uiActionsApi.attachAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
98+
uiActionsApi.addTriggerAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
10099
setConfirmationText(
101100
`You've successfully added a new action: ${dynamicAction.getDisplayName(
102101
{}

‎examples/ui_actions_explorer/public/plugin.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,21 @@ export class UiActionsExplorerPlugin implements Plugin<void, void, {}, StartDeps
7979

8080
const startServices = core.getStartServices();
8181

82-
deps.uiActions.attachAction(
82+
deps.uiActions.addTriggerAction(
8383
USER_TRIGGER,
8484
createPhoneUserAction(async () => (await startServices)[1].uiActions)
8585
);
86-
deps.uiActions.attachAction(
86+
deps.uiActions.addTriggerAction(
8787
USER_TRIGGER,
8888
createEditUserAction(async () => (await startServices)[0].overlays.openModal)
8989
);
9090

91-
deps.uiActions.attachAction(COUNTRY_TRIGGER, viewInMapsAction);
92-
deps.uiActions.attachAction(COUNTRY_TRIGGER, lookUpWeatherAction);
93-
deps.uiActions.attachAction(COUNTRY_TRIGGER, showcasePluggability);
94-
deps.uiActions.attachAction(PHONE_TRIGGER, makePhoneCallAction);
95-
deps.uiActions.attachAction(PHONE_TRIGGER, showcasePluggability);
96-
deps.uiActions.attachAction(USER_TRIGGER, showcasePluggability);
91+
deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, viewInMapsAction);
92+
deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, lookUpWeatherAction);
93+
deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, showcasePluggability);
94+
deps.uiActions.addTriggerAction(PHONE_TRIGGER, makePhoneCallAction);
95+
deps.uiActions.addTriggerAction(PHONE_TRIGGER, showcasePluggability);
96+
deps.uiActions.addTriggerAction(USER_TRIGGER, showcasePluggability);
9797

9898
core.application.register({
9999
id: 'uiActionsExplorer',

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"@types/lru-cache": "^5.1.0",
349349
"@types/markdown-it": "^0.0.7",
350350
"@types/minimatch": "^2.0.29",
351-
"@types/mocha": "^5.2.7",
351+
"@types/mocha": "^7.0.2",
352352
"@types/moment-timezone": "^0.5.12",
353353
"@types/mustache": "^0.8.31",
354354
"@types/node": ">=10.17.17 <10.20.0",
@@ -456,7 +456,7 @@
456456
"license-checker": "^16.0.0",
457457
"listr": "^0.14.1",
458458
"load-grunt-config": "^3.0.1",
459-
"mocha": "^6.2.2",
459+
"mocha": "^7.1.1",
460460
"mock-http-server": "1.3.0",
461461
"multistream": "^2.1.1",
462462
"murmurhash3js": "3.0.1",

‎packages/kbn-ui-shared-deps/monaco.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import 'monaco-editor/esm/vs/base/worker/defaultWorkerFactory';
2525
import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js';
2626
import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
2727

28+
import 'monaco-editor/esm/vs/editor/contrib/wordOperations/wordOperations.js'; // Needed for word-wise char navigation
29+
2830
import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js'; // Needed for suggestions
2931
import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js'; // Needed for hover
3032
import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js'; // Needed for signature

‎src/core/MIGRATION.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,11 +1233,11 @@ This table shows where these uiExports have moved to in the New Platform. In mos
12331233
| `chromeNavControls` | [`core.chrome.navControls.register{Left,Right}`](/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md) | |
12341234
| `contextMenuActions` | | Should be an API on the devTools plugin. |
12351235
| `devTools` | | |
1236-
| `docViews` | | |
1236+
| `docViews` | [`plugins.discover.docViews.addDocView`](./src/plugins/discover/public/doc_views) | Should be an API on the discover plugin. |
12371237
| `embeddableActions` | | Should be an API on the embeddables plugin. |
12381238
| `embeddableFactories` | | Should be an API on the embeddables plugin. |
1239-
| `fieldFormatEditors` | | |
1240-
| `fieldFormats` | [`plugins.data.fieldFormats`](./src/plugins/data/public/field_formats) | |
1239+
| `fieldFormatEditors` | | |
1240+
| `fieldFormats` | [`plugins.data.fieldFormats`](./src/plugins/data/public/field_formats) | |
12411241
| `hacks` | n/a | Just run the code in your plugin's `start` method. |
12421242
| `home` | [`plugins.home.featureCatalogue.register`](./src/plugins/home/public/feature_catalogue) | Must add `home` as a dependency in your kibana.json. |
12431243
| `indexManagement` | | Should be an API on the indexManagement plugin. |

‎src/core/public/overlays/flyout/flyout_service.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ export interface OverlayFlyoutStart {
9191
export interface OverlayFlyoutOpenOptions {
9292
className?: string;
9393
closeButtonAriaLabel?: string;
94+
ownFocus?: boolean;
9495
'data-test-subj'?: string;
9596
}
9697

0 commit comments

Comments
 (0)