Skip to content

Commit 3472b86

Browse files
gmmorrisgmmorris
authored
Merge branch '7.x' into backport/7.x/pr-82472
2 parents 8e0e03c + 0fcc454 commit 3472b86

1,074 files changed

Lines changed: 8356 additions & 7995 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.

‎config/kibana.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
#elasticsearch.logQueries: false
8484

8585
# Specifies the path where Kibana creates the process ID file.
86-
#pid.file: /var/run/kibana.pid
86+
#pid.file: /run/kibana/kibana.pid
8787

8888
# Enables you to specify a file where Kibana stores log output.
8989
#logging.dest: stdout

‎docs/developer/contributing/development-functional-tests.asciidoc‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We use functional tests to make sure the {kib} UI works as expected. It replaces
66
[discrete]
77
=== Running functional tests
88

9-
The `FunctionalTestRunner` is very bare bones and gets most of its functionality from its config file, located at {blob}test/functional/config.js[test/functional/config.js]. If you’re writing a plugin outside the {kib} repo, you will have your own config file.
9+
The `FunctionalTestRunner` is very bare bones and gets most of its functionality from its config file, located at link:{kib-repo}tree/{branch}/test/functional/config.js[test/functional/config.js]. If you’re writing a plugin outside the {kib} repo, you will have your own config file.
1010
See <<external-plugin-functional-tests>> for more info.
1111

1212
There are three ways to run the tests depending on your goals:
@@ -62,7 +62,7 @@ export TEST_ES_PASS=<password>
6262
node scripts/functional_test_runner
6363
----------
6464

65-
** If you are running x-pack functional tests, start server and runner from {blob}xpack[x-pack] folder:
65+
** If you are running x-pack functional tests, start server and runner from the link:{kib-repo}tree/{branch}/x-pack[x-pack] folder:
6666
+
6767
["source", "shell"]
6868
----------
@@ -84,7 +84,7 @@ export TEST_BROWSER_HEADLESS=1
8484
export TEST_THROTTLE_NETWORK=1
8585
----------
8686

87-
** When running against a Cloud deployment, some tests are not applicable. To skip tests that do not apply, use --exclude-tag. An example shell file can be found at: {blob}test/scripts/jenkins_cloud.sh[test/scripts/jenkins_cloud.sh]
87+
** When running against a Cloud deployment, some tests are not applicable. To skip tests that do not apply, use --exclude-tag. An example shell file can be found at link:{kib-repo}tree/{branch}/test/scripts/jenkins_cloud.sh[test/scripts/jenkins_cloud.sh]
8888
+
8989
["source", "shell"]
9090
----------
@@ -118,7 +118,7 @@ The tests are written in https://mochajs.org[mocha] using https://github.com/ela
118118

119119
We use https://www.w3.org/TR/webdriver1/[WebDriver Protocol] to run tests in both Chrome and Firefox with the help of https://sites.google.com/a/chromium.org/chromedriver/[chromedriver] and https://firefox-source-docs.mozilla.org/testing/geckodriver/[geckodriver]. When the `FunctionalTestRunner` launches, remote service creates a new webdriver session, which starts the driver and a stripped-down browser instance. We use `browser` service and `webElementWrapper` class to wrap up https://seleniumhq.github.io/selenium/docs/api/javascript/module/selenium-webdriver/[Webdriver API].
120120

121-
The `FunctionalTestRunner` automatically transpiles functional tests using babel, so that tests can use the same ECMAScript features that {kib} source code uses. See {blob}style_guides/js_style_guide.md[style_guides/js_style_guide.md].
121+
The `FunctionalTestRunner` automatically transpiles functional tests using babel, so that tests can use the same ECMAScript features that {kib} source code uses. Refer to {kib-repo}tree/6.0/style_guides/js_style_guide.md[style_guides/js_style_guide.md].
122122

123123
[discrete]
124124
==== Definitions
@@ -187,7 +187,7 @@ Tests should run at the positive security boundry condition, meaning that they s
187187

188188
The functional UI tests now default to logging in with a user named `test_user` and the roles of this user can be changed dynamically without logging in and out.
189189

190-
In order to achieve this a new service was introduced called `createTestUserService` (see `test/common/services/security/test_user.ts`). The purpose of this test user service is to create roles defined in the test config files and setRoles() or restoreDefaults().
190+
In order to achieve this a new service was introduced called `createTestUserService` (see link:link:{kib-repo}tree/{branch}/test/common/services/security/test_user.ts[test/common/services/security/test_user.ts]). The purpose of this test user service is to create roles defined in the test config files and setRoles() or restoreDefaults().
191191

