Mark http.server metricset as beta (#6712)

elastic · Apr 3, 2018 · fa2b782 · fa2b782
1 parent ac325b8
commit fa2b782
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -274,6 +274,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Set all metricsets as default metricsets in uwsgi module. {pull}6688[6688]
 - Mark kubernetes.event metricset as beta. {pull}6715[6715]
 - Set all metricsets as default metricsets in couchbase module. {pull}6683[6683]
+- Mark http.server metricset as beta. {pull}6712[6712]
 - Mark metricbeat logstash module and metricsets as beta. {pull}6713[6713]
 
 *Packetbeat*

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -49,7 +49,7 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-haproxy-stat,stat>>   
 |<<metricbeat-module-http,HTTP>>     |    
 .2+|   |<<metricbeat-metricset-http-json,json>>   
-|<<metricbeat-metricset-http-server,server>> experimental[]  
+|<<metricbeat-metricset-http-server,server>> beta[]  
 |<<metricbeat-module-jolokia,Jolokia>>     |    
 .1+|   |<<metricbeat-metricset-jolokia-jmx,jmx>>   
 |<<metricbeat-module-kafka,Kafka>>  beta[]   |    

diff --git a/metricbeat/module/http/server/_meta/fields.yml b/metricbeat/module/http/server/_meta/fields.yml
@@ -2,5 +2,5 @@
   type: group
   description: >
     server
-  release: experimental
+  release: beta
   fields:
diff --git a/metricbeat/module/http/server/server.go b/metricbeat/module/http/server/server.go
@@ -29,7 +29,7 @@ type MetricSet 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.Experimental("EXPERIMENTAL: The http server metricset is experimental")
+	cfgwarn.Beta("The http server metricset is beta")
 
 	config := defaultHttpServerConfig()
 	if err := base.Module().UnpackConfig(&config); err != nil {