elastic · ruflin · Jan 18, 2018 · Jan 18, 2018 · Jan 18, 2018 · Jan 18, 2018
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -136,6 +136,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Improve Elasticsearch output metrics to count number of dropped and duplicate (if event ID is given) events. {pull}5811[5811]
 - Add autodiscover for kubernetes. {pull}6055[6055]
 - Add the abilility for the add_docker_metadata process to enrich based on process ID. {pull}6100[6100]
+- The `add_docker_metadata` and `add_kubernetes_metadata` processors are now GA, instead of Beta. {pull}6105[6105]
 
 *Auditbeat*
 
@@ -180,6 +181,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Add experimental mongodb/collstats metricset. {pull}5852[5852]
 - Update the MySQL dashboard to use the Time Series Visual Builder. {pull}5996[5996]
 - Add experimental uwsgi module. {pull}6006[6006]
+- Docker and Kubernetes modules are now GA, instead of Beta. {pull}6105[6105]
 
 *Packetbeat*
 

diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc
@@ -2302,7 +2302,6 @@ The object's SELinux level.
 [[exported-fields-docker-processor]]
 == Docker fields
 
-beta[]
 Docker stats collected from Docker.
 
 
@@ -2461,7 +2460,6 @@ SHA512/256 hash of the file.
 [[exported-fields-kubernetes-processor]]
 == Kubernetes fields
 
-beta[]
 Kubernetes metadata added by the kubernetes processor
 
 

diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
@@ -609,7 +609,6 @@ Region in which this host is running.
 [[exported-fields-docker-processor]]
 == Docker fields
 
-beta[]
 Docker stats collected from Docker.
 
 
@@ -845,7 +844,6 @@ The full trace in the log line.
 [[exported-fields-kubernetes-processor]]
 == Kubernetes fields
 
-beta[]
 Kubernetes metadata added by the kubernetes processor
 
 

@@ -259,7 +259,6 @@ Indicator if monitor could validate the service to be available.
 [[exported-fields-docker-processor]]
 == Docker fields
 
-beta[]
 Docker stats collected from Docker.
 
 
@@ -461,7 +460,6 @@ Duration in microseconds
 [[exported-fields-kubernetes-processor]]
 == Kubernetes fields
 
-beta[]
 Kubernetes metadata added by the kubernetes processor
 
 

@@ -1,8 +1,6 @@
 - key: docker
   title: Docker
   description: >
-    beta[]
-
     Docker stats collected from Docker.
   short_config: false
   anchor: docker-processor

@@ -12,7 +12,6 @@ import (
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/docker"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/processors"
@@ -46,7 +45,6 @@ type addDockerMetadata struct {
 }
 
 func newDockerMetadataProcessor(cfg *common.Config) (processors.Processor, error) {
-	cfgwarn.Beta("The %v processor is beta", processorName)
 	return buildDockerMetadataProcessor(cfg, docker.NewWatcher)
 }
 

@@ -1,8 +1,6 @@
 - key: kubernetes
   title: Kubernetes
   description: >
-    beta[]
-
     Kubernetes metadata added by the kubernetes processor
   short_config: false
   anchor: kubernetes-processor

@@ -9,7 +9,6 @@ import (
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/common/bus"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/common/kubernetes"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/processors"
@@ -46,8 +45,6 @@ func init() {
 }
 
 func newKubernetesAnnotator(cfg *common.Config) (processors.Processor, error) {
-	cfgwarn.Beta("The kubernetes processor is beta")
-
 	config := defaultKubernetesAnnotatorConfig()
 
 	err := cfg.Unpack(&config)

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -2013,7 +2013,6 @@ Number of items/documents that are replicas.
 [[exported-fields-docker-processor]]
 == Docker fields
 
-beta[]
 Docker stats collected from Docker.
 
 
@@ -4996,7 +4995,6 @@ Total number of connections.
 [[exported-fields-kubernetes-processor]]
 == Kubernetes fields
 
-beta[]
 Kubernetes metadata added by the kubernetes processor
 
 

diff --git a/metricbeat/docs/modules/docker.asciidoc b/metricbeat/docs/modules/docker.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-docker]]
 == Docker module
 
-beta[]
-
 This module fetches metrics from https://www.docker.com/[Docker] containers.
 
 The Docker module is currently not tested on Windows.

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

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

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

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

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

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

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

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

diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-kubernetes]]
 == Kubernetes module
 
-beta[]
-
 This module fetches metrics from Kubernetes https://kubernetes.io/docs/admin/kubelet/[kubelet]
 agent and https://github.com/kubernetes/kube-state-metrics[kube-state-metrics] service.
 

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

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

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

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

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

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

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

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

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -21,15 +21,15 @@ This file is generated! See scripts/docs_collector.py
 .3+|   |<<metricbeat-metricset-couchbase-bucket,bucket>> beta[]  
 |<<metricbeat-metricset-couchbase-cluster,cluster>> beta[]  
 |<<metricbeat-metricset-couchbase-node,node>> beta[]  
