merge master into feat/discover-elastic-charts

.github/CODEOWNERS

@@ -16,9 +16,17 @@
 /x-pack/test/functional/apps/code/  @teams/code
 /x-pack/test/api_integration/apis/code/  @teams/code
 
+# Infrastructure and Logs UI
+/x-pack/plugins/infra/ @elastic/infra-logs-ui
+
 # Machine Learning
 /x-pack/plugins/ml/  @elastic/ml-ui
 
+# Operations
+/src/dev/ @elastic/kibana-operations
+/src/setup_node_env/ @elastic/kibana-operations
+/src/optimize/ @elastic/kibana-operations
+
 # Platform
 /src/core/  @elastic/kibana-platform
 
@@ -41,6 +49,7 @@
 /x-pack/plugins/remote_clusters/  @elastic/es-ui
 /x-pack/plugins/rollup/  @elastic/es-ui
 /x-pack/plugins/searchprofiler/  @elastic/es-ui
+/x-pack/plugins/snapshot_restore/  @elastic/es-ui
 /x-pack/plugins/watcher/  @elastic/es-ui
 
 # Kibana TSVB external contractors

.i18nrc.json

@@ -45,6 +45,7 @@
     "xpack.siem": "x-pack/plugins/siem",
     "xpack.security": "x-pack/plugins/security",
     "xpack.server": "x-pack/server",
+    "xpack.snapshotRestore": "x-pack/plugins/snapshot_restore",
     "xpack.spaces": "x-pack/plugins/spaces",
     "xpack.upgradeAssistant": "x-pack/plugins/upgrade_assistant",
     "xpack.uptime": "x-pack/plugins/uptime",

CONTRIBUTING.md

@@ -356,7 +356,7 @@ Test runner arguments:
     `node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts`
   - Run the api integration test case whose description matches the given string:
     `node scripts/functional_tests_server --config test/api_integration/config.js`
-    `node scripts/functional_tests_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'`
+    `node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'`
 
 ### Debugging Unit Tests
 

docs/api/role-management/delete.asciidoc

@@ -3,7 +3,7 @@
 
 experimental[This API is experimental and may be changed or removed completely in a future release. Although the underlying mechanism of enforcing role-based access control is stable, the APIs for managing the roles are currently experimental.]
 
-Note: You cannot access this endpoint via the Console in Kibana.
+NOTE: You cannot access this endpoint via the Console in Kibana.
 
 ==== Authorization
 

docs/api/role-management/get.asciidoc

@@ -5,7 +5,7 @@ experimental[This API is experimental and may be changed or removed completely i
 
 Retrieves all {kib} roles, or a specific role.
 
-Note: You cannot access this endpoint via the Console in Kibana.
+NOTE: You cannot access this endpoint via the Console in Kibana.
 
 ==== Authorization
 

docs/api/role-management/put.asciidoc

@@ -6,7 +6,7 @@ experimental[This API is experimental and may be changed or removed completely i
 Creates a new {kib} role or updates the attributes of an existing role. {kib} roles are stored in the
 {es} native realm.
 
-Note: You cannot access this endpoint via the Console in Kibana.
+NOTE: You cannot access this endpoint via the Console in Kibana.
 
 ==== Authorization
 
@@ -69,8 +69,6 @@ A successful call returns a response code of `204` and no response body.
 ==== Granting access to specific spaces
 To grant access to individual spaces within {kib}, specify the space identifier within the `kibana` object.
 
-Note: granting access 
-
 [source,js]
 --------------------------------------------------
 PUT /api/security/role/my_kibana_role

docs/dashboard.asciidoc

@@ -3,7 +3,7 @@
 
 [partintro]
 --
-A Kibana _dashboard_ displays a collection of visualizations and searches.
+A Kibana _dashboard_ displays a collection of visualizations, searches, and {kibana-ref}/maps.html[maps].
 You can arrange, resize, and edit the dashboard content and then save the dashboard
 so you can share it.
 
@@ -15,25 +15,25 @@ image:images/Dashboard_example.png[Example dashboard]
 [[dashboard-getting-started]]
 == Building a Dashboard
 
-If you haven't yet indexed data into {es} or created an index pattern, 
-you'll be prompted to do so as you follow the steps for creating a dashboard.  
-Or, you can use one of the prebuilt sample data sets, available from the 
+If you haven't yet indexed data into {es} or created an index pattern,
+you'll be prompted to do so as you follow the steps for creating a dashboard.
+Or, you can use one of the prebuilt sample data sets, available from the
 Kibana home page.
 
 . In the side navigation, click *Dashboard*.
-. Click *Create new dashboard.*  
+. Click *Create new dashboard.*
 . Click *Add*.
 . [[adding-visualizations-to-a-dashboard]]Use *Add Panels* to add visualizations
 and saved searches to the dashboard. If you have a large number of
-visualizations, you can filter the lists. 
+visualizations, you can filter the lists.
 +
 [role="screenshot"]
 image:images/Dashboard_add_visualization.png[Example add visualization to dashboard]
 
 . [[saving-dashboards]]When you're finished adding and arranging the panels,
 go to the menu bar and click *Save*.
 
-. In *Save Dashboard*, enter a dashboard title and optionally a description. 
+. In *Save Dashboard*, enter a dashboard title and optionally a description.
 
 . To store the time period specified in the time filter, enable *Store time
 with dashboard*.
@@ -57,7 +57,7 @@ resize, edit, and delete.  To start editing, click *Edit* in the menu bar.
 to the new dimensions.
 
 [[removing-containers]]
-Additional commands for managing the panel and its contents 
+Additional commands for managing the panel and its contents
 are in the gear menu in the upper right.
 
 [role="screenshot"]
@@ -69,14 +69,14 @@ dashboard does *not* delete the saved visualization or search.
 [[viewing-detailed-information]]
 == Inspecting a Visualization from the Dashboard
 
-Many visualizations allow you to inspect the data and requests behind the 
-visualization. 
+Many visualizations allow you to inspect the data and requests behind the
+visualization.
 
-In the dashboard, expand the visualization's panel menu (or gear menu if in 
+In the dashboard, expand the visualization's panel menu (or gear menu if in
 *Edit* mode) and select *Inspect*.
 
-The initial view shows the underlying data for the visualization. To view the 
-requests that were made for the visualization, choose *Requests* from the *View* 
+The initial view shows the underlying data for the visualization. To view the
+requests that were made for the visualization, choose *Requests* from the *View*
 menu.
 
 The views you'll see depend on the element that you inspect.