From 7cd6a56b4cd2169eb245e97f0ce24b6e32ff764e Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Wed, 16 Oct 2019 15:11:16 -0700 Subject: [PATCH 1/2] [DOCS] Deprecate central management --- filebeat/docs/configuring-howto.asciidoc | 2 -- filebeat/docs/getting-started.asciidoc | 2 -- libbeat/docs/shared-central-management.asciidoc | 6 ++++++ libbeat/docs/shared-cm-tip.asciidoc | 3 --- metricbeat/docs/configuring-howto.asciidoc | 2 -- metricbeat/docs/gettingstarted.asciidoc | 2 -- 6 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 libbeat/docs/shared-cm-tip.asciidoc diff --git a/filebeat/docs/configuring-howto.asciidoc b/filebeat/docs/configuring-howto.asciidoc index f0c717713355..b521d60eb3fd 100644 --- a/filebeat/docs/configuring-howto.asciidoc +++ b/filebeat/docs/configuring-howto.asciidoc @@ -17,8 +17,6 @@ The {beatname_uc} configuration file uses http://yaml.org/[YAML] for its syntax. See the {beats-ref}/config-file-format.html[Config File Format] section of the _Beats Platform Reference_ for more about the structure of the config file. -include::../../libbeat/docs/shared-cm-tip.asciidoc[] - The following topics describe how to configure Filebeat: * <> diff --git a/filebeat/docs/getting-started.asciidoc b/filebeat/docs/getting-started.asciidoc index e009a753984e..7092f0c30372 100644 --- a/filebeat/docs/getting-started.asciidoc +++ b/filebeat/docs/getting-started.asciidoc @@ -195,8 +195,6 @@ include::{libbeat-dir}/docs/step-test-config.asciidoc[] include::{libbeat-dir}/docs/step-look-at-config.asciidoc[] -include::../../libbeat/docs/shared-cm-tip.asciidoc[] - [[filebeat-template]] === Step 3: Load the index template in Elasticsearch diff --git a/libbeat/docs/shared-central-management.asciidoc b/libbeat/docs/shared-central-management.asciidoc index 54770c0b5857..f0e3e798351f 100644 --- a/libbeat/docs/shared-central-management.asciidoc +++ b/libbeat/docs/shared-central-management.asciidoc @@ -5,6 +5,8 @@ [partintro] -- +deprecated[7.5.0,Beats central management is now deprecated. We’re working on a comprehensive solution to replace this feature.] + beta[] [WARNING] @@ -38,6 +40,8 @@ include::shared-license-statement.asciidoc[] [role="xpack"] == How central management works +deprecated[7.5.0,Beats central management is now deprecated. We’re working on a comprehensive solution to replace this feature.] + beta[] {beats} central management uses a mechanism called configuration tags to group @@ -105,6 +109,8 @@ the Beat to troubleshoot the problem. [role="xpack"] == Enroll {beats} in central management +deprecated[7.5.0,Beats central management is now deprecated. We’re working on a comprehensive solution to replace this feature.] + beta[] You need to enroll {beats} to register them in diff --git a/libbeat/docs/shared-cm-tip.asciidoc b/libbeat/docs/shared-cm-tip.asciidoc deleted file mode 100644 index 4e3a67f3b3e4..000000000000 --- a/libbeat/docs/shared-cm-tip.asciidoc +++ /dev/null @@ -1,3 +0,0 @@ -TIP: Starting with {beatname_uc} 6.5, you can define and manage {beatname_uc} -configurations in a central location in {kib}. For more information, see -<>. diff --git a/metricbeat/docs/configuring-howto.asciidoc b/metricbeat/docs/configuring-howto.asciidoc index 398c35eb173e..7a7155a63133 100644 --- a/metricbeat/docs/configuring-howto.asciidoc +++ b/metricbeat/docs/configuring-howto.asciidoc @@ -17,8 +17,6 @@ The {beatname_uc} configuration file uses http://yaml.org/[YAML] for its syntax. See the {beats-ref}/config-file-format.html[Config File Format] section of the _Beats Platform Reference_ for more about the structure of the config file. -include::../../libbeat/docs/shared-cm-tip.asciidoc[] - The following topics describe how to configure {beatname_uc}: * <> diff --git a/metricbeat/docs/gettingstarted.asciidoc b/metricbeat/docs/gettingstarted.asciidoc index a8d503e1a907..9b71616a7f84 100644 --- a/metricbeat/docs/gettingstarted.asciidoc +++ b/metricbeat/docs/gettingstarted.asciidoc @@ -224,8 +224,6 @@ include::{libbeat-dir}/docs/step-test-config.asciidoc[] include::{libbeat-dir}/docs/step-look-at-config.asciidoc[] -include::../../libbeat/docs/shared-cm-tip.asciidoc[] - [id="{beatname_lc}-template"] === Step 3: Load the index template in Elasticsearch From 118bcc0e00256e527b09eab760368cc041e94c15 Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Wed, 23 Oct 2019 22:18:43 -0700 Subject: [PATCH 2/2] Add discontinued statement --- libbeat/docs/shared-central-management.asciidoc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libbeat/docs/shared-central-management.asciidoc b/libbeat/docs/shared-central-management.asciidoc index f0e3e798351f..9a115ad61d1e 100644 --- a/libbeat/docs/shared-central-management.asciidoc +++ b/libbeat/docs/shared-central-management.asciidoc @@ -5,9 +5,7 @@ [partintro] -- -deprecated[7.5.0,Beats central management is now deprecated. We’re working on a comprehensive solution to replace this feature.] - -beta[] +include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued] [WARNING] ======================================= @@ -40,9 +38,7 @@ include::shared-license-statement.asciidoc[] [role="xpack"] == How central management works -deprecated[7.5.0,Beats central management is now deprecated. We’re working on a comprehensive solution to replace this feature.] - -beta[] +include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued] {beats} central management uses a mechanism called configuration tags to group related configurations. You define configuration tags in the {cm-ui} UI in {kib} @@ -109,9 +105,7 @@ the Beat to troubleshoot the problem. [role="xpack"] == Enroll {beats} in central management -deprecated[7.5.0,Beats central management is now deprecated. We’re working on a comprehensive solution to replace this feature.] - -beta[] +include::{asciidoc-dir}/../../shared/discontinued.asciidoc[tag=cm-discontinued] You need to enroll {beats} to register them in <> and establish