Marking Elasticsearch module and its metricsets as beta (#7662)

This PR marks the `elasticsearch` module and all its 8 existing metricsets all as `beta`. Previously only 2 metricsets were marked as `beta` with the remaining 6 marked as `experimental`.
elastic · Jul 23, 2018 · 96eae34 · 96eae34
1 parent cc42201
commit 96eae34
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 18 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -312,6 +312,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
 - Add Elasticsearch index recovery metricset. {pull}7225[7225]
 - Run Kafka integration tests on version 1.1.0 {pull}7616[7616]
 - Release raid and socket metricset from system module as GA. {pull}7658[7658]
+- Release elasticsearch module and all its metricsets as beta. {pull}7662[7662]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/elasticsearch/index.asciidoc b/metricbeat/docs/modules/elasticsearch/index.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-elasticsearch-index]]
 === Elasticsearch index metricset
 
-experimental[]
+beta[]
 
 include::../../../module/elasticsearch/index/_meta/docs.asciidoc[]
 

diff --git a/metricbeat/docs/modules/elasticsearch/index_recovery.asciidoc b/metricbeat/docs/modules/elasticsearch/index_recovery.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-elasticsearch-index_recovery]]
 === Elasticsearch index_recovery metricset
 
-experimental[]
+beta[]
 
 include::../../../module/elasticsearch/index_recovery/_meta/docs.asciidoc[]
 

diff --git a/metricbeat/docs/modules/elasticsearch/index_summary.asciidoc b/metricbeat/docs/modules/elasticsearch/index_summary.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-elasticsearch-index_summary]]
 === Elasticsearch index_summary metricset
 
-experimental[]
+beta[]
 
 include::../../../module/elasticsearch/index_summary/_meta/docs.asciidoc[]
 

diff --git a/metricbeat/docs/modules/elasticsearch/ml_job.asciidoc b/metricbeat/docs/modules/elasticsearch/ml_job.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-elasticsearch-ml_job]]
 === Elasticsearch ml_job metricset
 
-experimental[]
+beta[]
 
 include::../../../module/elasticsearch/ml_job/_meta/docs.asciidoc[]
 

diff --git a/metricbeat/docs/modules/elasticsearch/pending_tasks.asciidoc b/metricbeat/docs/modules/elasticsearch/pending_tasks.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-elasticsearch-pending_tasks]]
 === Elasticsearch pending_tasks metricset
 
-experimental[]
+beta[]
 
 include::../../../module/elasticsearch/pending_tasks/_meta/docs.asciidoc[]
 

diff --git a/metricbeat/docs/modules/elasticsearch/shard.asciidoc b/metricbeat/docs/modules/elasticsearch/shard.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-elasticsearch-shard]]
 === Elasticsearch shard metricset
 
-experimental[]
+beta[]
 
 include::../../../module/elasticsearch/shard/_meta/docs.asciidoc[]
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -33,14 +33,14 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-module-dropwizard,Dropwizard>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-dropwizard-collector,collector>> beta[]  
 |<<metricbeat-module-elasticsearch,Elasticsearch>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.8+| .8+|  |<<metricbeat-metricset-elasticsearch-index,index>> experimental[]  
-|<<metricbeat-metricset-elasticsearch-index_recovery,index_recovery>> experimental[]  
-|<<metricbeat-metricset-elasticsearch-index_summary,index_summary>> experimental[]  
-|<<metricbeat-metricset-elasticsearch-ml_job,ml_job>> experimental[]  
+.8+| .8+|  |<<metricbeat-metricset-elasticsearch-index,index>> beta[]  
+|<<metricbeat-metricset-elasticsearch-index_recovery,index_recovery>> beta[]  
+|<<metricbeat-metricset-elasticsearch-index_summary,index_summary>> beta[]  
+|<<metricbeat-metricset-elasticsearch-ml_job,ml_job>> beta[]  
 |<<metricbeat-metricset-elasticsearch-node,node>> beta[]  
 |<<metricbeat-metricset-elasticsearch-node_stats,node_stats>> beta[]  