192192
An example of how to set the role like how its defined below:
193193

@@ -266,7 +266,7 @@ The first and only argument to all providers is a Provider API Object. This obje
266266
Within config files the API has the following properties
267267

268268
[horizontal]
269-
`log`::: An instance of the {blob}packages/kbn-dev-utils/src/tooling_log/tooling_log.js[`ToolingLog`] that is ready for use
269+
`log`::: An instance of the link:{kib-repo}tree/{branch}/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts[`ToolingLog`] that is ready for use
270270
`readConfigFile(path)`::: Returns a promise that will resolve to a Config instance that provides the values from the config file at `path`
271271

272272
Within service and PageObject Providers the API is:
@@ -289,17 +289,17 @@ Within a test Provider the API is exactly the same as the service providers API
289289
The `FunctionalTestRunner` comes with three built-in services:
290290

291291
**config:**:::
292-
* Source: {blob}src/functional_test_runner/lib/config/config.ts[src/functional_test_runner/lib/config/config.ts]
293-
* Schema: {blob}src/functional_test_runner/lib/config/schema.ts[src/functional_test_runner/lib/config/schema.ts]
292+
* Source: link:{kib-repo}tree/{branch}/packages/kbn-test/src/functional_test_runner/lib/config/config.ts[packages/kbn-test/src/functional_test_runner/lib/config/config.ts]
293+
* Schema: link:{kib-repo}tree/{branch}/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts[src/functional_test_runner/lib/config/schema.ts]
294294
* Use `config.get(path)` to read any value from the config file
295295

296296
**log:**:::
297-
* Source: {blob}packages/kbn-dev-utils/src/tooling_log/tooling_log.js[packages/kbn-dev-utils/src/tooling_log/tooling_log.js]
297+
* Source: link:{kib-repo}tree/{branch}/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts[packages/kbn-dev-utils/src/tooling_log/tooling_log.ts]
298298
* `ToolingLog` instances are readable streams. The instance provided by this service is automatically piped to stdout by the `FunctionalTestRunner` CLI
299299
* `log.verbose()`, `log.debug()`, `log.info()`, `log.warning()` all work just like console.log but produce more organized output
300300

301301
**lifecycle:**:::
302-
* Source: {blob}src/functional_test_runner/lib/lifecycle.ts[src/functional_test_runner/lib/lifecycle.ts]
302+
* Source: link:{kib-repo}tree/{branch}/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts[src/functional_test_runner/lib/lifecycle.ts]
303303
* Designed primary for use in services
304304
* Exposes lifecycle events for basic coordination. Handlers can return a promise and resolve/fail asynchronously
305305
* Phases include: `beforeLoadTests`, `beforeTests`, `beforeEachTest`, `cleanup`
@@ -310,14 +310,14 @@ The `FunctionalTestRunner` comes with three built-in services:
310310
The {kib} functional tests define the vast majority of the actual functionality used by tests.
311311

312312
**browser**:::
313-
* Source: {blob}test/functional/services/browser.ts[test/functional/services/browser.ts]
313+
* Source: link:{kib-repo}tree/{branch}/test/functional/services/common/browser.ts[test/functional/services/common/browser.ts]
314314
* Higher level wrapper for `remote` service, which exposes available browser actions
315315
* Popular methods:
316316
** `browser.getWindowSize()`
317317
** `browser.refresh()`
318318

319319
**testSubjects:**:::
320-
* Source: {blob}test/functional/services/test_subjects.ts[test/functional/services/test_subjects.ts]
320+
* Source: link:{kib-repo}tree/{branch}/test/functional/services/common/test_subjects.ts[test/functional/services/common/test_subjects.ts]
321321
* Test subjects are elements that are tagged specifically for selecting from tests
322322
* Use `testSubjects` over CSS selectors when possible
323323
* Usage:
@@ -342,45 +342,45 @@ await testSubjects.click(‘containerButton’);
342342
** `testSubjects.click(testSubjectSelector)` - Click a test subject in the page; throw if it can't be found after some time
343343

