Cherry-pick #26226 to 7.x: Set SM Filebeat modules as GA (#26557)

sayden · web-flow · commit 9361be46ebf2 · 2021-06-30T21:07:04.000+02:00
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -77,6 +77,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - All url.* fields apart from url.original in the Apache, Nginx, IIS, Traefik, S3Access, Cisco, F5, Fortinet, Google Workspace, Imperva, Microsoft, Netscout, O365, Sophos, Squid, Suricata, Zeek, Zia, Zoom, and ZScaler modules are now url unescaped due to using the Elasticsearch uri_parts processor. {pull}24699[24699]
 - Deprecated the cyberark module (replaced by cyberarkpas). {issue}25261[25261] {pull}25505[25505]
 - Change source field for `event.action` in `fortinet.firewall` module to `fortinet.firewall.action` instead of `fortinet.firewall.eventtype`. {pull}24816[24816]
+- Release Filebeat Stack Monitoring modules as GA {pull}26226[26226]
 
 *Heartbeat*
 - Add support for screenshot blocks and use newer synthetics flags that only works in newer synthetics betas. {pull}25808[25808]
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
