Merge branch 'master' into uptime_server-new-platform

Author: justinkambic

CONTRIBUTING.md

@@ -309,12 +309,12 @@ Another tool we use for enforcing consistent coding style is EditorConfig, which
 Note that for VSCode, to enable "live" linting of TypeScript (and other) file types, you will need to modify your local settings, as shown below.  The default for the ESLint extension is to only lint JavaScript file types.
 
 ```json
-   "eslint.validate": [
-        "javascript",
-        "javascriptreact",
-        "typescript",
-        "typescriptreact",
-    ]
+"eslint.validate": [
+  "javascript",
+  "javascriptreact",
+  { "language": "typescript", "autoFix": true },
+  { "language": "typescriptreact", "autoFix": true }
+]
 ```
 
 ### Internationalization

docs/api/spaces-management.asciidoc

@@ -10,7 +10,7 @@ Manage your {kib} spaces.
 * <<spaces-api-get-all, Get all {kib} spaces API>>
 * <<spaces-api-delete, Delete space API>>
 * <<spaces-api-copy-saved-objects, Copy saved objects to space API>>
-*<<spaces-api-resolve-copy-saved-objects-conflicts , Resolve copy saved objects to space conflicts API>>
+* <<spaces-api-resolve-copy-saved-objects-conflicts, Resolve copy saved objects to space conflicts API>>
 
 include::spaces-management/post.asciidoc[]
 include::spaces-management/put.asciidoc[]

docs/developer/plugin/development-plugin-resources.asciidoc

@@ -28,13 +28,13 @@ node scripts/generate_plugin my_plugin_name # replace "my_plugin_name" with your
 The Kibana directory must be named `kibana`, and your plugin directory should be located in the root of `kibana` in a `plugins` directory, for example:
 
 ["source","shell"]
------------
+----
 .
 └── kibana
     └── plugins
         ├── foo-plugin
         └── bar-plugin
---------
+----
 
 [float]
 ==== References in the code

docs/infrastructure/getting-started.asciidoc

@@ -2,7 +2,7 @@
 [[xpack-metrics-getting-started]]
 == Getting started with infrastructure monitoring
 
-To get started with the Infrastructure app in Kibana, you need to start collecting metrics data for your infrastructure.
+To get started with the Metrics app in Kibana, you need to start collecting metrics data for your infrastructure.
 
 Kibana provides step-by-step instructions to help you add metrics data.
 The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions.

docs/infrastructure/index.asciidoc

@@ -1,10 +1,10 @@
 [role="xpack"]
 [[xpack-infra]]
-= Infrastructure
+= Metrics
 
 [partintro]
 --
-The Infrastructure app enables you to monitor your infrastructure and identify problems in real time.
+The Metrics app enables you to monitor your infrastructure and identify problems in real time.
 You start with a visual summary of your infrastructure where you can view basic metrics for common servers, containers, and services.
 Then you can drill down to view more detailed metrics or other information for that component.
 