344344
**find:**:::
345-
* Source: {blob}test/functional/services/find.ts[test/functional/services/find.ts]
345+
* Source: {kib-repo}tree/{branch}/test/functional/services/common/find.ts[test/functional/services/common/find.ts]
346346
* Helpers for `remote.findBy*` methods that log and manage timeouts
347347
* Popular methods:
348348
** `find.byCssSelector()`
349349
** `find.allByCssSelector()`
350350

351351
**retry:**:::
352-
* Source: {blob}test/common/services/retry/retry.ts[test/common/services/retry/retry.ts]
352+
* Source: link:{kib-repo}tree/{branch}/test/common/services/retry/retry.ts[test/common/services/retry/retry.ts]
353353
* Helpers for retrying operations
354354
* Popular methods:
355355
** `retry.try(fn, onFailureBlock)` - Execute `fn` in a loop until it succeeds or the default timeout elapses. The optional `onFailureBlock` is executed before each retry attempt.
356356
** `retry.tryForTime(ms, fn, onFailureBlock)` - Execute `fn` in a loop until it succeeds or `ms` milliseconds elapses. The optional `onFailureBlock` is executed before each retry attempt.
357357

358358
**kibanaServer:**:::
359-
* Source: {blob}test/common/services/kibana_server/kibana_server.js[test/common/services/kibana_server/kibana_server.js]
359+
* Source: link:{kib-repo}tree/{branch}/test/common/services/kibana_server/kibana_server.ts[test/common/services/kibana_server/kibana_server.ts]
360360
* Helpers for interacting with {kib}'s server
361361
* Commonly used methods:
362362
** `kibanaServer.uiSettings.update()`
363363
** `kibanaServer.version.get()`
364364
** `kibanaServer.status.getOverallState()`
365365

366366
**esArchiver:**:::
367-
* Source: {blob}test/common/services/es_archiver.ts[test/common/services/es_archiver.ts]
367+
* Source: link:{kib-repo}tree/{branch}/test/common/services/es_archiver.ts[test/common/services/es_archiver.ts]
368368
* Load/unload archives created with the `esArchiver`
369369
* Popular methods:
370370
** `esArchiver.load(name)`
371371
** `esArchiver.loadIfNeeded(name)`
372372
** `esArchiver.unload(name)`
373373

374-
Full list of services that are used in functional tests can be found here: {blob}test/functional/services[test/functional/services]
374+
Full list of services that are used in functional tests can be found here: link:{kib-repo}tree/{branch}/test/functional/services[test/functional/services]
375375

376376

377377
**Low-level utilities:**:::
378378
* es
379-
** Source: {blob}test/common/services/es.ts[test/common/services/es.ts]
379+
** Source: link:{kib-repo}tree/{branch}/test/common/services/elasticsearch.ts[test/common/services/elasticsearch.ts]
380380
** {es} client
381381
** Higher level options: `kibanaServer.uiSettings` or `esArchiver`
382382
* remote
383-
** Source: {blob}test/functional/services/remote/remote.ts[test/functional/services/remote/remote.ts]
383+
** Source: link:{kib-repo}tree/{branch}/test/functional/services/remote/remote.ts[test/functional/services/remote/remote.ts]
384384
** Instance of https://seleniumhq.github.io/selenium/docs/api/javascript/module/selenium-webdriver/index_exports_WebDriver.html[WebDriver] class
385385
** Responsible for all communication with the browser
386386
** To perform browser actions, use `remote` service
@@ -511,4 +511,4 @@ macOS users on a machine with a discrete graphics card may see significant speed
511511
* In the General tab, under the "Magic" section, ensure "GPU rendering" is checked
512512
* Open "Advanced GPU Settings..."
513513
* Uncheck the "Prefer integrated to discrete GPU" option
514-
* Restart iTerm
514+
* Restart iTerm

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ Index Management by running this series of requests in Console:
409409
the infrastructure monitoring use-case within Kibana.
410410
411411
412-
|{kib-repo}blob/{branch}/x-pack/plugins/ingest_manager/README.md[ingestManager]
412+
|{kib-repo}blob/{branch}/x-pack/plugins/fleet/README.md[ingestManager]
413413
|Fleet needs to have Elasticsearch API keys enabled, and also to have TLS enabled on kibana, (if you want to run Kibana without TLS you can provide the following config flag --xpack.fleet.agents.tlsCheckDisabled=false)
414414
415415

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.executioncontextsearch.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-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ExecutionContextSearch](./kibana-plugin-plugins-data-public.executioncontextsearch.md)
4+
5+
## ExecutionContextSearch type
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export declare type ExecutionContextSearch = {
11+
filters?: Filter[];
12+
query?: Query | Query[];
13+
timeRange?: TimeRange;
14+
};
15+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.expressionfunctionkibana.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-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ExpressionFunctionKibana](./kibana-plugin-plugins-data-public.expressionfunctionkibana.md)
4+
5+
## ExpressionFunctionKibana type
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export declare type ExpressionFunctionKibana = ExpressionFunctionDefinition<'kibana', ExpressionValueSearchContext | null, object, ExpressionValueSearchContext, ExecutionContext<Adapters, ExecutionContextSearch>>;
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.expressionfunctionkibanacontext.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-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ExpressionFunctionKibanaContext](./kibana-plugin-plugins-data-public.expressionfunctionkibanacontext.md)
4+
5+
## ExpressionFunctionKibanaContext type
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export declare type ExpressionFunctionKibanaContext = ExpressionFunctionDefinition<'kibana_context', KibanaContext | null, Arguments, Promise<KibanaContext>, ExecutionContext<Adapters, ExecutionContextSearch>>;
11+
```

docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionvaluesearchcontext.md renamed to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.expressionvaluesearchcontext.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
22

3-
[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionValueSearchContext](./kibana-plugin-plugins-expressions-server.expressionvaluesearchcontext.md)
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ExpressionValueSearchContext](./kibana-plugin-plugins-data-public.expressionvaluesearchcontext.md)
44

55
## ExpressionValueSearchContext type
66

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Get field list by providing an index patttern (or spec)
99
<b>Signature:</b>
1010

1111
```typescript
12-
getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions) => Promise<any>;
12+
getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise<any>;
1313
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Get field list by providing { pattern }
99
<b>Signature:</b>
1010

