Release munin and traefik module as beta. (#7660)

* Release munin and treafik module as beta. * fixes to munin module
elastic · Jul 23, 2018 · 9db7866 · 9db7866
1 parent ff45ef8
commit 9db7866
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 15 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -314,6 +314,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
 - 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]
+- Release munin and traefik module as beta. {pull}7660[7660]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -11066,7 +11066,6 @@ The amount of time spent for commits that occurred while a write lock was held.
 [[exported-fields-munin]]
 == Munin fields
 
-experimental[]
 Munin node metrics exporter
 
 

diff --git a/metricbeat/docs/modules/munin.asciidoc b/metricbeat/docs/modules/munin.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-munin]]
 == Munin module
 
-experimental[]
+beta[]
 
 This is the munin module.
 

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

diff --git a/metricbeat/docs/modules/traefik.asciidoc b/metricbeat/docs/modules/traefik.asciidoc
@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-traefik]]
 == traefik module
 
-experimental[]
+beta[]
 
 This module periodically fetches metrics from a https://traefik.io/[Traefik]
 instance. The Traefik instance must be configured to expose it's HTTP API.

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -89,8 +89,8 @@ This file is generated! See scripts/docs_collector.py
 .3+| .3+|  |<<metricbeat-metricset-mongodb-collstats,collstats>>   
 |<<metricbeat-metricset-mongodb-dbstats,dbstats>>   
 |<<metricbeat-metricset-mongodb-status,status>>   
-|<<metricbeat-module-munin,Munin>>  experimental[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.1+| .1+|  |<<metricbeat-metricset-munin-node,node>> experimental[]  
+|<<metricbeat-module-munin,Munin>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.1+| .1+|  |<<metricbeat-metricset-munin-node,node>> beta[]  
 |<<metricbeat-module-mysql,MySQL>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .2+| .2+|  |<<metricbeat-metricset-mysql-galera_status,galera_status>> experimental[]  
 |<<metricbeat-metricset-mysql-status,status>>   
@@ -128,7 +128,7 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-system-raid,raid>>   
 |<<metricbeat-metricset-system-socket,socket>>   
 |<<metricbeat-metricset-system-uptime,uptime>>   
-|<<metricbeat-module-traefik,traefik>>  experimental[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
+|<<metricbeat-module-traefik,traefik>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-traefik-health,health>> experimental[]  
 |<<metricbeat-module-uwsgi,uwsgi>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-uwsgi-status,status>> beta[]  

diff --git a/metricbeat/module/munin/_meta/fields.yml b/metricbeat/module/munin/_meta/fields.yml
@@ -1,10 +1,8 @@
 - key: munin
   title: "Munin"
   description: >
-    experimental[]
-
     Munin node metrics exporter
-  release: experimental
+  release: beta
   fields:
     - name: munin
       type: group

diff --git a/metricbeat/module/munin/fields.go b/metricbeat/module/munin/fields.go
diff --git a/metricbeat/module/munin/node/_meta/fields.yml b/metricbeat/module/munin/node/_meta/fields.yml
@@ -1 +1 @@
-- release: experimental
+- release: beta
diff --git a/metricbeat/module/munin/node/node.go b/metricbeat/module/munin/node/node.go
@@ -49,7 +49,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 munin node metricset is experimental.")
+	cfgwarn.Beta("The munin node metricset is beta.")
 
 	config := struct {
 		Namespace string `config:"node.namespace" validate:"required"`

diff --git a/metricbeat/module/traefik/_meta/fields.yml b/metricbeat/module/traefik/_meta/fields.yml
@@ -2,6 +2,7 @@
   title: "traefik"
   description: >
     Traefik reverse proxy / load balancer metrics
+  release: beta
   fields:
     - name: traefik
       type: group

diff --git a/metricbeat/module/traefik/fields.go b/metricbeat/module/traefik/fields.go
diff --git a/metricbeat/module/traefik/health/health.go b/metricbeat/module/traefik/health/health.go
@@ -51,7 +51,7 @@ type MetricSet struct {
 
 // New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The traefik health metricset is experimental.")
+	cfgwarn.Beta("The traefik health metricset is beta.")
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err