Merge branch 'master' into convert-typescript

Author: elasticmachine

.eslintignore

@@ -26,6 +26,7 @@ target
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
 /src/plugins/vis_type_timelion/public/_generated_/**
 /src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
+/src/plugins/timelion/public/webpackShims/jquery.flot.*
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
 /x-pack/plugins/apm/e2e/**/snapshots.js
 /x-pack/plugins/apm/e2e/tmp/*

.i18nrc.json

@@ -44,7 +44,7 @@
       "src/plugins/telemetry_management_section"
     ],
     "tileMap": "src/plugins/tile_map",
-    "timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
+    "timelion": ["src/plugins/timelion", "src/plugins/vis_type_timelion"],
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",

.sass-lint.yml

@@ -1,7 +1,7 @@
 files:
   include:
     - 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
-    - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
+    - 'src/plugins/timelion/**/*.s+(a|c)ss'
     - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
     - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
     - 'x-pack/plugins/canvas/**/*.s+(a|c)ss'

docs/management/advanced-options.asciidoc

@@ -247,7 +247,7 @@ retrieved.
 `timelion:es.timefield`:: The default field containing a timestamp when using the `.es()` query.
 `timelion:graphite.url`:: [experimental] Used with graphite queries, this is the URL of your graphite host
 in the form https://www.hostedgraphite.com/UID/ACCESS_KEY/graphite. This URL can be
-selected from a whitelist configured in the `kibana.yml` under `timelion.graphiteUrls`.
+selected from an allow-list configured in the `kibana.yml` under `timelion.graphiteUrls`.
 `timelion:max_buckets`:: The maximum number of buckets a single data source can return.
 This value is used for calculating automatic intervals in visualizations.
 `timelion:min_interval`:: The smallest interval to calculate when using "auto".

docs/settings/ingest-manager-settings.asciidoc

@@ -8,8 +8,7 @@
 experimental[]
 
 You can configure `xpack.ingestManager` settings in your `kibana.yml`. 
-By default, {ingest-manager} is not enabled. You need to
-enable it. To use {fleet}, you also need to configure {kib} and {es} hosts.
+By default, {ingest-manager} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.
 
 See the {ingest-guide}/index.html[Ingest Management] docs for more information.
 
@@ -19,7 +18,7 @@ See the {ingest-guide}/index.html[Ingest Management] docs for more information.
 [cols="2*<"]
 |===
 | `xpack.ingestManager.enabled` {ess-icon}
-  | Set to `true` to enable {ingest-manager}. 
+  | Set to `true` (default) to enable {ingest-manager}. 
 | `xpack.ingestManager.fleet.enabled` {ess-icon}
   | Set to `true` (default) to enable {fleet}. 
 |===