From 7abd8c687ffce5b26e8c50db5ffaeb79aa1b8d5b 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. (cherry picked from commit 4f826eda5fce8acf9868f3f164eb5b382909b5c6) --- CHANGELOG.next.asciidoc | 4 ++++ metricbeat/docs/modules/dropwizard.asciidoc | 2 -- .../modules/dropwizard/collector.asciidoc | 2 -- .../docs/modules/graphite/server.asciidoc | 2 -- metricbeat/docs/modules/http/server.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 20 +++++++++++++++++-- metricbeat/module/dropwizard/_meta/fields.yml | 2 +- .../dropwizard/collector/_meta/fields.yml | 2 +- .../module/dropwizard/collector/collector.go | 2 -- metricbeat/module/dropwizard/fields.go | 2 +- metricbeat/module/graphite/fields.go | 2 +- .../module/graphite/server/_meta/fields.yml | 2 +- metricbeat/module/graphite/server/server.go | 2 -- metricbeat/module/http/fields.go | 4 ++++ .../module/http/server/_meta/fields.yml | 2 +- metricbeat/module/http/server/server.go | 3 --- 16 files changed, 32 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 652cca03629..e6f29c317d3 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -176,6 +176,10 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff] - Release Couchbase module as GA. {pull}10201[10201] - Release aerospike module as GA. {pull}10203[10203] - 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 09d9b5842e1..45f59132cde 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 dba6c38d5ea..228df6106c0 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 0f684e9e815..d4ee45113e6 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 d4acb5a7876..ac9df990bc1 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 89bfb8900c1..e0b98b08b2c 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -30,6 +30,7 @@ This file is generated! See scripts/docs_collector.py |<> |<> |<> +<<<<<<< HEAD |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | @@ -43,6 +44,21 @@ This file is generated! See scripts/docs_collector.py |<> beta[] |<> beta[] |<> beta[] +======= +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.1+| .1+| |<> +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.10+| .10+| |<> +|<> +|<> +|<> +|<> +|<> +|<> +|<> +|<> +|<> +>>>>>>> 4f826eda5... [Metricbeat] Release Dropwizard,Graphite module as GA (#10240) |<> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> experimental[] |<> |image:./images/icon-no.png[No prebuilt dashboards] | @@ -53,13 +69,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 134f2831d4e..41908008b25 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 8033a27f5ac..a927f3fc9f8 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 394486977dc..f4f5fb1a80b 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 9a97013c7ba..468865311f1 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 d044f1bda91..1d5cd865e23 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 9be1dab3790..8b558f79af1 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 af079dda0ca..43007faac45 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 70ea222bf5e..68d06f6a4f0 100644 --- a/metricbeat/module/http/fields.go +++ b/metricbeat/module/http/fields.go @@ -31,5 +31,9 @@ func init() { // Asset returns asset data func Asset() string { +<<<<<<< HEAD return "eJzMlDFTwzAMhff8Cl1mesfQKQMzE8fQjWNw49fGbRIbSynk33NumtCkLkevlEOj5XzvyVI0oy3ajAoRlxCJkRIZpY+LxXOaEGlw7o0TY+uMHhIiopCiyuqmRELkUUIxMlqrhIghYuo1Z/SSMpfpHaUBnL4mRCuDUnO2Z8yoVhUG1RDSukDxtulPItpjyjHJ460By3AeA56F9rEv7UAiU6+sr1S4eXRtqj+qBkrD8wTa+bDLDXKZpL41Q7Qo0Fk6gIlRS1S5ghRWR4W3aN+tn+Z+qtyBqWHoqPDS6vYGsk61pVV6XPBXq9nZmvErve5Q/7HZHjnM7sy751bjBu/OoqThGB0fqnJhNczv51FHrvCKL/E0EJ+s0Mo29ZWmIwb+aEpPOtXrbng0ThdPafg+/ILe5IzjeRpv3T7O7UaG38FfY+SEMBhYQmIWPgMAAP//T4yYaw==" +======= + return "eJzMlDFvwjAQhff8iqfMRerAlKFzp6oDW9XBxA8wJHHqu9Dm31cBQklqkCit1Btt53ufz7En2LDNsFKtE0CdFsyQPs5mz2kCWEoeXK3OVxkeEgDoplB62xRMgMCCRphhaRJAqOqqpWR4SUWK9A5pB05fE2DhWFjJdowJKlPymNqVtnVHCb7pRyLZQ8opKfCtoehxPAY8C+1rt7UDCa5a+FCabuXJsnH+YDc0lkFG0L2Hn6+Z62jqogwwW3GvdABDWGk0ee5tG43dsH33wf4wtzZt4Y0d5n51XGpfCX+l5XvUf+x5YE63pY2m597yD/ouarSRGJ0fpqy7Gzq9n0aN6lUwco3TkfjkFQvfVDdKjwR6r7UMjvTqP6X7HiU1uFx4eqbDB6ivc8+EMGwZbhH5Rrgs8BkAAP//p5Fb6Q==" +>>>>>>> 4f826eda5... [Metricbeat] Release Dropwizard,Graphite module as GA (#10240) } diff --git a/metricbeat/module/http/server/_meta/fields.yml b/metricbeat/module/http/server/_meta/fields.yml index 028dd892260..315554da52b 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 492e92bbcb3..1b0eda76fc3 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