From c44100f7907a1b22ed983db59a9dc916b475811b Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 19 Feb 2020 11:13:28 -0800 Subject: [PATCH] [Metricbeat] Fixing up compatibility statements for stack modules (#16400) (#16425) * [Metricbeat] Fixing up compatibility statements for stack modules * Simplifying language * Updating docs * Moving Beats docs to correct location * Updating Beat module docs --- metricbeat/docs/modules/beat.asciidoc | 6 ++++-- metricbeat/docs/modules/elasticsearch.asciidoc | 3 +-- metricbeat/docs/modules/kibana.asciidoc | 2 +- metricbeat/docs/modules/logstash.asciidoc | 2 +- metricbeat/module/beat/_meta/docs.asciidoc | 6 ++++-- metricbeat/module/beat/docs.asciidoc | 10 ---------- metricbeat/module/elasticsearch/_meta/docs.asciidoc | 3 +-- metricbeat/module/kibana/_meta/docs.asciidoc | 2 +- metricbeat/module/logstash/_meta/docs.asciidoc | 2 +- 9 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 metricbeat/module/beat/docs.asciidoc diff --git a/metricbeat/docs/modules/beat.asciidoc b/metricbeat/docs/modules/beat.asciidoc index bfa9667b109..53c25d91b84 100644 --- a/metricbeat/docs/modules/beat.asciidoc +++ b/metricbeat/docs/modules/beat.asciidoc @@ -5,14 +5,16 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-module-beat]] == Beat module -This is the Beat module. +The Beat module contains a minimal set of metrics to enable monitoring of any Beat or other software based on libbeat across +multiple versions. To monitor more Beat metrics, use our {stack} +{monitor-features}. The default metricsets are `state` and `stats`. [float] === Compatibility -The beat module is tested with metricbeat 7.3.0. +The Beat module works with Beats 7.3.0 and later. [float] diff --git a/metricbeat/docs/modules/elasticsearch.asciidoc b/metricbeat/docs/modules/elasticsearch.asciidoc index 484519f7426..e7759ae8138 100644 --- a/metricbeat/docs/modules/elasticsearch.asciidoc +++ b/metricbeat/docs/modules/elasticsearch.asciidoc @@ -18,8 +18,7 @@ module are `ccr`, `cluster_stats`, `index`, `index_recovery`, `index_summary`, [float] === Compatibility -The Elasticsearch module is tested with Elasticsearch 6.3 and is expected to -work with all 6.x versions. +The Elasticsearch module works with Elasticsearch 6.7.0 and later. [float] diff --git a/metricbeat/docs/modules/kibana.asciidoc b/metricbeat/docs/modules/kibana.asciidoc index a878e843071..f03e1838db5 100644 --- a/metricbeat/docs/modules/kibana.asciidoc +++ b/metricbeat/docs/modules/kibana.asciidoc @@ -15,7 +15,7 @@ this module is `status`. [float] === Compatibility -The Kibana module is tested with Kibana 6.3. +The Kibana module works with Kibana 6.7.0 and later. [float] diff --git a/metricbeat/docs/modules/logstash.asciidoc b/metricbeat/docs/modules/logstash.asciidoc index c29633ce907..8ffc5514ec9 100644 --- a/metricbeat/docs/modules/logstash.asciidoc +++ b/metricbeat/docs/modules/logstash.asciidoc @@ -12,7 +12,7 @@ The default metricsets are `node` and `node_stats`. [float] === Compatibility -The logstash module is tested with logstash 6.3. +The Logstash module works with Logstash 7.3.0 and later. [float] diff --git a/metricbeat/module/beat/_meta/docs.asciidoc b/metricbeat/module/beat/_meta/docs.asciidoc index 0885b1e5143..2f9227502b9 100644 --- a/metricbeat/module/beat/_meta/docs.asciidoc +++ b/metricbeat/module/beat/_meta/docs.asciidoc @@ -1,8 +1,10 @@ -This is the Beat module. +The Beat module contains a minimal set of metrics to enable monitoring of any Beat or other software based on libbeat across +multiple versions. To monitor more Beat metrics, use our {stack} +{monitor-features}. The default metricsets are `state` and `stats`. [float] === Compatibility -The beat module is tested with metricbeat 7.3.0. +The Beat module works with Beats 7.3.0 and later. diff --git a/metricbeat/module/beat/docs.asciidoc b/metricbeat/module/beat/docs.asciidoc deleted file mode 100644 index 8e0967abf40..00000000000 --- a/metricbeat/module/beat/docs.asciidoc +++ /dev/null @@ -1,10 +0,0 @@ -The Beat module contains a minimal set of metrics to enable monitoring of any Beat or other software based on libbeat across -multiple versions. To monitor more Beat metrics, use our {stack} -{monitor-features}. - -The default metricset is `stats`. - -[float] -=== Compatibility - -The Beat module is tested with Metricbeat 7.2 and is expected to work with all 7.x versions. diff --git a/metricbeat/module/elasticsearch/_meta/docs.asciidoc b/metricbeat/module/elasticsearch/_meta/docs.asciidoc index 50d78e6d612..1bb27e0d30f 100644 --- a/metricbeat/module/elasticsearch/_meta/docs.asciidoc +++ b/metricbeat/module/elasticsearch/_meta/docs.asciidoc @@ -11,5 +11,4 @@ module are `ccr`, `cluster_stats`, `index`, `index_recovery`, `index_summary`, [float] === Compatibility -The Elasticsearch module is tested with Elasticsearch 6.3 and is expected to -work with all 6.x versions. +The Elasticsearch module works with Elasticsearch 6.7.0 and later. diff --git a/metricbeat/module/kibana/_meta/docs.asciidoc b/metricbeat/module/kibana/_meta/docs.asciidoc index 527480b4328..bcc0c408572 100644 --- a/metricbeat/module/kibana/_meta/docs.asciidoc +++ b/metricbeat/module/kibana/_meta/docs.asciidoc @@ -8,4 +8,4 @@ this module is `status`. [float] === Compatibility -The Kibana module is tested with Kibana 6.3. +The Kibana module works with Kibana 6.7.0 and later. diff --git a/metricbeat/module/logstash/_meta/docs.asciidoc b/metricbeat/module/logstash/_meta/docs.asciidoc index 9030d974a80..c56c1b38119 100644 --- a/metricbeat/module/logstash/_meta/docs.asciidoc +++ b/metricbeat/module/logstash/_meta/docs.asciidoc @@ -5,4 +5,4 @@ The default metricsets are `node` and `node_stats`. [float] === Compatibility -The logstash module is tested with logstash 6.3. +The Logstash module works with Logstash 7.3.0 and later.