Skip to content

Commit eb2b3c9

Browse files
committed
Merge branch 'master' into bm-reduce-size
2 parents bf26f9a + acedb35 commit eb2b3c9

File tree

1,327 files changed

+60926
-37538
lines changed

Some content is hidden

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

1,327 files changed

+60926
-37538
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/src/plugins/input_control_vis/ @elastic/kibana-app
1818
/src/plugins/management/ @elastic/kibana-app
1919
/src/plugins/kibana_legacy/ @elastic/kibana-app
20+
/src/plugins/timelion/ @elastic/kibana-app
2021
/src/plugins/vis_default_editor/ @elastic/kibana-app
2122
/src/plugins/vis_type_markdown/ @elastic/kibana-app
2223
/src/plugins/vis_type_metric/ @elastic/kibana-app
@@ -30,32 +31,23 @@
3031
/src/plugins/visualize/ @elastic/kibana-app
3132
/src/plugins/visualizations/ @elastic/kibana-app
3233
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
33-
#CC# /src/plugins/vis_type @elastic/kibana-app
3434
#CC# /src/legacy/core_plugins/kibana/ @elastic/kibana-app
3535
#CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
3636
#CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
3737
#CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
3838
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
39-
#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
4039
#CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
4140
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
42-
#CC# /src/legacy/core_plugins/console_legacy @elastic/kibana-app
4341
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
4442
#CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
4543
#CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
4644
#CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
4745
#CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
48-
#CC# /src/legacy/server/sample_data/ @elastic/kibana-app
4946
#CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
5047
#CC# /src/legacy/ui/public/state_management @elastic/kibana-app
51-
#CC# /src/plugins/charts/public/static/color_maps @elastic/kibana-app
5248
#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
53-
#CC# /src/plugins/input_control_vis/ @elastic/kibana-app
54-
#CC# /src/plugins/kibana_legacy/ @elastic/kibana-app
55-
#CC# /src/plugins/timelion @elastic/kibana-app
5649
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
5750
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
58-
#CC# /x-pack/plugins/lens/ @elastic/kibana-app
5951

6052
# App Architecture
6153
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -147,6 +139,7 @@
147139
/src/plugins/home/server/services/ @elastic/kibana-core-ui
148140
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
149141
#CC# /src/legacy/core_plugins/newsfeed @elastic/kibana-core-ui
142+
#CC# /src/legacy/server/sample_data/ @elastic/kibana-core-ui
150143
#CC# /src/plugins/newsfeed @elastic/kibana-core-ui
151144
#CC# /src/plugins/home/public @elastic/kibana-core-ui
152145
#CC# /src/plugins/home/server/services/ @elastic/kibana-core-ui
@@ -351,6 +344,8 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
351344
/x-pack/plugins/ingest_pipelines/ @elastic/es-ui
352345
/packages/kbn-ace/ @elastic/es-ui
353346
/packages/kbn-monaco/ @elastic/es-ui
347+
#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/es-ui
348+
#CC# /src/legacy/core_plugins/console_legacy @elastic/es-ui
354349
#CC# /x-pack/legacy/plugins/rollup/ @elastic/es-ui
355350
#CC# /x-pack/legacy/server/lib/create_router/ @elastic/es-ui
356351
#CC# /x-pack/legacy/server/lib/check_license/ @elastic/es-ui

NOTICE.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
208208
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
209209
SOFTWARE.
210210

211+
---
212+
MIT License
213+
214+
Copyright (c) 2014-present Sebastian McKenzie and other contributors
215+
216+
Permission is hereby granted, free of charge, to any person obtaining
217+
a copy of this software and associated documentation files (the
218+
"Software"), to deal in the Software without restriction, including
219+
without limitation the rights to use, copy, modify, merge, publish,
220+
distribute, sublicense, and/or sell copies of the Software, and to
221+
permit persons to whom the Software is furnished to do so, subject to
222+
the following conditions:
223+
224+
The above copyright notice and this permission notice shall be
225+
included in all copies or substantial portions of the Software.
226+
227+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
228+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
229+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
230+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
231+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
232+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
233+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
234+
211235
---
212236
This product bundles [email protected] which is available under a
213237
"MIT" license.