-|<<metricbeat-metricset-elasticsearch-pending_tasks,pending_tasks>> experimental[]  
-|<<metricbeat-metricset-elasticsearch-shard,shard>> experimental[]  
+|<<metricbeat-metricset-elasticsearch-pending_tasks,pending_tasks>> beta[]  
+|<<metricbeat-metricset-elasticsearch-shard,shard>> beta[]  
 |<<metricbeat-module-etcd,Etcd>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .3+| .3+|  |<<metricbeat-metricset-etcd-leader,leader>> beta[]  
 |<<metricbeat-metricset-etcd-self,self>> beta[]  

diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go
diff --git a/metricbeat/module/elasticsearch/index/_meta/fields.yml b/metricbeat/module/elasticsearch/index/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     index
+  release: beta
   fields:
     - name: name
       type: keyword

diff --git a/metricbeat/module/elasticsearch/index/index.go b/metricbeat/module/elasticsearch/index/index.go
@@ -43,7 +43,7 @@ type MetricSet struct {
 
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The elasticsearch index metricset is experimental")
+	cfgwarn.Beta("The elasticsearch index metricset is beta")
 
 	// TODO: This currently gets index data for all indices. Make it configurable.
 	ms, err := elasticsearch.NewMetricSet(base, statsPath)

diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     index
+  release: beta
   fields:
     - name: id
       type: long

diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go
@@ -45,7 +45,7 @@ type MetricSet struct {
 
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The elasticsearch index_recovery metricset is experimental")
+	cfgwarn.Beta("The elasticsearch index_recovery metricset is beta")
 
 	config := struct {
 		ActiveOnly bool `config:"index_recovery.active_only"`

diff --git a/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml b/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     index
+  release: beta
   fields:
     - name: primaries
       type: group

diff --git a/metricbeat/module/elasticsearch/index_summary/index_summary.go b/metricbeat/module/elasticsearch/index_summary/index_summary.go
@@ -52,7 +52,7 @@ type MetricSet struct {
 
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The elasticsearch index_summary metricset is experimental")
+	cfgwarn.Beta("The elasticsearch index_summary metricset is beta")
 
 	// Get the stats from the local node
 	ms, err := elasticsearch.NewMetricSet(base, statsPath)

diff --git a/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml b/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     ml
+  release: beta
   fields:
     - name: id
       type: keyword

diff --git a/metricbeat/module/elasticsearch/ml_job/ml_job.go b/metricbeat/module/elasticsearch/ml_job/ml_job.go
@@ -43,7 +43,7 @@ type MetricSet struct {
 // New creates a new instance of the MetricSet. New is responsible for unpacking
 // any MetricSet specific configuration options if there are any.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The elasticsearch ml_job metricset is experimental.")
+	cfgwarn.Beta("The elasticsearch ml_job metricset is beta.")
 
 	// Get the stats from the local node
 	ms, err := elasticsearch.NewMetricSet(base, jobPath)

diff --git a/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml b/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     `cluster.pending_task` contains a pending task description.
+  release: beta
   fields:
     - name: insert_order
       type: long

diff --git a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go
@@ -53,7 +53,7 @@ type MetricSet struct {
 // New creates a new instance of the MetricSet. New is responsible for unpacking
 // any MetricSet specific configuration options if there are any.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The elasticsearch pending_tasks metricset is experimental.")
+	cfgwarn.Beta("The elasticsearch pending_tasks metricset is beta.")
 
 	http, err := helper.NewHTTP(base)
 	if err != nil {

diff --git a/metricbeat/module/elasticsearch/shard/_meta/fields.yml b/metricbeat/module/elasticsearch/shard/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     shard fields
+  release: beta
   fields:
     - name: primary
       type: boolean