fixes to munin module

elastic · Jul 23, 2018 · 9f1ee07 · 9f1ee07
1 parent abe0f95
commit 9f1ee07
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -314,7 +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 treafik module as beta. {pull}7660[7660]
+- 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
 
-beta[]
 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_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -89,7 +89,7 @@ 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]    |  
+|<<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[]  

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: >
-    beta[]
-
     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