1111
```typescript
12-
getFieldsForWildcard: (options?: GetFieldsOptions) => Promise<any>;
12+
getFieldsForWildcard: (options: GetFieldsOptions) => Promise<any>;
1313
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export declare class IndexPatternsService
2626
| [get](./kibana-plugin-plugins-data-public.indexpatternsservice.get.md) | | <code>(id: string) =&gt; Promise&lt;IndexPattern&gt;</code> | Get an index pattern by id. Cache optimized |
2727
| [getCache](./kibana-plugin-plugins-data-public.indexpatternsservice.getcache.md) | | <code>() =&gt; Promise&lt;SavedObject&lt;IndexPatternSavedObjectAttrs&gt;[] &#124; null &#124; undefined&gt;</code> | |
2828
| [getDefault](./kibana-plugin-plugins-data-public.indexpatternsservice.getdefault.md) | | <code>() =&gt; Promise&lt;IndexPattern &#124; null&gt;</code> | Get default index pattern |
29-
| [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) | | <code>(indexPattern: IndexPattern &#124; IndexPatternSpec, options?: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing an index patttern (or spec) |
30-
| [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) | | <code>(options?: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing { pattern } |
29+
| [getFieldsForIndexPattern](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforindexpattern.md) | | <code>(indexPattern: IndexPattern &#124; IndexPatternSpec, options?: GetFieldsOptions &#124; undefined) =&gt; Promise&lt;any&gt;</code> | Get field list by providing an index patttern (or spec) |
30+
| [getFieldsForWildcard](./kibana-plugin-plugins-data-public.indexpatternsservice.getfieldsforwildcard.md) | | <code>(options: GetFieldsOptions) =&gt; Promise&lt;any&gt;</code> | Get field list by providing { pattern } |
3131
| [getIds](./kibana-plugin-plugins-data-public.indexpatternsservice.getids.md) | | <code>(refresh?: boolean) =&gt; Promise&lt;string[]&gt;</code> | Get list of index pattern ids |
3232
| [getIdsWithTitle](./kibana-plugin-plugins-data-public.indexpatternsservice.getidswithtitle.md) | | <code>(refresh?: boolean) =&gt; Promise&lt;Array&lt;{</code><br/><code> id: string;</code><br/><code> title: string;</code><br/><code> }&gt;&gt;</code> | Get list of index pattern ids with titles |
3333
| [getTitles](./kibana-plugin-plugins-data-public.indexpatternsservice.gettitles.md) | | <code>(refresh?: boolean) =&gt; Promise&lt;string[]&gt;</code> | Get list of index pattern titles |

0 commit comments

Comments
 (0)