Release kubernetes apiserver and event metricsets as GA (elastic#10212)

Rest of the module was GA already (cherry picked from commit f95ec5d)
exekias · Jan 25, 2019 · 3403ec0 · 3403ec0
1 parent 881284c
commit 3403ec0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 12 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -185,6 +185,9 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Release php_fpm module as GA. {pull}10198[10198]
 - Release Memcached module as GA. {pull}10199[10199]
 - Release etcd module as GA. {pull}10200[10200]
+- Release Ceph module as GA. {pull}10202[10202]
+- Release aerospike module as GA. {pull}10203[10203]
+- Release kubernetes apiserver and event metricsets as GA {pull}10212[10212]
 - Release Couchbase module as GA. {pull}10201[10201]
 - Release aerospike module as GA. {pull}10203[10203]
 - Release envoyproxy module GA. {pull}10223[10223]

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -70,9 +70,9 @@ This file is generated! See scripts/docs_collector.py
 .2+| .2+|  |<<metricbeat-metricset-kibana-stats,stats>>   
 |<<metricbeat-metricset-kibana-status,status>>   
 |<<metricbeat-module-kubernetes,Kubernetes>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.13+| .13+|  |<<metricbeat-metricset-kubernetes-apiserver,apiserver>> beta[]  
+.13+| .13+|  |<<metricbeat-metricset-kubernetes-apiserver,apiserver>>   
 |<<metricbeat-metricset-kubernetes-container,container>>   
-|<<metricbeat-metricset-kubernetes-event,event>> beta[]  
+|<<metricbeat-metricset-kubernetes-event,event>>   
 |<<metricbeat-metricset-kubernetes-node,node>>   
 |<<metricbeat-metricset-kubernetes-pod,pod>>   
 |<<metricbeat-metricset-kubernetes-state_container,state_container>>   

diff --git a/metricbeat/module/kubernetes/apiserver/_meta/fields.yml b/metricbeat/module/kubernetes/apiserver/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Kubernetes API server metrics
-  release: beta
+  release: ga
   fields:
     - name: request.client
       type: keyword

diff --git a/metricbeat/module/kubernetes/event/_meta/fields.yml b/metricbeat/module/kubernetes/event/_meta/fields.yml
@@ -3,7 +3,7 @@
   description: >
     The Kubernetes events metricset collects events that are generated by objects running
     inside of Kubernetes
-  release: beta
+  release: ga
   fields:
   - name: count
     type: long

diff --git a/metricbeat/module/kubernetes/event/event.go b/metricbeat/module/kubernetes/event/event.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/kubernetes"
 	"github.com/elastic/beats/libbeat/common/safemapstr"
 	"github.com/elastic/beats/metricbeat/mb"
@@ -57,8 +56,6 @@ type dedotConfig struct {
 // Part of new is also setting up the configuration by processing additional
 // configuration entries if needed.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The kubernetes event metricset is beta")
-
 	config := defaultKubernetesEventsConfig()
 
 	err := base.Module().UnpackConfig(&config)

diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go