Skip to content

Commit 2b097ba

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into kertal-pr-2020-03-09-discover-migrate-context-mocha-tests
2 parents 63256d5 + 6febf77 commit 2b097ba

3,850 files changed

Lines changed: 54093 additions & 39278 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.

‎.eslintrc.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ const ELASTIC_LICENSE_HEADER = `
4949
*/
5050
`;
5151

52+
const allMochaRulesOff = {};
53+
Object.keys(require('eslint-plugin-mocha').rules).forEach(k => {
54+
allMochaRulesOff['mocha/' + k] = 'off';
55+
});
56+
5257
module.exports = {
5358
root: true,
5459

@@ -514,6 +519,14 @@ module.exports = {
514519
},
515520
},
516521

522+
/**
523+
* Harden specific rules
524+
*/
525+
{
526+
files: ['test/harden/*.js'],
527+
rules: allMochaRulesOff,
528+
},
529+
517530
/**
518531
* APM overrides
519532
*/

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
/x-pack/test/functional/services/ml.ts @elastic/ml-ui
8989
# ML team owns the transform plugin, ES team added here for visibility
9090
# because the plugin lives in Kibana's Elasticsearch management section.
91-
/x-pack/legacy/plugins/transform/ @elastic/ml-ui @elastic/es-ui
9291
/x-pack/plugins/transform/ @elastic/ml-ui @elastic/es-ui
9392
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
9493
/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
@@ -133,7 +132,7 @@
133132
/src/legacy/server/saved_objects/ @elastic/kibana-platform
134133
/src/legacy/server/status/ @elastic/kibana-platform
135134
/src/plugins/status_page/ @elastic/kibana-platform
136-
/src/dev/run_check_core_api_changes.ts @elastic/kibana-platform
135+
/src/dev/run_check_published_api_changes.ts @elastic/kibana-platform
137136

138137
# Security
139138
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ Note that for VSCode, to enable "live" linting of TypeScript (and other) file ty
391391

392392
All user-facing labels and info texts in Kibana should be internationalized. Please take a look at the [readme](packages/kbn-i18n/README.md) and the [guideline](packages/kbn-i18n/GUIDELINE.md) of the i18n package on how to do so.
393393

