Release metricbeat Kafka module as GA (elastic#8854)

(cherry picked from commit 2480758)
jsoriano · Nov 1, 2018 · 78efa18 · 78efa18
1 parent d54b204
commit 78efa18
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 19 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -162,6 +162,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
 - Precalculate composed id fields for kafka dashboards. {pull}8504[8504]
 - Add support for `full` status page output for php-fpm module as a separate metricset called `process`. {pull}8394[8394]
 - Add Kafka dashboard. {pull}8457[8457]
+- Release Kafka module as GA. {pull}8854[8854]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/kafka.asciidoc b/metricbeat/docs/modules/kafka.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-kafka]]
 == Kafka module
 
-beta[]
-
 This is the Kafka module.
 
 The default metricsets are `consumergroup` and `partition`.

diff --git a/metricbeat/docs/modules/kafka/consumergroup.asciidoc b/metricbeat/docs/modules/kafka/consumergroup.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-kafka-consumergroup]]
 === Kafka consumergroup metricset
 
-beta[]
-
 include::../../../module/kafka/consumergroup/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/kafka/partition.asciidoc b/metricbeat/docs/modules/kafka/partition.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-kafka-partition]]
 === Kafka partition metricset
 
-beta[]
-
 include::../../../module/kafka/partition/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -62,9 +62,9 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-http-server,server>> beta[]  
 |<<metricbeat-module-jolokia,Jolokia>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-jolokia-jmx,jmx>>   
-|<<metricbeat-module-kafka,Kafka>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.2+| .2+|  |<<metricbeat-metricset-kafka-consumergroup,consumergroup>> beta[]  
-|<<metricbeat-metricset-kafka-partition,partition>> beta[]  
+|<<metricbeat-module-kafka,Kafka>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
+.2+| .2+|  |<<metricbeat-metricset-kafka-consumergroup,consumergroup>>   
+|<<metricbeat-metricset-kafka-partition,partition>>   
 |<<metricbeat-module-kibana,Kibana>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-kibana-stats,stats>> beta[]  
 |<<metricbeat-metricset-kibana-status,status>> beta[]  

diff --git a/metricbeat/module/kafka/_meta/fields.yml b/metricbeat/module/kafka/_meta/fields.yml
@@ -3,7 +3,7 @@
   description: >
     Kafka module
   short_config: false
-  release: beta
+  release: ga
   fields:
     - name: kafka
       type: group

diff --git a/metricbeat/module/kafka/consumergroup/_meta/fields.yml b/metricbeat/module/kafka/consumergroup/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     consumergroup
-  release: beta
+  release: ga
   fields:
     - name: broker
       type: group

diff --git a/metricbeat/module/kafka/consumergroup/consumergroup.go b/metricbeat/module/kafka/consumergroup/consumergroup.go
@@ -24,7 +24,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/mb"
@@ -57,8 +56,6 @@ var debugf = logp.MakeDebug("kafka")
 
 // New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The kafka consumergroup metricset is beta")
-
 	config := defaultConfig
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err

diff --git a/metricbeat/module/kafka/fields.go b/metricbeat/module/kafka/fields.go
diff --git a/metricbeat/module/kafka/partition/_meta/fields.yml b/metricbeat/module/kafka/partition/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     partition
-  release: beta
+  release: ga
   fields:
     - name: offset
       type: group

diff --git a/metricbeat/module/kafka/partition/partition.go b/metricbeat/module/kafka/partition/partition.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/mb"
@@ -57,8 +56,6 @@ var debugf = logp.MakeDebug("kafka")
 
 // New creates a new instance of the partition MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The kafka partition metricset is beta")
-
 	config := defaultConfig
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err