-|<<metricbeat-module-docker,Docker>>  beta[]   |    
-.8+|   |<<metricbeat-metricset-docker-container,container>> beta[]  
-|<<metricbeat-metricset-docker-cpu,cpu>> beta[]  
-|<<metricbeat-metricset-docker-diskio,diskio>> beta[]  
-|<<metricbeat-metricset-docker-healthcheck,healthcheck>> beta[]  
-|<<metricbeat-metricset-docker-image,image>> beta[]  
-|<<metricbeat-metricset-docker-info,info>> beta[]  
-|<<metricbeat-metricset-docker-memory,memory>> beta[]  
-|<<metricbeat-metricset-docker-network,network>> beta[]  
+|<<metricbeat-module-docker,Docker>>     |    
+.8+|   |<<metricbeat-metricset-docker-container,container>>   
+|<<metricbeat-metricset-docker-cpu,cpu>>   
+|<<metricbeat-metricset-docker-diskio,diskio>>   
+|<<metricbeat-metricset-docker-healthcheck,healthcheck>>   
+|<<metricbeat-metricset-docker-image,image>>   
+|<<metricbeat-metricset-docker-info,info>>   
+|<<metricbeat-metricset-docker-memory,memory>>   
+|<<metricbeat-metricset-docker-network,network>>   
 |<<metricbeat-module-dropwizard,Dropwizard>>  beta[]   |    
 .1+|   |<<metricbeat-metricset-dropwizard-collector,collector>> beta[]  
 |<<metricbeat-module-elasticsearch,Elasticsearch>>  beta[]   |    
@@ -57,18 +57,18 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-kafka-partition,partition>> beta[]  
 |<<metricbeat-module-kibana,Kibana>>  beta[]   |    
 .1+|   |<<metricbeat-metricset-kibana-status,status>> beta[]  
-|<<metricbeat-module-kubernetes,Kubernetes>>  beta[]   |    
-.11+|   |<<metricbeat-metricset-kubernetes-container,container>> beta[]  
+|<<metricbeat-module-kubernetes,Kubernetes>>     |    
+.11+|   |<<metricbeat-metricset-kubernetes-container,container>>   
 |<<metricbeat-metricset-kubernetes-event,event>> experimental[]  
-|<<metricbeat-metricset-kubernetes-node,node>> beta[]  
-|<<metricbeat-metricset-kubernetes-pod,pod>> beta[]  
-|<<metricbeat-metricset-kubernetes-state_container,state_container>> beta[]  
-|<<metricbeat-metricset-kubernetes-state_deployment,state_deployment>> beta[]  
-|<<metricbeat-metricset-kubernetes-state_node,state_node>> beta[]  
-|<<metricbeat-metricset-kubernetes-state_pod,state_pod>> beta[]  
-|<<metricbeat-metricset-kubernetes-state_replicaset,state_replicaset>> beta[]  
-|<<metricbeat-metricset-kubernetes-system,system>> beta[]  
-|<<metricbeat-metricset-kubernetes-volume,volume>> beta[]  
+|<<metricbeat-metricset-kubernetes-node,node>>   
+|<<metricbeat-metricset-kubernetes-pod,pod>>   
+|<<metricbeat-metricset-kubernetes-state_container,state_container>>   
+|<<metricbeat-metricset-kubernetes-state_deployment,state_deployment>>   
+|<<metricbeat-metricset-kubernetes-state_node,state_node>>   
+|<<metricbeat-metricset-kubernetes-state_pod,state_pod>>   
+|<<metricbeat-metricset-kubernetes-state_replicaset,state_replicaset>>   
+|<<metricbeat-metricset-kubernetes-system,system>>   
+|<<metricbeat-metricset-kubernetes-volume,volume>>   
 |<<metricbeat-module-logstash,Logstash>>  experimental[]   |    
 .2+|   |<<metricbeat-metricset-logstash-node,node>> experimental[]  
 |<<metricbeat-metricset-logstash-node_stats,node_stats>> experimental[]  

diff --git a/metricbeat/module/docker/_meta/fields.yml b/metricbeat/module/docker/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "Docker"
   description: >
     Docker stats collected from Docker.
-  release: beta
+  release: ga
   short_config: false
   fields:
     - name: docker

diff --git a/metricbeat/module/docker/container/_meta/fields.yml b/metricbeat/module/docker/container/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Docker container metrics.
-  release: beta
+  release: ga
   fields:
     - name: command
       type: keyword