From fa2b782ef9f93158050252a56871016ee5f47f03 Mon Sep 17 00:00:00 2001
From: Nicolas Ruflin <spam@ruflin.com>
Date: Tue, 3 Apr 2018 14:28:14 +0200
Subject: [PATCH] Mark http.server metricset as beta (#6712)

---
 CHANGELOG.asciidoc                             | 1 +
 metricbeat/docs/modules/http/server.asciidoc   | 2 +-
 metricbeat/docs/modules_list.asciidoc          | 2 +-
 metricbeat/module/http/server/_meta/fields.yml | 2 +-
 metricbeat/module/http/server/server.go        | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5a1a18fd05d4..4fc4667d89c5 100644
--- 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
index 29ba4fc82d9a..d4acb5a7876b 100644
--- 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
index 501ffe810fcb..d6129ed4028f 100644
--- 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
index d531fca8e16a..028dd892260e 100644
--- 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
index 562908d484ac..85418c1b4ad5 100644
--- 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 {