Skip to content

Commit

Permalink
Merge branch 'master' into bug/flaky-endpoints-list-policy-response-t…
Browse files Browse the repository at this point in the history
…ests
  • Loading branch information
elasticmachine authored Jun 19, 2020
2 parents 450b43b + 639d1e0 commit 70acb64
Show file tree
Hide file tree
Showing 3 changed files with 191 additions and 1,696 deletions.
6 changes: 4 additions & 2 deletions docs/settings/ingest-manager-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
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 not enabled. You need to
enable it. To use {fleet}, you also need to configure {kib} and {es} hosts.

See the {ingest-guide}/index.html[Ingest Management] docs for more information.

[[general-ingest-manager-settings-kb]]
==== General {ingest-manager} settings
Expand Down
Loading

0 comments on commit 70acb64

Please sign in to comment.