Skip to content

Commit 075ff96

Browse files
committed
Merge branch 'master' into eql_validation
2 parents 32f292f + b3c37cf commit 075ff96

517 files changed

Lines changed: 10993 additions & 3514 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.

.telemetryrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"exclude": [
66
"src/plugins/kibana_react/",
77
"src/plugins/testbed/",
8-
"src/plugins/kibana_utils/",
9-
"src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts"
8+
"src/plugins/kibana_utils/"
109
]
1110
}
1211
]

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ NOTE:
4848
4949
5050
|{kib-repo}blob/{branch}/src/plugins/data/README.md[data]
51-
|data plugin provides common data access services.
51+
|The data plugin provides common data access services, such as search and query, for solutions and application developers.
5252
5353
5454
|{kib-repo}blob/{branch}/src/plugins/dev_tools/README.md[devTools]

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/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderdefinition.displayname.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ A user friendly name of the renderer as will be displayed to user in UI.
99
<b>Signature:</b>
1010

1111
```typescript
12-
displayName: string;
12+
displayName?: string;
1313
```

docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionrenderdefinition.displayname.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ A user friendly name of the renderer as will be displayed to user in UI.
99
<b>Signature:</b>
1010

1111
```typescript
12-
displayName: string;
12+
displayName?: string;
1313
```

docs/user/alerting/action-types/jira.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ Priority:: The priority of the incident.
6969
Labels:: The labels of the incident.
7070
Title:: A title for the issue, used for searching the contents of the knowledge base.
7171
Description:: The details about the incident.
72+
Parent:: The parent issue id or key. Only for `Sub-task` issue types.
73+
Priority:: The priority of the incident.
7274
Additional comments:: Additional information for the client, such as how to troubleshoot the issue.
7375

7476
[[configuring-jira]]

docs/user/dashboard/dashboard-drilldown.asciidoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,26 @@ This example shows a dashboard panel that contains a pie chart with a configured
1111
[role="screenshot"]
1212
image::images/drilldown_on_piechart.gif[Drilldown on pie chart that navigates to another dashboard]
1313

14+
[float]
15+
[[dashboard-drilldown-supported-panels]]
16+
==== Supported panels
17+
18+
The following panels support dashboard drilldowns:
19+
20+
* Lens
21+
* Area
22+
* Data table
23+
* Heat map
24+
* Horizontal bar
25+
* Line
26+
* Maps
27+
* Pie
28+
* TSVB
29+
* Tag cloud
30+
* Timelion
31+
* Vega
32+
* Vertical bar
33+
1434
[float]
1535
[[drilldowns-example]]
1636
==== Try it: Create a dashboard drilldown
@@ -74,3 +94,4 @@ image::images/drilldown_on_panel.png[Drilldown on pie chart that navigates to an
7494
+
7595
You are navigated to your destination dashboard. Verify that the search query, filters,
7696
and time range are carried over.
97+

0 commit comments

Comments
 (0)