Cherry-pick #26557 to 7.14: Cherry-pick #26226 to 7.x: Set SM Filebea…

…t modules as GA (#26661)
elastic · Jul 1, 2021 · ed5a815 · ed5a815
1 parent 9d97511
commit ed5a815
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 11 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -609,6 +609,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add `uri_parts` and `user_agent` ingest processors to `aws.elb` module. {issue}26435[26435] {pull}26441[26441]
 - Added dataset `recordedfuture` to the `threatintel` module to ingest indicators from Recorded Future Connect API {pull}26481[26481]
 - Update `fortinet` ingest pipelines. {issue}22136[22136] {issue}25254[25254] {pull}24816[24816]
+- Release Filebeat Stack Monitoring modules as GA {pull}26226[26226]
 - Use default add_locale for fortinet.firewall {issue}20300[20300] {pull}26524[26524]
 
 *Heartbeat*

diff --git a/filebeat/docs/modules/elasticsearch.asciidoc b/filebeat/docs/modules/elasticsearch.asciidoc
@@ -8,8 +8,6 @@ This file is generated! See scripts/docs_collector.py
 
 == Elasticsearch module
 
-beta[]
-
 This is the elasticsearch module.
 
 include::../include/what-happens.asciidoc[]

diff --git a/filebeat/docs/modules/kibana.asciidoc b/filebeat/docs/modules/kibana.asciidoc
@@ -8,8 +8,6 @@ This file is generated! See scripts/docs_collector.py
 
 == Kibana module
 
-beta[]
-
 This is the Kibana module.
 
 include::../include/what-happens.asciidoc[]

diff --git a/filebeat/module/elasticsearch/_meta/docs.asciidoc b/filebeat/module/elasticsearch/_meta/docs.asciidoc
@@ -3,8 +3,6 @@
 
 == Elasticsearch module
 
-beta[]
-
 This is the elasticsearch module.
 
 include::../include/what-happens.asciidoc[]

diff --git a/filebeat/module/elasticsearch/_meta/fields.yml b/filebeat/module/elasticsearch/_meta/fields.yml
@@ -1,5 +1,6 @@
 - key: elasticsearch
   title: "Elasticsearch"
+  release: ga
   description: >
     elasticsearch Module
   fields:

diff --git a/filebeat/module/elasticsearch/fields.go b/filebeat/module/elasticsearch/fields.go
diff --git a/filebeat/module/kibana/_meta/docs.asciidoc b/filebeat/module/kibana/_meta/docs.asciidoc
@@ -3,8 +3,6 @@
 
 == Kibana module
 
-beta[]
-
 This is the Kibana module.
 
 include::../include/what-happens.asciidoc[]

diff --git a/filebeat/module/kibana/_meta/fields.yml b/filebeat/module/kibana/_meta/fields.yml
@@ -1,5 +1,6 @@
 - key: kibana
   title: "kibana"
+  release: ga
   description: >
     kibana Module
   fields:

diff --git a/filebeat/module/kibana/fields.go b/filebeat/module/kibana/fields.go
diff --git a/filebeat/module/logstash/_meta/fields.yml b/filebeat/module/logstash/_meta/fields.yml
@@ -1,5 +1,6 @@
 - key: logstash
   title: "logstash"
+  release: ga
   description: >
     logstash Module
   fields:

diff --git a/filebeat/module/logstash/fields.go b/filebeat/module/logstash/fields.go