Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into searchprofile…
Browse files Browse the repository at this point in the history 
…r/eui-brace-x-json-support

* 'master' of github.com:elastic/kibana: (104 commits)
  [telemetry] Analytics Package (elastic#41113)
  [ML] Use NavigationMenu without angularjs wrapper. (elastic#41343)
  Clean up top nav \ search bar \ query bar directives (elastic#41636)
  Add ownership of new platform security plugin to security team. (elastic#41748)
  [i18n] fix i18nrc parsing (elastic#41741)
  [ML] Fixes model memory limit for metricbeat system module jobs (elastic#41747)
  Comment out flakey test steps (elastic#41743)
  [APM] Fix "Show trace logs" link (elastic#41570)
  Narrow type of PluginDeps to an object (elastic#40846)
  core doesn't use Record<string, unknown> for public API (elastic#41448)
  remove obsolete http secutiry settings (elastic#41569)
  [Code] implement filtree api by using isogit (elastic#41558)
  [Code] handle status when repo is not exists (elastic#41643)
  [Code] test colorize before load a file (elastic#41645)
  improve typing (elastic#41563)
  hide top nav menu in full screen mode of maps and dashboard (elastic#41672)
  Bump backport to 4.6.1 (elastic#41720)
  [Infra UI] Add UI to customize Metrics Explorer chart style (elastic#41022)
  [Infra UI] Fix section mapping bug in node detail page (elastic#41641)
  [DOCS] Adds missing Timelion link (elastic#41709)
  ...
  • Loading branch information
@jloleysens
jloleysens committed Jul 23, 2019
2 parents 7f626aa + 9d7cf53 commit 4c97fe2
Show file tree
Hide file tree
Showing 965 changed files with 46,255 additions and 16,328 deletions.
25 changes: 25 additions & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,21 @@ module.exports = {
],
allowSameFolder: true,
},
{
from: ['src/legacy/ui/**/*', 'ui/**/*'],
target: [
'src/legacy/core_plugins/**/public/np_ready/**/*',
'src/legacy/core_plugins/**/server/np_ready/**/*',
'x-pack/legacy/plugins/**/public/np_ready/**/*',
'x-pack/legacy/plugins/**/server/np_ready/**/*',
],
allowSameFolder: true,
errorMessage:
'NP-ready code should not import from /src/legacy/ui/** folder. ' +
'Instead of importing from /src/legacy/ui/** deeply within a np_ready folder, ' +
'import those things once at the top level of your plugin and pass those down, just ' +
'like you pass down `core` and `plugins` objects.',
},
],
},
],
Expand Down Expand Up @@ -361,6 +376,16 @@ module.exports = {
},
},

/**
* Jest specific rules
*/
{
files: ['**/*.test.{js,ts,tsx}'],
rules: {
'jest/valid-describe': 'error',
},
},

/**
* APM overrides
*/
Expand Down
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
/x-pack/legacy/plugins/encrypted_saved_objects/ @elastic/kibana-security
/src/legacy/server/csp/ @elastic/kibana-security
/x-pack/plugins/security/ @elastic/kibana-security

# Kibana Stack Services
/packages/kbn-analytics/ @elastic/kibana-stack-services
/src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
/x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services
/x-pack/legacy/plugins/alerting @elastic/kibana-stack-services
/x-pack/legacy/plugins/actions @elastic/kibana-stack-services
/x-pack/legacy/plugins/task_manager @elastic/kibana-stack-services

# Design
**/*.scss @elastic/kibana-design
Expand Down
44 changes: 4 additions & 40 deletions .i18nrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"paths": {
"common.ui": "src/legacy/ui",
"data": "src/legacy/core_plugins/data",
"kibana_react": "src/legacy/core_plugins/kibana_react",
"server": "src/legacy/server",
"console": "src/legacy/core_plugins/console",
"core": "src/core",
Expand All @@ -15,53 +16,16 @@
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
"metricVis": "src/legacy/core_plugins/metric_vis",
"vega": "src/legacy/core_plugins/vega",
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
"tableVis": "src/legacy/core_plugins/table_vis",
"regionMap": "src/legacy/core_plugins/region_map",
"statusPage": "src/legacy/core_plugins/status_page",
"tileMap": "src/legacy/core_plugins/tile_map",
"timelion": "src/legacy/core_plugins/timelion",
"tagCloud": "src/legacy/core_plugins/tagcloud",
"tsvb": "src/legacy/core_plugins/metrics",
"kbnESQuery": "packages/kbn-es-query",
"xpack.actions": "x-pack/legacy/plugins/actions",
"xpack.alerting": "x-pack/legacy/plugins/alerting",
"xpack.apm": "x-pack/legacy/plugins/apm",
"xpack.beatsManagement": "x-pack/legacy/plugins/beats_management",
"xpack.canvas": "x-pack/legacy/plugins/canvas",
"xpack.code": "x-pack/legacy/plugins/code",
"xpack.crossClusterReplication": "x-pack/legacy/plugins/cross_cluster_replication",
"xpack.dashboardMode": "x-pack/legacy/plugins/dashboard_mode",
"xpack.fileUpload": "x-pack/legacy/plugins/file_upload",
"xpack.graph": "x-pack/legacy/plugins/graph",
"xpack.grokDebugger": "x-pack/legacy/plugins/grokdebugger",
"xpack.idxMgmt": "x-pack/legacy/plugins/index_management",
"xpack.indexLifecycleMgmt": "x-pack/legacy/plugins/index_lifecycle_management",
"xpack.infra": "x-pack/legacy/plugins/infra",
"xpack.kueryAutocomplete": "x-pack/legacy/plugins/kuery_autocomplete",
"xpack.licenseMgmt": "x-pack/legacy/plugins/license_management",
"xpack.maps": "x-pack/legacy/plugins/maps",
"xpack.ml": "x-pack/legacy/plugins/ml",
"xpack.logstash": "x-pack/legacy/plugins/logstash",
"xpack.main": "x-pack/legacy/plugins/xpack_main",
"xpack.telemetry": "x-pack/legacy/plugins/telemetry",
"xpack.monitoring": "x-pack/legacy/plugins/monitoring",
"xpack.remoteClusters": "x-pack/legacy/plugins/remote_clusters",
"xpack.reporting": "x-pack/legacy/plugins/reporting",
"xpack.rollupJobs": "x-pack/legacy/plugins/rollup",
"xpack.searchProfiler": "x-pack/legacy/plugins/searchprofiler",
"xpack.siem": "x-pack/legacy/plugins/siem",
"xpack.security": "x-pack/legacy/plugins/security",
"xpack.server": "x-pack/legacy/server",
"xpack.snapshotRestore": "x-pack/legacy/plugins/snapshot_restore",
"xpack.spaces": "x-pack/legacy/plugins/spaces",
"xpack.upgradeAssistant": "x-pack/legacy/plugins/upgrade_assistant",
"xpack.uptime": "x-pack/legacy/plugins/uptime",
"xpack.watcher": "x-pack/legacy/plugins/watcher"
"kbnESQuery": "packages/kbn-es-query"
},
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
"translations": [
"x-pack/plugins/translations/translations/zh-CN.json",
"x-pack/plugins/translations/translations/ja-JP.json"
]
"translations": []
}
2 changes: 1 addition & 1 deletion config/kibana.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@
#ops.interval: 5000

# Specifies locale to be used for all localizable strings, dates and number formats.
# Supported languages are the following: English - en , by default , Chinese - zh-CN .
# Supported languages are the following: English - en , by default , Chinese - zh-CN .
#i18n.locale: "en"
Binary file modified docs/apm/images/apm-transaction-response-dist.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/apm/images/apm-transactions-overview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions docs/apm/transactions.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@ TIP: A {apm-overview-ref-v}/transactions.html[transaction] describes an event ca
The APM agents automatically collect performance metrics on HTTP requests, database queries, and much more.

Selecting a <<services,*service*>> brings you to the *transactions* overview.
The *transaction duration* and *requests per minute* chart display information on all transactions associated with the selected service.
The *time spent by span type*, *transaction duration* and *requests per minute* chart display information on all transactions associated with the selected service.
The *Transactions* table, however, provides only a list of _transaction groups_ for the selected service.
In other words, this view groups all transactions of the same name together, and only displays one transaction for each group.

[role="screenshot"]
image::apm/images/apm-transactions-overview.png[Example view of transactions table in the APM UI in Kibana]

*Time spent by span type* -- beta[] Certain agents support breakdown graphs in the APM UI.
This graph is an easy way to visualize where your application is spending most of its time.
For example, is your app spending time in external calls, database processing, or application code execution?

The time a transaction took to complete is also recorded and displayed on the chart under the "app" label.
"app" indicates that something was happening within the application, but we're not sure exactly what.
This could be a sign that the agent does not have auto-instrumentation for whatever was happening during that time.

It's important to note that if you have asynchronous spans, the sum of all span times may exceed the duration of the transaction.

TIP: If the *Time spent by span type* chart is missing in the APM UI, it means your agent does not support this feature yet.

*Transaction duration* shows the response times for this service and is broken down into average, 95th, and 99th percentile.
If there's a weird spike that you'd like to investigate,
you can simply zoom in on the graph - this will adjust the specific time range,
Expand Down Expand Up @@ -44,9 +56,9 @@ refer to the documentation for each {apm-agents-ref}[APM Agent] you've implement
==== Transaction details

Selecting a transaction group will bring you to the *transaction* details.
Transaction details include a high-level overview of the transaction group duration,
requests per minute, and transaction group duration distribution.
It's important to note that all three of these graphs show data from every transaction within the selected transaction group.
Transaction details include a high-level overview of the time spent by span type,
transaction group duration, requests per minute, and transaction group duration distribution.
It's important to note that all of these graphs show data from every transaction within the selected transaction group.

[role="screenshot"]
image::apm/images/apm-transaction-response-dist.png[Example view of response time distribution]
Expand Down
26 changes: 13 additions & 13 deletions docs/canvas/canvas-function-reference.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ Default: `"-_index:.kibana"`
|`number`
|The number of documents to retrieve. For better performance, use a smaller data set.

Default: `100`
Default: `1000`

|`fields`
|`string`
Expand Down Expand Up @@ -1161,7 +1161,7 @@ Default: `""`
|`style`
|The CSS font properties for the content. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`
|===

*Returns:* `render`
Expand Down Expand Up @@ -1213,13 +1213,13 @@ Default: `""`
|`style`
|The CSS font properties for the metric. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>> size=48 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center lHeight=48}`.
Default: `{font size=48 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center lHeight=48}`.

|`labelFont`
|`style`
|The CSS font properties for the label. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>> size=14 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`.
Default: `{font size=14 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`.
|===

*Returns:* `render`
Expand Down Expand Up @@ -1305,7 +1305,7 @@ Configures a pie chart element.
|`style`
|The CSS font properties for the labels. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`

|`hole`
|`number`
Expand Down Expand Up @@ -1335,7 +1335,7 @@ Default: `false`
|`palette`
|A `palette` object for describing the colors to use in this pie chart

Default: `{<<palette_fn>>}`
Default: `{palette}`

|`radius`
|`string`, `number`
Expand Down Expand Up @@ -1373,13 +1373,13 @@ Configures a plot element.
|`seriesStyle`
|The default style to use for every series.

Default: `{<<seriesStyle_fn>> points=5}`
Default: `{seriesStyle points=5}`

|`font`
|`style`
|The CSS font properties for the labels. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`

|`legend`
|`string`, `boolean`
Expand All @@ -1391,7 +1391,7 @@ Default: `"ne"`
|`palette`
|A `palette` object for describing the colors to use in this chart

Default: `{<<palette_fn>>}`
Default: `{palette}`

|`seriesStyle` †
|`seriesStyle`
Expand Down Expand Up @@ -1512,7 +1512,7 @@ Default: `20`
|`style`
|The CSS font properties for the label. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>> size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`
Default: `{font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`

|`label`
|`boolean`, `string`
Expand Down Expand Up @@ -1572,7 +1572,7 @@ Default: `".canvasRenderEl{\n\n}"`
|`containerStyle`
|The style for the container, including background, border, and opacity.

Default: `{<<containerStyle_fn>>}`
Default: `{containerStyle}`
|===

*Returns:* `render`
Expand Down Expand Up @@ -1726,7 +1726,7 @@ Alias: `format`
[[rowCount_fn]]
=== `rowCount`

Returns the number of rows. Pairs with `<<ply_fn>>` to get the count of unique column values, or combinations of unique column values.
Returns the number of rows. Pairs with <<ply_fn>> to get the count of unique column values, or combinations of unique column values.

*Accepts:* `datatable`

Expand Down Expand Up @@ -1964,7 +1964,7 @@ Configures a table element.
|`style`
|The CSS font properties for the contents of the table. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`

|`paginate`
|`boolean`
Expand Down
2 changes: 1 addition & 1 deletion docs/dev-tools/searchprofiler/getting-started.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ indices and shards, it doesn't necessarily represent the actual physical query t

You can select the name of the shard and then click *View details* to see more profiling information,
including details about the query component(s) that ran on the shard, as well as the timing
breakdown of low-level Lucene methods. For more information, see {ref}/search-profile-queries.html[Profiling queries].
breakdown of low-level Lucene methods. For more information, see {ref}/search-profile.html#profiling-queries[Profiling queries].

[float]
=== Index and type filtering
Expand Down
2 changes: 1 addition & 1 deletion docs/dev-tools/searchprofiler/more-complicated.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ image::dev-tools/searchprofiler/images/gs10.png["Drilling into the first shard's

For more information about how the {searchprofiler} works, how timings are calculated, and
how to interpret various results, see
{ref}/search-profile-queries.html[Profiling queries].
{ref}/search-profile.html#profiling-queries[Profiling queries].
16 changes: 15 additions & 1 deletion docs/development/core/development-functional-tests.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ There are three ways to run the tests depending on your goals:
** Description: Runs tests against instances of Elasticsearch & Kibana started some other way (like Elastic Cloud, or an instance you are managing in some other way).
** just executes the functional tests
** url, credentials, etc. for Elasticsearch and Kibana are specified via environment variables
** Here's an example that runs against an Elastic Cloud instance. Note that you should run the same branch of tests as the version of Kibana you're testing.
** Here's an example that runs against an Elastic Cloud instance. Note that you must run the same branch of tests as the version of Kibana you're testing.
+
["source","shell"]
----------
Expand Down Expand Up @@ -61,6 +61,20 @@ export TEST_ES_PASS=<password>
node scripts/functional_test_runner
----------

** Selenium tests can be run in headless mode by setting the environment variable below. Unset this variable to show the browser.
+
["source", "shell"]
----------
export TEST_BROWSER_HEADLESS=1
----------

** When running against cloud deployment, some tests are not applicable use --exclude-tag to skip those tests. An example shell file can be found at: {blob}test/scripts/jenkins_kibana.sh[test/scripts/jenkins_kibana.sh]
+
["source", "shell"]
----------
node scripts/functional_test_runner --exclude-tag skipCloud
----------

[float]
===== More about `node scripts/functional_test_runner`

Expand Down
2 changes: 1 addition & 1 deletion docs/development/core/public/kibana-plugin-public.plugin.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The interface that should be returned by a `PluginInitializer`<!-- -->.
<b>Signature:</b>

```typescript
export interface Plugin<TSetup = void, TStart = void, TPluginsSetup extends {} = {}, TPluginsStart extends {} = {}>
export interface Plugin<TSetup = void, TStart = void, TPluginsSetup extends object = object, TPluginsStart extends object = object>
```

## Methods
Expand Down
2 changes: 1 addition & 1 deletion docs/development/core/public/kibana-plugin-public.plugininitializer.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ The `plugin` export at the root of a plugin's `public` directory should conform
<b>Signature:</b>

```typescript
export declare type PluginInitializer<TSetup, TStart, TPluginsSetup extends Record<string, any> = {}, TPluginsStart extends Record<string, any> = {}> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
export declare type PluginInitializer<TSetup, TStart, TPluginsSetup extends object = object, TPluginsStart extends object = object> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
```
2 changes: 1 addition & 1 deletion docs/development/core/server/kibana-plugin-server.apicaller.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
<b>Signature:</b>

```typescript
export declare type APICaller = (endpoint: string, clientParams: Record<string, unknown>, options?: CallAPIOptions) => Promise<unknown>;
export declare type APICaller = (endpoint: string, clientParams: Record<string, any>, options?: CallAPIOptions) => Promise<unknown>;
```
2 changes: 1 addition & 1 deletion docs/development/core/server/kibana-plugin-server.authresultdata.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ export interface AuthResultData
| Property | Type | Description |
| --- | --- | --- |
| [headers](./kibana-plugin-server.authresultdata.headers.md) | <code>AuthHeaders</code> | Auth specific headers to authenticate a user against Elasticsearch. |
| [state](./kibana-plugin-server.authresultdata.state.md) | <code>Record&lt;string, unknown&gt;</code> | Data to associate with an incoming request. Any downstream plugin may get access to the data. |
| [state](./kibana-plugin-server.authresultdata.state.md) | <code>Record&lt;string, any&gt;</code> | Data to associate with an incoming request. Any downstream plugin may get access to the data. |

2 changes: 1 addition & 1 deletion docs/development/core/server/kibana-plugin-server.authresultdata.state.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ Data to associate with an incoming request. Any downstream plugin may get access
<b>Signature:</b>

```typescript
state: Record<string, unknown>;
state: Record<string, any>;
```
2 changes: 1 addition & 1 deletion ...evelopment/core/server/kibana-plugin-server.clusterclient.callasinternaluser.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ Calls specified endpoint with provided clientParams on behalf of the Kibana inte
<b>Signature:</b>

```typescript
callAsInternalUser: (endpoint: string, clientParams?: Record<string, unknown>, options?: CallAPIOptions | undefined) => Promise<any>;
callAsInternalUser: (endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions | undefined) => Promise<any>;
```
2 changes: 1 addition & 1 deletion docs/development/core/server/kibana-plugin-server.clusterclient.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export declare class ClusterClient

| Property | Modifiers | Type | Description |
| --- | --- | --- | --- |
| [callAsInternalUser](./kibana-plugin-server.clusterclient.callasinternaluser.md) | | <code>(endpoint: string, clientParams?: Record&lt;string, unknown&gt;, options?: CallAPIOptions &#124; undefined) =&gt; Promise&lt;any&gt;</code> | Calls specified endpoint with provided clientParams on behalf of the Kibana internal user. |
| [callAsInternalUser](./kibana-plugin-server.clusterclient.callasinternaluser.md) | | <code>(endpoint: string, clientParams?: Record&lt;string, any&gt;, options?: CallAPIOptions &#124; undefined) =&gt; Promise&lt;any&gt;</code> | Calls specified endpoint with provided clientParams on behalf of the Kibana internal user. |

## Methods

Expand Down
2 changes: 1 addition & 1 deletion docs/development/core/server/kibana-plugin-server.plugin.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The interface that should be returned by a `PluginInitializer`<!-- -->.
<b>Signature:</b>

```typescript
export interface Plugin<TSetup = void, TStart = void, TPluginsSetup extends {} = {}, TPluginsStart extends {} = {}>
export interface Plugin<TSetup = void, TStart = void, TPluginsSetup extends object = object, TPluginsStart extends object = object>
```

## Methods
Expand Down
2 changes: 1 addition & 1 deletion docs/development/core/server/kibana-plugin-server.plugininitializer.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ The `plugin` export at the root of a plugin's `server` directory should conform
<b>Signature:</b>

```typescript
export declare type PluginInitializer<TSetup, TStart, TPluginsSetup extends Record<PluginName, unknown> = {}, TPluginsStart extends Record<PluginName, unknown> = {}> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
export declare type PluginInitializer<TSetup, TStart, TPluginsSetup extends object = object, TPluginsStart extends object = object> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
```
Loading

0 comments on commit 4c97fe2

Please sign in to comment.