Merge branch 'master' into ts-update

.eslintrc.js

@@ -197,9 +197,12 @@ module.exports = {
                 errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
               },
               {
-                target: ['(src|x-pack)/plugins/*/public/**/*'],
-                from: ['(src|x-pack)/plugins/*/server/**/*'],
-                errorMessage: `Public code can not import from server, use a common directory.`,
+                target: [
+                  '(src|x-pack)/plugins/*/server/**/*',
+                  '!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
+                ],
+                from: ['(src|x-pack)/plugins/*/public/**/*'],
+                errorMessage: `Server code can not import from public, use a common directory.`,
               },
               {
                 target: ['(src|x-pack)/plugins/*/common/**/*'],
@@ -589,8 +592,11 @@ module.exports = {
      * Security Solution overrides
      */
     {
-      // front end typescript and javascript files only
-      files: ['x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}'],
+      // front end and common typescript and javascript files only
+      files: [
+        'x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}',
+        'x-pack/plugins/security_solution/common/**/*.{js,ts,tsx}',
+      ],
       rules: {
         'import/no-nodejs-modules': 'error',
         'no-restricted-imports': [
@@ -766,6 +772,23 @@ module.exports = {
     /**
      * Lists overrides
      */
+    {
+      // front end and common typescript and javascript files only
+      files: [
+        'x-pack/plugins/lists/public/**/*.{js,ts,tsx}',
+        'x-pack/plugins/lists/common/**/*.{js,ts,tsx}',
+      ],
+      rules: {
+        'import/no-nodejs-modules': 'error',
+        'no-restricted-imports': [
+          'error',
+          {
+            // prevents UI code from importing server side code and then webpack including it when doing builds
+            patterns: ['**/server/*'],
+          },
+        ],
+      },
+    },
     {
       // typescript and javascript for front and back end
       files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],

.gitignore

@@ -4,6 +4,7 @@
 /.es
 .DS_Store
 .node_binaries
+.native_modules
 node_modules
 !/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
 !/src/dev/notice/__fixtures__/node_modules

docs/discover/context.asciidoc

@@ -1,5 +1,5 @@
 [[document-context]]
-== Viewing a document in context
+== View a document in context
 
 Once you've narrowed your search to a specific event,
 you might want to inspect the documents that occurred

docs/discover/document-data.asciidoc

@@ -1,5 +1,5 @@
 [[document-data]]
-== Viewing document data
+== View document data
 
 When you submit a search query in *Discover*, the most recent documents that match the query
 are listed in the documents table.

docs/discover/field-filter.asciidoc

@@ -1,5 +1,5 @@
 [[field-filter]]
-== Filtering by field
+== Filter by field
 
 *Discover* offers
 various types of filters, so you can restrict your documents to the exact data you want.

docs/discover/kuery.asciidoc

@@ -5,7 +5,7 @@ In Kibana 6.3, we introduced a number of exciting experimental query language en
 features are now available by default in 7.0. Out of the box, Kibana's query language now includes scripted field support and a
 simplified, easier to use syntax. If you have a Basic license or above, autocomplete functionality will also be enabled.
 
-==== Language Syntax
+==== Language syntax
 
 If you're familiar with Kibana's old Lucene query syntax, you should feel right at home with the new syntax. The basics
 stay the same, we've simply refined things to make the query language easier to use.
@@ -72,7 +72,7 @@ set these terms will be matched against all fields. For example, a query for `re
 in the response field, but a query for just `200` will search for 200 across all fields in your index.
 ============
 
-==== Nested Field Support
+==== Nested field support
 
 KQL supports querying on {ref}/nested.html[nested fields] through a special syntax. You can query nested fields in subtly different
 ways, depending on the results you want, so crafting nested queries requires extra thought.

docs/discover/search.asciidoc

@@ -1,5 +1,5 @@
 [[search]]
-== Searching your data
+== Search data
 Many Kibana apps embed a query bar for real-time search, including
 *Discover*, *Visualize*, and *Dashboard*.
 
@@ -83,14 +83,14 @@ query language you can also submit queries using the {ref}/query-dsl.html[Elasti
 
 
 [[save-open-search]]
-=== Saving searches
+=== Save a search
 A saved search persists your current view of Discover for later retrieval and reuse. You can reload a saved search into Discover, add it to a dashboard, and use it as the basis for a <<visualize, visualization>>.
 
 A saved search includes the query text, filters, and optionally, the time filter. A saved search also includes the selected columns in the document table, the sort order, and the current index pattern.
 
 [role="xpack"]
 [[discover-read-only-access]]
-==== Read only access
+==== Read-only access
 When you have insufficient privileges to save searches, the following indicator in Kibana will be
 displayed and the *Save* button won't be visible. For more information on granting access to
 Kibana see <<xpack-security-authorization>>.
@@ -117,7 +117,7 @@ selected, opening the saved search changes the selected index pattern. The query
 used for the saved search will also be automatically selected.
 
 [[save-load-delete-query]]
-=== Saving queries
+=== Save a query
 A saved query is a portable collection of query text and filters that you can reuse in <<discover, Discover>>, <<visualize, Visualize>>, and <<dashboard, Dashboard>>. Save a query when you want to:
 
 * Retrieve results from the same query at a later time without having to reenter the query text, add the filters or set the time filter
@@ -127,7 +127,7 @@ A saved query is a portable collection of query text and filters that you can re
 Saved queries don't include information specific to Discover, such as the currently selected columns in the document table, the sort order, and the index pattern. If you want to save your current view of Discover for later retrieval and reuse, create a <<save-open-search, saved search>> instead.
 
 [role="xpack"]
-==== Read only access
+==== Read-only access
 If you have insufficient privileges to save queries, the *Save current query* button isn't visible in the saved query management popover. For more information, see <<xpack-security-authorization, Granting access to Kibana>>
 
 ==== Save a query

docs/discover/set-time-filter.asciidoc

@@ -1,39 +1,39 @@
 [[set-time-filter]]
-== Setting the time filter
-If your index contains time-based events, and a time-field is configured for the 
+== Set the time filter
+If your index contains time-based events, and a time-field is configured for the
 selected <<index-patterns, index pattern>>, set a time filter that displays only the data within the
 specified time range.
 
-You can use the time filter to change the time range, or select a specific time 
+You can use the time filter to change the time range, or select a specific time
 range in the histogram.
 
 [float]
 [[use-time-filter]]
 === Use the time filter
 
-Use the time filter to change the time range. By default, the time filter is set 
+Use the time filter to change the time range. By default, the time filter is set
 to the last 15 minutes.
 
-. Click image:images/time-filter-calendar.png[]. 
+. Click image:images/time-filter-calendar.png[].
 
 . Choose one of the following:
 
-* *Quick select* to use a recent time range, then use the back and forward 
+* *Quick select* to use a recent time range, then use the back and forward
   arrows to move through the time ranges.
-  
-* *Commonly used* to use a time range from options such as *Last 15 minutes*, 
+
+* *Commonly used* to use a time range from options such as *Last 15 minutes*,
   *Today*, and *Week to date*.
-  
-* *Recently used date ranges* to use a previously selected data range that 
+
+* *Recently used date ranges* to use a previously selected data range that
   you recently used.
-  
+
 * *Refresh every* to specify an automatic refresh rate.
 +
 [role="screenshot"]
 image::images/Timepicker-View.png[Time filter menu]
 
-. To set the start and end times, click the bar next to the time filter. 
-In the popup, select *Absolute*, *Relative* or *Now*, then specify the required 
+. To set the start and end times, click the bar next to the time filter.
+In the popup, select *Absolute*, *Relative* or *Now*, then specify the required
 options.
 +
 [role="screenshot"]
@@ -54,4 +54,3 @@ when you hover over a valid start point.
 
 [role="screenshot"]
 image::images/Histogram-Time.png[Time range selector in Histogram]
-

docs/discover/viewing-field-stats.asciidoc

@@ -1,5 +1,5 @@
 [[viewing-field-stats]]
-== Viewing Field Data Statistics
+== View field data statistics
 
 From the fields list, you can see how many of the documents in the documents
 table contain a particular field, what the top 5 values are, and what

docs/infrastructure/infra-ui.asciidoc

@@ -103,7 +103,7 @@ You can:
 
 * Select *View Metrics* to <<xpack-view-metrics, view detailed infrastructure metrics>>.
 
-* Select *View Logs* to <<xpack-logs-using, view the logs>> in the *Logs* app.
+* Select *View Logs* to {logs-guide}/inspect-log-events.html[view the logs] in the *Logs* app.
 
 Depending on the features you have installed and configured, you may also be able to: