[Metricbeat] Release Dropwizard,Graphite module as GA (#10240)

Release also http.server metricset as GA.
elastic · Jan 22, 2019 · 4f826ed · 4f826ed
1 parent 214ad00
commit 4f826ed
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 27 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -192,7 +192,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release aerospike module as GA. {pull}10203[10203]
 - Release kubernetes apiserver and event metricsets as GA {pull}10212[10212]
 - Release Couchbase module as GA. {pull}10201[10201]
-- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
+- Release RabbitMQ Metricbeat module GA. {pull}10165[10165]
+- Release Dropwizard module as GA. {pull}10240[10240]
+- Release Graphite module as GA. {pull}10240[10240]
+- Release http.server metricset as GA. {pull}10240[10240]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/dropwizard.asciidoc b/metricbeat/docs/modules/dropwizard.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-dropwizard]]
 == Dropwizard module
 
-beta[]
-
 This is the http://dropwizard.io[Dropwizard] module. The default metricset is `collector`.
 
 [float]

diff --git a/metricbeat/docs/modules/dropwizard/collector.asciidoc b/metricbeat/docs/modules/dropwizard/collector.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-dropwizard-collector]]
 === Dropwizard collector metricset
 
-beta[]
-
 include::../../../module/dropwizard/collector/_meta/docs.asciidoc[]
 
 

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -31,8 +31,8 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-docker-info,info>>   
 |<<metricbeat-metricset-docker-memory,memory>>   
 |<<metricbeat-metricset-docker-network,network>>   
-|<<metricbeat-module-dropwizard,Dropwizard>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.1+| .1+|  |<<metricbeat-metricset-dropwizard-collector,collector>> beta[]  
+|<<metricbeat-module-dropwizard,Dropwizard>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.1+| .1+|  |<<metricbeat-metricset-dropwizard-collector,collector>>   
 |<<metricbeat-module-elasticsearch,Elasticsearch>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .10+| .10+|  |<<metricbeat-metricset-elasticsearch-ccr,ccr>>   
 |<<metricbeat-metricset-elasticsearch-cluster_stats,cluster_stats>>   
@@ -54,13 +54,13 @@ This file is generated! See scripts/docs_collector.py
 .2+| .2+|  |<<metricbeat-metricset-golang-expvar,expvar>> beta[]  
 |<<metricbeat-metricset-golang-heap,heap>> beta[]  
 |<<metricbeat-module-graphite,Graphite>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.1+| .1+|  |<<metricbeat-metricset-graphite-server,server>> beta[]  
+.1+| .1+|  |<<metricbeat-metricset-graphite-server,server>>   
 |<<metricbeat-module-haproxy,HAProxy>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .2+| .2+|  |<<metricbeat-metricset-haproxy-info,info>>   
 |<<metricbeat-metricset-haproxy-stat,stat>>   
 |<<metricbeat-module-http,HTTP>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-http-json,json>>   
-|<<metricbeat-metricset-http-server,server>> beta[]  
+|<<metricbeat-metricset-http-server,server>>   
 |<<metricbeat-module-jolokia,Jolokia>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-jolokia-jmx,jmx>>   
 |<<metricbeat-module-kafka,Kafka>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  

diff --git a/metricbeat/module/dropwizard/_meta/fields.yml b/metricbeat/module/dropwizard/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "Dropwizard"
   description: >
     Stats collected from Dropwizard.
-  release: beta
+  release: ga
   settings: ["ssl", "http"]
   short_config: false
   fields:

diff --git a/metricbeat/module/dropwizard/collector/_meta/fields.yml b/metricbeat/module/dropwizard/collector/_meta/fields.yml
@@ -1 +1 @@
-- release: beta
+- release: ga
diff --git a/metricbeat/module/dropwizard/collector/collector.go b/metricbeat/module/dropwizard/collector/collector.go
@@ -22,7 +22,6 @@ import (
 	"strings"
 
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/mb/parse"
@@ -65,7 +64,6 @@ 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.Beta("The dropwizard collector metricset is beta")
 	config := struct {
 		Namespace string `config:"namespace" validate:"required"`
 	}{}

diff --git a/metricbeat/module/dropwizard/fields.go b/metricbeat/module/dropwizard/fields.go
diff --git a/metricbeat/module/graphite/fields.go b/metricbeat/module/graphite/fields.go
diff --git a/metricbeat/module/graphite/server/_meta/fields.yml b/metricbeat/module/graphite/server/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     server
-  release: beta
+  release: ga
   fields:
     - name: example
       type: keyword

diff --git a/metricbeat/module/graphite/server/server.go b/metricbeat/module/graphite/server/server.go
@@ -20,7 +20,6 @@ package server
 import (
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 	serverhelper "github.com/elastic/beats/metricbeat/helper/server"
 	"github.com/elastic/beats/metricbeat/helper/server/tcp"
@@ -50,7 +49,6 @@ 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.Beta("The graphite server metricset is beta")
 
 	config := DefaultGraphiteCollectorConfig()
 	if err := base.Module().UnpackConfig(&config); err != nil {

diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go
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: beta
+  release: ga
   fields:
diff --git a/metricbeat/module/http/server/server.go b/metricbeat/module/http/server/server.go
@@ -20,7 +20,6 @@ package server
 import (
 	"fmt"
 
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	serverhelper "github.com/elastic/beats/metricbeat/helper/server"
 	"github.com/elastic/beats/metricbeat/helper/server/http"
 	"github.com/elastic/beats/metricbeat/mb"
@@ -48,8 +47,6 @@ 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.Beta("The http server metricset is beta")
-
 	config := defaultHttpServerConfig()
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py @@
     [[metricbeat-module-dropwizard]]
     == Dropwizard module
-    beta[]
     This is the http://dropwizard.io[Dropwizard] module. The default metricset is `collector`.
     [float]
@@ Expand Down @@