From c44df871bae7205a4ce580bb9fea093a50b938d6 Mon Sep 17 00:00:00 2001 From: Jason Rhodes Date: Wed, 22 Aug 2018 15:19:58 -0400 Subject: [PATCH 1/4] Updates * characters to an escaped * (#22269) GitHub's asciidoc parser handles `*` characters fine but markdown thinks its italicizing unless you escape the first asterisk. Subsequent asterisks on the same line can stay unescaped and should work fine. --- docs/settings/apm-settings.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc index fc2fc0a4ed7ad..cb454874276ab 100644 --- a/docs/settings/apm-settings.asciidoc +++ b/docs/settings/apm-settings.asciidoc @@ -19,7 +19,7 @@ xpack.apm.ui.enabled:: Set to `false` to hide the APM plugin {kib} from the menu xpack.apm.ui.transactionGroupBucketSize:: Number of top transaction groups displayed in APM plugin in Kibana. Defaults to `100`. -apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`. +apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`. apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-*`. From 3c0456a1b771c56e1c6af6961ccab9144966c5c6 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 18 Dec 2018 15:05:29 -0800 Subject: [PATCH 2/4] docs: add sentence on where to change apm settings (#27069) --- docs/settings/apm-settings.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc index cb454874276ab..0045162ed41b6 100644 --- a/docs/settings/apm-settings.asciidoc +++ b/docs/settings/apm-settings.asciidoc @@ -6,6 +6,8 @@ ++++ You do not need to configure any settings to use APM. 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. [float] [[general-apm-settings-kb]] From b651cb29eb2364c73c78c1f7b2ab7e8e62751b16 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Mon, 11 Feb 2019 08:17:25 -0800 Subject: [PATCH 3/4] [DOCS] Removes X-Pack settings section (#30554) Just the apm settings changes --- docs/settings/apm-settings.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc index 0045162ed41b6..615dc98c066ba 100644 --- a/docs/settings/apm-settings.asciidoc +++ b/docs/settings/apm-settings.asciidoc @@ -1,8 +1,8 @@ [role="xpack"] [[apm-settings-kb]] -=== APM Settings in Kibana +=== APM settings in Kibana ++++ -APM Settings +APM settings ++++ You do not need to configure any settings to use APM. It is enabled by default. @@ -11,7 +11,7 @@ copy and paste the relevant settings below into your `kibana.yml` configuration [float] [[general-apm-settings-kb]] -==== General APM Settings +==== General APM settings xpack.apm.enabled:: Set to `false` to disabled the APM plugin {kib}. Defaults to `true`. From 4e3cc3e4ea2bedeb103522c11be080cbe3d10884 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 11 Mar 2019 12:41:02 -0700 Subject: [PATCH 4/4] fix spelling --- docs/settings/apm-settings.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc index 615dc98c066ba..b1ee502afc173 100644 --- a/docs/settings/apm-settings.asciidoc +++ b/docs/settings/apm-settings.asciidoc @@ -21,7 +21,7 @@ xpack.apm.ui.enabled:: Set to `false` to hide the APM plugin {kib} from the menu xpack.apm.ui.transactionGroupBucketSize:: Number of top transaction groups displayed in APM plugin in Kibana. Defaults to `100`. -apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`. +apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and the query bar. It must match all apm indices. Defaults to `apm-*`. apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-*`.