Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] [DOCS] Fix table formatting in ingest manager settings (#68824) #68832

Merged
merged 1 commit into from
Jun 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions docs/settings/ingest-manager-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
<titleabbrev>{ingest-manager} settings</titleabbrev>
++++

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.

[[general-ingest-manager-settings-kb]]
==== General {ingest-manager} settings
Expand All @@ -15,16 +18,8 @@ By default, {ingest-manager} is not enabled. You need to enable it. To use {flee
|===
| `xpack.ingestManager.enabled` {ess-icon}
| Set to `true` to enable {ingest-manager}.
|===

[cols="2*<"]
|===
| `xpack.ingestManager.epm.enabled` {ess-icon}
| Set to `true` (default) to enable {package-manager}.
|===

[cols="2*<"]
|===
| `xpack.ingestManager.fleet.enabled` {ess-icon}
| Set to `true` (default) to enable {fleet}.
|===
Expand All @@ -45,16 +40,8 @@ By default, {ingest-manager} is not enabled. You need to enable it. To use {flee
|===
| `xpack.ingestManager.fleet.kibana.host`
| The hostname used by {agent} for accessing {kib}.
|===

[cols="2*<"]
|===
| `xpack.ingestManager.fleet.elasticsearch.host`
| The hostname used by {agent} for accessing {es}.
|===

[cols="2*<"]
|===
| `xpack.ingestManager.fleet.tlsCheckDisabled`
| Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled.
|===
Expand Down
4 changes: 2 additions & 2 deletions docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -633,14 +633,14 @@ include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
include::{kib-repo-dir}/settings/dev-settings.asciidoc[]
include::{kib-repo-dir}/settings/graph-settings.asciidoc[]
include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]
include::{kib-repo-dir}/settings/ingest-manager-settings.asciidoc[]
include::{kib-repo-dir}/settings/i18n-settings.asciidoc[]
include::{kib-repo-dir}/settings/logs-ui-settings.asciidoc[]
include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]
include::{kib-repo-dir}/settings/ml-settings.asciidoc[]
include::{kib-repo-dir}/settings/monitoring-settings.asciidoc[]
include::{kib-repo-dir}/settings/reporting-settings.asciidoc[]
include::secure-settings.asciidoc[]
include::{kib-repo-dir}/settings/security-settings.asciidoc[]
include::{kib-repo-dir}/settings/spaces-settings.asciidoc[]
include::{kib-repo-dir}/settings/telemetry-settings.asciidoc[]
include::{docdir}/settings/ingest-manager-settings.asciidoc[]