docs/developer/contributing/development-github.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Pull requests are made into the `master` branch and then backported when it is s
2525
* Breaking changes do not get backported and only go into `master`.
2626
* All non-breaking changes can be backported to the `<major>.x` branch.
2727
* Features should not be backported to a `<major>.<minor>` branch.
28-
* Bugs can be backported to a `<major>.<minor>` branch if the changes are safe and appropriate. Safety is a judgment call you make based on factors like the bug's severity, test coverage, confidence in the changes, etc. Your reasoning should be included in the pull request description.
28+
* Bug fixes can be backported to a `<major>.<minor>` branch if the changes are safe and appropriate. Safety is a judgment call you make based on factors like the bug's severity, test coverage, confidence in the changes, etc. Your reasoning should be included in the pull request description.
2929
* Documentation changes can be backported to any branch at any time.
3030

3131
[discrete]

docs/developer/plugin-list.asciidoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ NOTE:
1616
[discrete]
1717
=== src/plugins
1818
19-
[%header,cols=2*]
19+
[%header,cols=2*]
2020
|===
2121
|Name
2222
|Description
@@ -168,7 +168,7 @@ It also provides a stateful version of it on the start contract.
168168
169169
170170
|{kib-repo}blob/{branch}/src/plugins/telemetry_management_section/README.md[telemetryManagementSection]
171-
|This plugin adds the Advanced Settings section for the Usage Data collection (aka Telemetry).
171+
|This plugin adds the Advanced Settings section for the Usage and Security Data collection (aka Telemetry).
172172
173173
174174
|{kib-repo}blob/{branch}/src/plugins/tile_map[tileMap]
@@ -259,7 +259,7 @@ which will load the visualization's editor.
259259
[discrete]
260260
=== x-pack/plugins
261261
262-
[%header,cols=2*]
262+
[%header,cols=2*]
263263
|===
264264
|Name
265265
|Description
@@ -515,6 +515,10 @@ As a developer you can reuse and extend built-in alerts and actions UI functiona
515515
in their infrastructure.
516516
517517
518+
|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
519+
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
520+
521+
518522
|{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
519523
|This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
520524
@@ -523,10 +527,6 @@ in their infrastructure.
523527
|Contains HTTP endpoints and UiSettings that are slated for removal.
524528
525529
526-
|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
527-
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
528-
529-
530530
|===
531531
532532
include::{kibana-root}/src/plugins/dashboard/README.asciidoc[leveloffset=+1]

docs/development/core/public/kibana-plugin-core-public.applicationstart.geturlforapp.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
## ApplicationStart.getUrlForApp() method
66

7-
Returns an URL to a given app, including the global base path. By default, the URL is relative (/basePath/app/my-app). Use the `absolute` option to generate an absolute url (http://host:port/basePath/app/my-app)
7+
Returns the absolute path (or URL) to a given app, including the global base path.
88

9-
Note that when generating absolute urls, the origin (protocol, host and port) are determined from the browser's location.
9+
By default, it returns the absolute path of the application (e.g `/basePath/app/my-app`<!-- -->). Use the `absolute` option to generate an absolute url instead (e.g `http://host:port/basePath/app/my-app`<!-- -->)
10+
11+
Note that when generating absolute urls, the origin (protocol, host and port) are determined from the browser's current location.
1012

1113
<b>Signature:</b>
1214

docs/development/core/public/kibana-plugin-core-public.applicationstart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export interface ApplicationStart
2323

2424
| Method | Description |
2525
| --- | --- |
26-
| [getUrlForApp(appId, options)](./kibana-plugin-core-public.applicationstart.geturlforapp.md) | Returns an URL to a given app, including the global base path. By default, the URL is relative (/basePath/app/my-app). Use the <code>absolute</code> option to generate an absolute url (http://host:port/basePath/app/my-app)<!-- -->Note that when generating absolute urls, the origin (protocol, host and port) are determined from the browser's location. |
26+
| [getUrlForApp(appId, options)](./kibana-plugin-core-public.applicationstart.geturlforapp.md) | Returns the absolute path (or URL) to a given app, including the global base path.<!-- -->By default, it returns the absolute path of the application (e.g <code>/basePath/app/my-app</code>). Use the <code>absolute</code> option to generate an absolute url instead (e.g <code>http://host:port/basePath/app/my-app</code>)<!-- -->Note that when generating absolute urls, the origin (protocol, host and port) are determined from the browser's current location. |
2727
| [navigateToApp(appId, options)](./kibana-plugin-core-public.applicationstart.navigatetoapp.md) | Navigate to a given app |
28-
| [navigateToUrl(url)](./kibana-plugin-core-public.applicationstart.navigatetourl.md) | Navigate to given url, which can either be an absolute url or a relative path, in a SPA friendly way when possible.<!-- -->If all these criteria are true for the given url: - (only for absolute URLs) The origin of the URL matches the origin of the browser's current location - The pathname of the URL starts with the current basePath (eg. /mybasepath/s/my-space) - The pathname segment after the basePath matches any known application route (eg. /app/<id>/ or any application's <code>appRoute</code> configuration)<!-- -->Then a SPA navigation will be performed using <code>navigateToApp</code> using the corresponding application and path. Otherwise, fallback to a full page reload to navigate to the url using <code>window.location.assign</code> |
28+
| [navigateToUrl(url)](./kibana-plugin-core-public.applicationstart.navigatetourl.md) | Navigate to given URL in a SPA friendly way when possible (when the URL will redirect to a valid application within the current basePath).<!-- -->The method resolves pathnames the same way browsers do when resolving a <code>&lt;a href&gt;</code> value. The provided <code>url</code> can be: - an absolute URL - an absolute path - a path relative to the current URL (window.location.href)<!-- -->If all these criteria are true for the given URL: - (only for absolute URLs) The origin of the URL matches the origin of the browser's current location - The resolved pathname of the provided URL/path starts with the current basePath (eg. /mybasepath/s/my-space) - The pathname segment after the basePath matches any known application route (eg. /app/<id>/ or any application's <code>appRoute</code> configuration)<!-- -->Then a SPA navigation will be performed using <code>navigateToApp</code> using the corresponding application and path. Otherwise, fallback to a full page reload to navigate to the url using <code>window.location.assign</code> |
2929
| [registerMountContext(contextName, provider)](./kibana-plugin-core-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->. |
3030

docs/development/core/public/kibana-plugin-core-public.applicationstart.navigatetourl.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
## ApplicationStart.navigateToUrl() method
66

7-
Navigate to given url, which can either be an absolute url or a relative path, in a SPA friendly way when possible.
7+
Navigate to given URL in a SPA friendly way when possible (when the URL will redirect to a valid application within the current basePath).
88

9-
If all these criteria are true for the given url: - (only for absolute URLs) The origin of the URL matches the origin of the browser's current location - The pathname of the URL starts with the current basePath (eg. /mybasepath/s/my-space) - The pathname segment after the basePath matches any known application route (eg. /app/<id>/ or any application's `appRoute` configuration)
9+
The method resolves pathnames the same way browsers do when resolving a `<a href>` value. The provided `url` can be: - an absolute URL - an absolute path - a path relative to the current URL (window.location.href)
10+
11+
If all these criteria are true for the given URL: - (only for absolute URLs) The origin of the URL matches the origin of the browser's current location - The resolved pathname of the provided URL/path starts with the current basePath (eg. /mybasepath/s/my-space) - The pathname segment after the basePath matches any known application route (eg. /app/<id>/ or any application's `appRoute` configuration)
1012

1113
Then a SPA navigation will be performed using `navigateToApp` using the corresponding application and path. Otherwise, fallback to a full page reload to navigate to the url using `window.location.assign`
1214

@@ -20,7 +22,7 @@ navigateToUrl(url: string): Promise<void>;
2022

2123
| Parameter | Type | Description |
2224
| --- | --- | --- |
23-
| url | <code>string</code> | an absolute url, or a relative path, to navigate to. |
25+
| url | <code>string</code> | an absolute URL, an absolute path or a relative path, to navigate to. |
2426

2527
<b>Returns:</b>
2628

@@ -35,11 +37,14 @@ navigateToUrl(url: string): Promise<void>;
3537
// will call `application.navigateToApp('discover', { path: '/some-path?foo=bar'})`
3638
application.navigateToUrl('https://kibana:8080/base-path/s/my-space/app/discover/some-path?foo=bar')
3739
application.navigateToUrl('/base-path/s/my-space/app/discover/some-path?foo=bar')
40+
application.navigateToUrl('./discover/some-path?foo=bar')
3841

3942
// will perform a full page reload using `window.location.assign`
4043
application.navigateToUrl('https://elsewhere:8080/base-path/s/my-space/app/discover/some-path') // origin does not match
4144
application.navigateToUrl('/app/discover/some-path') // does not include the current basePath
4245
application.navigateToUrl('/base-path/s/my-space/app/unknown-app/some-path') // unknown application
46+
application.navigateToUrl('../discover') // resolve to `/base-path/s/my-space/discover` which is not a path of a known app.
47+
application.navigateToUrl('../../other-space/discover') // resolve to `/base-path/s/other-space/discover` which is not within the current basePath.
4348

4449
```
4550

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ readonly links: {
9191
readonly gettingStarted: string;
9292
};
9393
readonly query: {
94+
readonly eql: string;
9495
readonly luceneQuerySyntax: string;
9596
readonly queryDsl: string;
9697
readonly kueryQuerySyntax: string;

0 commit comments

Comments
 (0)