@@ -21,7 +21,7 @@ You can optionally save these views and add them to {kibana-ref}/dashboard.html[
 
 * Seamlessly switch to view the corresponding logs, application traces or uptime information for a component.
 
-To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Infrastructure application to inspect and analyze your data>>.
+To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Metrics application to inspect and analyze your data>>.
 
 [role="screenshot"]
 image::infrastructure/images/infra-sysmon.png[Infrastructure Overview in Kibana]

docs/infrastructure/infra-ui.asciidoc

@@ -1,8 +1,8 @@
 [role="xpack"]
 [[infra-ui]]
-== Using the Infrastructure app
+== Using the Metrics app
 
-Use the Infrastructure app in {kib} to monitor your infrastructure and identify problems in real time.
+Use the Metrics app in {kib} to monitor your infrastructure and identify problems in real time.
 You can explore metrics for hosts, containers, and services.
 You can also drill down to view more detailed metrics, or seamlessly switch to view the corresponding logs, application traces, and uptime information.
 
@@ -62,7 +62,7 @@ Select *Auto-refresh* to keep up-to-date metrics information coming in, or *Stop
 [[infra-configure-source]]
 === Configure the data to use for your metrics
 
-The default source configuration for metrics is specified in the {kibana-ref}/infrastructure-ui-settings-kb.html[Infrastructure app settings] in the {kibana-ref}/settings.html[Kibana configuration file].
+The default source configuration for metrics is specified in the {kibana-ref}/infrastructure-ui-settings-kb.html[Metrics app settings] in the {kibana-ref}/settings.html[Kibana configuration file].
 The default configuration uses the `metricbeat-*` index pattern to query the data.
 The default configuration also defines field settings for things like timestamps and container names.
 

docs/infrastructure/metrics-explorer.asciidoc

@@ -2,7 +2,7 @@
 [[metrics-explorer]]
 == Metrics Explorer
 
-Metrics Explorer in the Infrastructure app in Kibana allows you to group and visualise multiple customisable metrics for one or more components in a graphical format.
+Metrics Explorer in the Metrics app in Kibana allows you to group and visualise multiple customisable metrics for one or more components in a graphical format.
 This can be a starting point for further investigations.
 You can also save your views and add them to {kibana-ref}/dashboard.html[dashboards].
 
@@ -14,7 +14,7 @@ image::infrastructure/images/metrics-explorer-screen.png[Metrics Explorer in Kib
 === Metrics Explorer requirements and considerations
 
 * Metrics Explorer uses data collected from {metricbeat-ref}/metricbeat-overview.html[Metricbeat].
-* You need read permissions on `metricbeat-*` or the metric index specified in the Infrastructure configuration.
+* You need read permissions on `metricbeat-*` or the metric index specified in the Metrics configuration.
 * Metrics Explorer uses the timestamp field set in the Infrastructure configuration.
 By default that is set to `@timestamp`.
 * The interval for the X Axis is set to `auto`.
@@ -30,7 +30,7 @@ After that, we'll filter down to a specific host and explore the outbound traffi
 Before we start, if you don't have any Metricbeat data, you'll need to head over to our
 {metricbeat-ref}/metricbeat-overview.html[Metricbeat documentation] to install Metricbeat and start collecting data.
 
-1. When you have Metricbeat running and collecting data, open Kibana and navigate to *Infrastructure*.
+1. When you have Metricbeat running and collecting data, open Kibana and navigate to *Metrics*.
 The *Inventory* tab shows the host or hosts you are monitoring.
 
 2. Select the *Metrics Explorer* tab.

docs/infrastructure/view-metrics.asciidoc

@@ -3,7 +3,7 @@
 
 == Viewing infrastructure metrics
 
-When you select *View Metrics* for a component in your infrastructure from the <<infra-ui, Infrastructure app in Kibana>>, you can view detailed metrics for that component, and for any related components.
+When you select *View Metrics* for a component in your infrastructure from the <<infra-ui, Metrics app in Kibana>>, you can view detailed metrics for that component, and for any related components.
 You can also view additional component metadata.
 
 [role="screenshot"]

docs/logs/index.asciidoc

@@ -10,7 +10,7 @@ The Logs app has a compact, console-like display that you can customize.
 You can filter the logs by various fields, start and stop live streaming, and highlight text of interest.
 
 You can open the Logs app from the *Logs* tab in Kibana.
-You can also open the Logs app directly from a component in the Infrastructure app.
+You can also open the Logs app directly from a component in the Metrics app.
 In this case, you will only see the logs for the selected component.
 
 * <<xpack-logs-getting-started>>

docs/settings/general-infra-logs-ui-settings.asciidoc

@@ -1,4 +1,4 @@
-`xpack.infra.enabled`:: Set to `false` to disable the Logs and Infrastructure UI plugin {kib}. Defaults to `true`.
+`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics UI plugin {kib}. Defaults to `true`.
 
 `xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*,kibana_sample_data_logs*`. To match multiple wildcard patterns, use a comma to separate the names, with no space after the comma. For example, `logstash-app1-*,default-logs-*`.