Skip to content

Commit

Permalink
docs: a few more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorelli25 committed Jan 2, 2020
1 parent 77c875f commit ca3846e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 9 deletions.
12 changes: 11 additions & 1 deletion docs/apm/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
[[apm-settings-in-kibana]]
=== APM settings in Kibana

include::./../settings/apm-settings.asciidoc[tag=general-apm-settings-overview]
You do not need to configure any settings to use the APM app. It is enabled by default.

[float]
[[apm-indices-settings]]
==== APM Indices

include::./../settings/apm-settings.asciidoc[tag=apm-indices-settings]

[float]
[[general-apm-settings]]
==== General APM settings

include::./../settings/apm-settings.asciidoc[tag=general-apm-settings]
21 changes: 13 additions & 8 deletions docs/settings/apm-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@
<titleabbrev>APM settings</titleabbrev>
++++

You do not need to configure any settings to use the APM app. It is enabled by default.

[float]
[[apm-indices-settings-kb]]
==== APM Indices

// This content is reused in the APM app documentation.
// Any changes made in this file will be seen there as well.
// tag::general-apm-settings-overview[]
// tag::apm-indices-settings[]

You do not need to configure any settings to use the APM app. It is enabled by default.
If you'd like to change any of the default values,
copy and paste the relevant settings below into your `kibana.yml` configuration file.
Index defaults can can also be changed on the settings page in the APM app:
Index defaults can be changed in Kibana. Navigate to *APM* > *Settings* > *Indices*.
Index settings in the APM app take precedence over those set in `kibana.yml`.

[role="screenshot"]
image::settings/images/apm-settings.png[APM app settings in Kibana]

Index settings in the APM app take precedence over those set in `kibana.yml`.

// end::general-apm-settings-overview[]
// end::apm-indices-settings[]

[float]
[[general-apm-settings-kb]]
Expand All @@ -29,6 +31,9 @@ Index settings in the APM app take precedence over those set in `kibana.yml`.
// Any changes made in this file will be seen there as well.
// tag::general-apm-settings[]

If you'd like to change any of the default values,
copy and paste the relevant settings below into your `kibana.yml` configuration file.

xpack.apm.enabled:: Set to `false` to disabled the APM plugin {kib}. Defaults to
`true`.

Expand Down

0 comments on commit ca3846e

Please sign in to comment.