From 4f826eda5fce8acf9868f3f164eb5b382909b5c6 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Tue, 22 Jan 2019 13:48:30 +0100 Subject: [PATCH] [Metricbeat] Release Dropwizard,Graphite module as GA (#10240) Release also http.server metricset as GA. --- CHANGELOG.next.asciidoc | 5 ++++- metricbeat/docs/modules/dropwizard.asciidoc | 2 -- metricbeat/docs/modules/dropwizard/collector.asciidoc | 2 -- metricbeat/docs/modules/graphite/server.asciidoc | 2 -- metricbeat/docs/modules/http/server.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 8 ++++---- metricbeat/module/dropwizard/_meta/fields.yml | 2 +- metricbeat/module/dropwizard/collector/_meta/fields.yml | 2 +- metricbeat/module/dropwizard/collector/collector.go | 2 -- metricbeat/module/dropwizard/fields.go | 2 +- metricbeat/module/graphite/fields.go | 2 +- metricbeat/module/graphite/server/_meta/fields.yml | 2 +- metricbeat/module/graphite/server/server.go | 2 -- metricbeat/module/http/fields.go | 2 +- metricbeat/module/http/server/_meta/fields.yml | 2 +- metricbeat/module/http/server/server.go | 3 --- 16 files changed, 15 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b985d330146a..b291a58be930 100644 --- 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 index 09d9b5842e14..45f59132cde2 100644 --- 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 index dba6c38d5ea0..228df6106c04 100644 --- 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 index 0f684e9e815d..d4ee45113e6a 100644 --- 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 index d4acb5a7876b..ac9df990bc16 100644 --- 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 index d6cb559b1fb4..f5d5d37ab232 100644 --- 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 |<> |<> |<> -|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | -.1+| .1+| |<> beta[] +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.1+| .1+| |<> |<> |image:./images/icon-no.png[No prebuilt dashboards] | .10+| .10+| |<> |<> @@ -54,13 +54,13 @@ This file is generated! See scripts/docs_collector.py .2+| .2+| |<> beta[] |<> beta[] |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | -.1+| .1+| |<> beta[] +.1+| .1+| |<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .2+| .2+| |<> |<> |<> |image:./images/icon-no.png[No prebuilt dashboards] | .2+| .2+| |<> -|<> beta[] +|<> |<> |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> |<> |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 index 134f2831d4e5..41908008b252 100644 --- 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 index 8033a27f5ac5..a927f3fc9f84 100644 --- 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 index 394486977dca..f4f5fb1a80bb 100644 --- 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 index ae34bce64611..ff0e77a33ad8 100644 --- a/metricbeat/module/dropwizard/fields.go +++ b/metricbeat/module/dropwizard/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJxsjkGOwjAMRfc5xVfW0zmAF7OaG8xyhFBInDYiTaLYCJXTowICFeHls/z8Bhx5IYRe2zldXA8G0KSZCfb3Ca0BAovvqWmqhfBjAOBPnQp8zZm9ckDsdcbr6tsAnTM7YcKB1RlAWDWVUQj/ViTbL9hJtdnduptq172vJaaREF0WNkBMnIPQ7eGA4mZ+y11Hl8aEsddTe5APuVvX3bftuwYAAP//aMZUBA==" + return "eJxsjk2KAjEQhfc5xSPr6TlAFrOaG7gUkZBUuoPpJFSVSHt6aRX/sJaveO/7BhxocYjc+imfPUcDaNZCDvb/EVoDRJLAuWtu1eHPAMBGvQpCK4WCUkTiNuPZ+jUAUyEv5DB6Awip5jqKw9aKFPsDO6l2u1t/U2Pdh1ZTHh2SL0IGSJlKFHfFDah+pg/Z9XTpK4Hbsd+TL7LvW7e9V7tLAAAA///zhlJc" } diff --git a/metricbeat/module/graphite/fields.go b/metricbeat/module/graphite/fields.go index e1341c1bb6d1..978459b209f3 100644 --- a/metricbeat/module/graphite/fields.go +++ b/metricbeat/module/graphite/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJx8j0sSwiAYg/ecItN9L8DCnePKQ6BEZUoLA1Tt7Z0+p8VqlvnJl1CiYidxD8o/TKIAkkmWEsVpsgoBaMZrMD4Z10gcBIAlgbPTre2DgZYqUuLCpARwM7Q6yuF1iUbV3PT0Sp0fTNf6ydlp2pLWtMjwZFjsPd5P5qgvQv6JWfmE9Qy+Ve0tN7d5S8Xu5YLObn8W9TqOwLFUfAIAAP//VtVwNQ==" + return "eJx8jz0SwiAUhHtOsZM+F6Cwc6w8BMoamZDAAFFzeyc/ZkKMvvJ7vG+XEjV7iSoofzeJAkgmWUoUpxkVAtCM12B8Mq6VOAgAywXOTnd2OAy0VJESFyYlgJuh1VGOr0u0qmGWM0zq/Qhd52eyk5Sb1rbI8GBY8J7vp3OaL8PyiUqt6LbAugRfqvGW2e7TpGb/dEFvdn/6DHOchFOoeAcAAP//RydvYQ==" } diff --git a/metricbeat/module/graphite/server/_meta/fields.yml b/metricbeat/module/graphite/server/_meta/fields.yml index 9be1dab37909..8b558f79af15 100644 --- 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 index af079dda0ca2..43007faac45f 100644 --- 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 index 6aa2e5fcef2d..11ec27c36eb6 100644 --- a/metricbeat/module/http/fields.go +++ b/metricbeat/module/http/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzMlLFO8zAUhfc8xVHmv9I/dMrAzIQYuiEGNz5t3SZx8L0p5O1R2iY0wUUqBYk72s53Pl/HnmHHNsNGtU4AdVowQ3q/WDymCWApeXC1Ol9luEsAoJtC6W1TMAECCxphhrVJAKGqq9aS4SkVKdJ/SDtw+pwAK8fCSnZgzFCZkkNqV9rWHSX4ph+JZI8p56TAl4aiw3gMeBHa12FrJxJctfKhNN3Ks2XT/NFuaCyDTKBHD7/cMtfJ1JcywGLDo9IJDGGl0eSlt200dsf21Qf7zdzatIU3dpz70XGpfSX8kZYfUX+x54E53Z42mp57y1/ou6jRRmJ0vpmy7m7o/P88alRvgpFrnAbig1esfFPdKD0R6L22MjrSq/+U7nuU1OBy4fmZjh+gvi49E8KwZ7hF5BNhEFhSYwrvAQAA//9oZVy9" + return "eJzMlDFvwjAQhff8iqfMRerAlKFzp6oDW9XBxA8wJHHqu9Dm31cBQklqkCit1Btt53ufz7En2LDNsFKtE0CdFsyQPs5mz2kCWEoeXK3OVxkeEgDoplB62xRMgMCCRphhaRJAqOqqpWR4SUWK9A5pB05fE2DhWFjJdowJKlPymNqVtnVHCb7pRyLZQ8opKfCtoehxPAY8C+1rt7UDCa5a+FCabuXJsnH+YDc0lkFG0L2Hn6+Z62jqogwwW3GvdABDWGk0ee5tG43dsH33wf4wtzZt4Y0d5n51XGpfCX+l5XvUf+x5YE63pY2m597yD/ouarSRGJ0fpqy7Gzq9n0aN6lUwco3TkfjkFQvfVDdKjwR6r7UMjvTqP6X7HiU1uFx4eqbDB6ivc8+EMGwZbhH5Rrgs8BkAAP//p5Fb6Q==" } diff --git a/metricbeat/module/http/server/_meta/fields.yml b/metricbeat/module/http/server/_meta/fields.yml index 028dd892260e..315554da52bb 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: beta + release: ga fields: diff --git a/metricbeat/module/http/server/server.go b/metricbeat/module/http/server/server.go index 492e92bbcb39..1b0eda76fc34 100644 --- 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