394-
In order to enable translations in the React parts of the application, the top most component of every `ReactDOM.render` call should be an `I18nContext`:
394+
In order to enable translations in the React parts of the application, the top most component of every `ReactDOM.render` call should be the `Context` component from the `i18n` core service:
395395
```jsx
396-
import { I18nContext } from 'ui/i18n';
396+
const I18nContext = coreStart.i18n.Context;
397397

398398
ReactDOM.render(
399399
<I18nContext>

‎docs/apm/advanced-queries.asciidoc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ When querying in the APM app, you're simply searching and selecting data from fi
55
Queries entered into the query bar are also added as parameters to the URL,
66
so it's easy to share a specific query or view with others.
77

8-
In the screenshot below, you can begin to see some of the transaction fields available for filtering on:
8+
In the screenshot below, you can begin to see some of the transaction fields available for filtering on:
99

1010
[role="screenshot"]
1111
image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
@@ -21,22 +21,22 @@ TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements]
2121

2222
[float]
2323
[[discover-advanced-queries]]
24-
=== Querying in the Discover app
24+
=== Querying in Discover
2525

26-
It may also be helpful to view your APM data in the {kibana-ref}/discover.html[Discover app].
27-
Querying documents in Discover works the same way as querying in the APM app,
28-
and all of the example queries listed above can also be used in the Discover app.
26+
It may also be helpful to view your APM data in {kibana-ref}/discover.html[*Discover*].
27+
Querying documents in *Discover* works the same way as querying in the APM app,
28+
and all of the example APM app queries can also be used in *Discover*.
2929

3030
[float]
31-
==== Example Discover app query
31+
==== Example Discover query
3232

33-
One example where you may want to make use of the Discover app,
33+
One example where you may want to make use of *Discover*,
3434
is for viewing _all_ transactions for an endpoint, instead of just a sample.
3535

3636
TIP: Starting in v7.6, you can view 10 samples per bucket in the APM app, instead of just one.
3737

3838
Use the APM app to find a transaction name and time bucket that you're interested in learning more about.
39-
Then, switch to the Discover app and make a search:
39+
Then, switch to *Discover* and make a search:
4040

4141
["source","sh"]
4242
-----

‎docs/canvas/canvas-function-reference.asciidoc‎

Lines changed: 17 additions & 17 deletions
Large diffs are not rendered by default.

‎docs/dev-tools/console/console.asciidoc‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ NOTE: You are unable to interact with the REST API of {kib} with the Console.
1818
[[console-api]]
1919
=== Write requests
2020

21-
Console understands commands in a cURL-like syntax.
22-
For example, the following is a `GET` request to the {es} `_search` API.
21+
Console understands commands in a cURL-like syntax.
22+
For example, the following is a `GET` request to the {es} `_search` API.
2323

2424
[source,js]
2525
----------------------------------
@@ -43,23 +43,23 @@ curl -XGET "http://localhost:9200/_search" -d'
4343
}'
4444
----------------------------------
4545

46-
If you paste the above command into Console, {kib} automatically converts it
46+
When you paste the command into Console, {kib} automatically converts it
4747
to Console syntax. Alternatively, if you want to want to see Console syntax in cURL,
48-
click the action icon (image:dev-tools/console/images/wrench.png[]) and select *Copy as cURL*.
48+
click the action icon (image:dev-tools/console/images/wrench.png[]) and select *Copy as cURL*.
4949

5050
[float]
5151
[[console-autocomplete]]
5252
==== Autocomplete
5353

5454
When you're typing a command, Console makes context-sensitive suggestions.
55-
These suggestions show you the parameters for each API and speed up your typing.
56-
To configure your preferences for autocomplete, go to
57-
<<configuring-console, Settings>>.
55+
These suggestions show you the parameters for each API and speed up your typing.
56+
To configure your preferences for autocomplete, go to
57+
<<configuring-console, Settings>>.
5858

5959
[float]
6060
[[auto-formatting]]
6161
==== Auto-formatting
62-
The auto-formatting
62+
The auto-formatting
6363
capability can help you format requests. Select one or more requests that you
6464
want to format, click the action icon (image:dev-tools/console/images/wrench.png[]),
6565
and then select *Auto indent*.
@@ -69,27 +69,27 @@ For example, you might have a request formatted like this:
6969
[role="screenshot"]
7070
image::dev-tools/console/images/copy-curl.png["Console close-up"]
7171

72-
Console adjusts the JSON body of the request to apply the indents.
72+
Console adjusts the JSON body of the request to apply the indents.
7373

7474
[role="screenshot"]
7575
image::dev-tools/console/images/request.png["Console close-up"]
7676

77-
If you select *Auto indent* on a request that is already well formatted,
78-
Console collapses the request body to a single line per document.
77+
If you select *Auto indent* on a request that is already well formatted,
78+
Console collapses the request body to a single line per document.
7979
This is helpful when working with the {es} {ref}/docs-bulk.html[bulk APIs].
8080

8181

8282

8383
[float]
8484
[[console-request]]
85-
=== Submit requests
85+
=== Submit requests
8686

87-
When you're ready to submit the request to {es}, click the
87+
When you're ready to submit the request to {es}, click the
8888
green triangle.
8989

9090
You can select multiple requests and submit them together.
91-
Console sends the requests to {es} one by one and shows the output
92-
in the response pane. Submitting multiple request is helpful when you're debugging an issue or trying query
91+
Console sends the requests to {es} one by one and shows the output
92+
in the response pane. Submitting multiple request is helpful when you're debugging an issue or trying query
9393
combinations in multiple scenarios.
9494

9595

@@ -105,15 +105,15 @@ the action icon (image:dev-tools/console/images/wrench.png[]) and select
105105
[[console-history]]
106106
=== Get your request history
107107

108-
Console maintains a list of the last 500 requests that {es} successfully executed.
108+
Console maintains a list of the last 500 requests that {es} successfully executed.
109109
To view your most recent requests, click *History*. If you select a request
110110
and click *Apply*, {kib} adds it to the editor at the current cursor position.
111111

112112
[float]
113113
[[configuring-console]]
114114
=== Configure Console settings
115115

116-
You can configure the Console font size, JSON syntax,
116+
You can configure the Console font size, JSON syntax,
117117
and autocomplete suggestions in *Settings*.
118118

119119
[role="screenshot"]
@@ -130,9 +130,7 @@ shortcuts, click *Help*.
130130
[[console-settings]]
131131
=== Disable Console
132132

133-
If you don’t want to use Console, you can disable it by setting `console.enabled`
134-
to `false` in your `kibana.yml` configuration file. Changing this setting
135-
causes the server to regenerate assets on the next startup,
133+
If you don’t want to use Console, you can disable it by setting `console.enabled`
134+
to `false` in your `kibana.yml` configuration file. Changing this setting
135+
causes the server to regenerate assets on the next startup,
136136
which might cause a delay before pages start being served.
137-
138-

‎docs/dev-tools/searchprofiler/more-complicated.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ POST test/_bulk
2525
// CONSOLE
2626
--
2727

28-
. From the {searchprofiler}, enter "test" in the Index field above the query editor to restrict profiled
28+
. From the {searchprofiler}, enter "test" in the *Index* field to restrict profiled
2929
queries to the `test` index.
3030

3131
. Replace the default `match_all` query in the query editor with a query that has two sub-query
@@ -66,7 +66,7 @@ components and includes a simple aggregation, like the example below.
6666
// NOTCONSOLE
6767
--
6868

69-
. Click *Profile* to profile the query and visualize the results.
69+
. Click *Profile* to profile the query and visualize the results.
7070
. Select the shard to view the query details.
7171
+
7272
[role="screenshot"]
@@ -100,5 +100,5 @@ Select the name of the shard to view the aggregation details and timing breakdow
100100
image::dev-tools/searchprofiler/images/gs10.png["Drilling into the first shard's details"]
101101

102102
For more information about how the {searchprofiler} works, how timings are calculated, and
103-
how to interpret various results, see
103+
how to interpret various results, see
104104
{ref}/search-profile.html#profiling-queries[Profiling queries].

‎docs/developer/core/development-dependencies.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ module.exports = window.angular;
9696

9797
What this shim does is fairly simple if you go line by line:
9898

99-
. makes sure that jQuery is loaded before angular (which actually runs the shim above)
99+
. makes sure that jQuery is loaded before angular (which actually runs the shim)
100100
. load the angular.js file from the node_modules directory
101101
. load the angular-elastic plugin, a plugin we want to always be included whenever we import angular
102102
. use the `ui/modules` module to add the module exported by angular-elastic as a dependency to the `kibana` angular module
103-
. finally, export the window.angular variable. This means that writing `import angular from 'angular';` will properly set the angular variable to the angular library, rather than undefined which is the default behavior.
103+
. finally, export the window.angular variable. This means that writing `import angular from 'angular';` will properly set the angular variable to the angular library, rather than undefined which is the default behavior.

‎docs/developer/core/development-modules.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ certain components. Here is a breakdown of those modules:
2020
the required modules and import them were they are actually necessary.
2121

2222
- *`import 'ui/autoload/all'`*
23-
Imports all of the above modules
23+
Imports all of the modules
2424

2525
[float]
2626
==== Resolving Require Paths
@@ -60,4 +60,4 @@ Here is how import/require statements are resolved to a file:
6060
** path/index + '.js'
6161
** path/index + '.json'
6262
** path/index
63-
* if none of the above paths matches then an error is thrown
63+
* if none of the paths matches then an error is thrown

‎docs/developer/plugin/development-plugin-feature-registration.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ init(server) {
175175
}
176176
-----------
177177

178-
Unlike the Canvas example above, Dev Tools does not require access to any saved objects to function. Dev Tools does specify an API endpoint, however. When this is configured, the Security plugin will automatically authorize access to any server API route that is tagged with `access:console`, similar to the following:
178+
Unlike the Canvas example, Dev Tools does not require access to any saved objects to function. Dev Tools does specify an API endpoint, however. When this is configured, the Security plugin will automatically authorize access to any server API route that is tagged with `access:console`, similar to the following:
179179

180180
["source","javascript"]
181181
-----------

0 commit comments

Comments
 (0)