diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 2d11a7c6202..063620f4a98 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -197,7 +197,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Release Couchbase module as GA. {pull}10201[10201] - Release RabbitMQ module GA. {pull}10165[10165] - Release envoyproxy module GA. {pull}10223[10223] -- Making RabbitMQ Metricbeat module GA. {pull}10165[10165] - Release mongodb.metrics and mongodb.replstatus as GA. {pull}10242[10242] - Release mysql.galera_status as GA. {pull}10242[10242] - Release postgresql.statement as GA. {pull}10242[10242] @@ -205,7 +204,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - 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] -- Making RabbitMQ Metricbeat module GA. {pull}10165[10165] +- Release Nats module as GA. {pull}10281[10281] - Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222] *Packetbeat* diff --git a/metricbeat/docs/modules/nats.asciidoc b/metricbeat/docs/modules/nats.asciidoc index a24384e03c6..e6eb6f12cdd 100644 --- a/metricbeat/docs/modules/nats.asciidoc +++ b/metricbeat/docs/modules/nats.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-nats]] == Nats module -experimental[] - This is the nats module. This is the Nats Module. The Nats module uses http://localhost:8222 APIs to collect metrics. diff --git a/metricbeat/docs/modules/nats/connections.asciidoc b/metricbeat/docs/modules/nats/connections.asciidoc index e15c0ece302..c3e713e895e 100644 --- a/metricbeat/docs/modules/nats/connections.asciidoc +++ b/metricbeat/docs/modules/nats/connections.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-nats-connections]] === Nats connections metricset -experimental[] - include::../../../module/nats/connections/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/nats/routes.asciidoc b/metricbeat/docs/modules/nats/routes.asciidoc index d1a25ffb304..b51dc6bef86 100644 --- a/metricbeat/docs/modules/nats/routes.asciidoc +++ b/metricbeat/docs/modules/nats/routes.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-nats-routes]] === Nats routes metricset -experimental[] - include::../../../module/nats/routes/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/nats/stats.asciidoc b/metricbeat/docs/modules/nats/stats.asciidoc index a6f9fa5cbbc..f3e2bea1809 100644 --- a/metricbeat/docs/modules/nats/stats.asciidoc +++ b/metricbeat/docs/modules/nats/stats.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-nats-stats]] === Nats stats metricset -experimental[] - include::../../../module/nats/stats/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/nats/subscriptions.asciidoc b/metricbeat/docs/modules/nats/subscriptions.asciidoc index 48dd99857ea..0388ce623ff 100644 --- a/metricbeat/docs/modules/nats/subscriptions.asciidoc +++ b/metricbeat/docs/modules/nats/subscriptions.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-nats-subscriptions]] === Nats subscriptions metricset -experimental[] - include::../../../module/nats/subscriptions/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index dad2b317af8..cdc28faf778 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -101,11 +101,11 @@ This file is generated! See scripts/docs_collector.py |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .2+| .2+| |<> |<> -|<> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] | -.4+| .4+| |<> experimental[] -|<> experimental[] -|<> experimental[] -|<> experimental[] +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.4+| .4+| |<> +|<> +|<> +|<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .1+| .1+| |<> |<> |image:./images/icon-no.png[No prebuilt dashboards] | diff --git a/metricbeat/module/nats/_meta/fields.yml b/metricbeat/module/nats/_meta/fields.yml index 819c12ff116..e47bedf476c 100644 --- a/metricbeat/module/nats/_meta/fields.yml +++ b/metricbeat/module/nats/_meta/fields.yml @@ -2,6 +2,7 @@ title: "Nats" description: > nats Module + release: ga fields: - name: nats type: group diff --git a/metricbeat/module/nats/connections/_meta/fields.yml b/metricbeat/module/nats/connections/_meta/fields.yml index 43bbcfcb31f..b8ae24cf652 100644 --- a/metricbeat/module/nats/connections/_meta/fields.yml +++ b/metricbeat/module/nats/connections/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > Contains nats connection related metrics + release: ga fields: - name: total type: integer diff --git a/metricbeat/module/nats/connections/connections.go b/metricbeat/module/nats/connections/connections.go index 398bcac0cc1..e70689b2a1e 100644 --- a/metricbeat/module/nats/connections/connections.go +++ b/metricbeat/module/nats/connections/connections.go @@ -18,7 +18,6 @@ package connections import ( - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/helper/elastic" @@ -63,8 +62,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The nats connections metricset is experimental.") - config := struct{}{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/nats/fields.go b/metricbeat/module/nats/fields.go index 0b3f9fa1261..efdc8bf85d2 100644 --- a/metricbeat/module/nats/fields.go +++ b/metricbeat/module/nats/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzUmL1y4zYQx3s/xc5VSXF6ABWZySTNFXERX2odBK4o5Agsb3chn/z0GZCiTFGgvkx7FBYuRHj/P/4Xu/j4DN9xO4dgVB4A1GmFc/j0aFQ+PQAUKJZdrY7CHH57AIBmJPxFRazwAWDlsCpk3rz5DMF43MdKj25rnEPJFOvdL5mI6fmW/ukbWApqXBAQNepEnRXQtVF4RkZgNAWsmDw8vkr0CfoUgrxBnrli/6bD+Y7bZ+L+7yNQ6fm6xl0o+PLnmIg6j0cyhVG8TOOpjZ+iAK3Ao7KzYBlNGn0kaikEtOmVHIn2rT6j+kfndZPR16DAWBnFYsfR1xh63adSUlMdvOmYXFAskQfvTpB1vofol8jJEhuZMWi1BWPVbRBs5TCoHHnDFBUntKWJd4+OMJZOFBmL4Tfv56YandCJjeEbfYj1oD5eaSoK5fUu1MiOCtDX0nQCsYZfBO2vWQSPfrbcHs6Mt1Ls5mSKTbyFKKZsyvfx969PUDNZFMnCWOIRkAnmRUWls6ZqRRqL+jzAMQj0esoBVx2zVKuKjN7uj63jgTly0pymaBb5FjepUY1QtW3bLBZHHaUPxehpbPJMXMsZpY7ChSzAsKIvlDeeYtAk74Il70KZViwzGJurazgoLEmpHVpzzp4LGE9wjop2VLlSf1+kY8WOheKwdiZKG0Ut6X+Qtj3n/aRtjzSeNqnoObUhiR753So/qcBepbfNodD07SzaWrVeMP5YNCv8jIl0EdllGWn5L9orm/eAce00LRmQdMBTcEqcvBtKjuClVv4yKV8er9G5ga/ZPX0EYCt0A6HEpXwEYKNzC1/6+xF8SedSvil7borX7Xn3O7x253ll392bNtrlcogXYHaojD8iivYP0JmxY5h91ON8XgZ6IewAGAonym4ZmxMohX6a//n7y9NIjFMfAsNj4cvosPNLzJVfBm/oAjn+prndA/7ZLpuj3xi+C/jEcS170xTvAf5sd87RpzX7HuBP7R36TncqE95bHIS9x5uc3Y3W2Of3z3+CfLR0TMbRhgeqkU1rlgsD9yonOnpA3rznATmFvw3NG7Xr90NT51HAtDLgBFYUQwErYjAHiPkrF2PXOBP3kr8em8Q6iZWCoDam6Rpb0RM4a6cLPry8ngApReySAYYRlpg6AadCxA3uLvbPsa1MoKgzb35OS+fNT+ejhzZ+u7krYLm9FMhshjeIbwQyG2RT4hjQfwEAAP//SzioHQ==" + return "eJzUmb1y4zYQx3s9xc5VSXF6ABWZySTNFXERX2odBK4o5Agsb7GQT376G4CiTFKgvkx7ZBYuRHj/P/0Xu/jQZ/iOuwU4JX4GIEYqXMCnByX+0wygQK/Z1GLILeCPGQCkkfAPFaHCGQBjhcrjAko1A1gbrAq/SOM+g1MWD5HjI7s6jmQK9f6TTPz4fIv/9A00OVHGefCixHgx2oNslMATMgKjKmDNZOHhRaJL0KXwyFvkuSkOb1qc77h7Iu5+PgIVn68b3IeCL3+PiYixeCRTKMHLNB6b+DEK0BosChsNmlHF0UeimpxDHV/5I9Gu1WdU/2q9Tvl9CRozrASLPUdXo5/79hlmoMsqJKrqvWlJjRMskQfvTvC22XDBrpCjUTowo5NqB0qL2SLoyqATf+QYUxCc0KwU7+P4xFgaL8hYDJ04zGNRMqE/W8WTuhPqQYW9MFbkyuu9qZENFSAvxW08hBp+86h/zyJYtPPVrj+LXkuxn78xNvEOgldlagAPf359hJpJo/dZGE08AjLBbKmoNFpVjUiyqMsDHJyHTlfqcdUhS7WuSMnt/ug69MzxJ81JpbTMN8lJjUpC1a5p1FgcdZ8uFKOlsckzcYVnlFoK47IAwzq/UF5ZCk6ivHGarHFlXPPUYGyurqFXWD6mdmjNOXsuYDzBOSraUuVK/W2RjhVbFgrD2pkobRSkpA+QtgPn/aTtgDSeNl/RU2xDPljkN6v8qAIHlc6WiFzq21m0jUi9ZPyxTOv+nIlkGdhkGWn1P+orm/eAcWMkLhkQdcCSM0IcvRtKjuDFVv48KV8eL+ncwJf2VO8B2AjdQOjDyr8HYNK5hS/+fQ++qHMp35Q9N8Zrd8KHHV6z87yy7x5MG+1yOcQLMFtUxh8BvXSP4JmxY5hd1ON8XgZ6IewAGArjhc0qpDMsuW6a//v3y+NIjFNfBIZHyOfRYeeXmCu/GbyiC+T4U3O7B/yzXTZHv1V8F/CR41r21BTvAf5sd87RxzX7HuBP7R26TrcqE95m9MJ+nFuf/Z3YmCndU6FHPlpQJuNowgPVyKqx0LiBp5XxMnps3r7lsTmGvw3NKtGbt0MTY9GDamTAeFhTcAWsiUH1EPMXMUpvcO7Nc/7SbBLrfKgEPEoyTTbYiJ7A2RhZcv9SfAKkGLFNBihGWGHsDxzLE7e4/8HgHNtaOQoyt+rntHRW/TQ2WGjiN1u+Ala7S4HUdniv+EogtUVWJY4B/QoAAP//tMDBng==" } diff --git a/metricbeat/module/nats/routes/_meta/fields.yml b/metricbeat/module/nats/routes/_meta/fields.yml index 709286e67cf..3b9db2536b3 100644 --- a/metricbeat/module/nats/routes/_meta/fields.yml +++ b/metricbeat/module/nats/routes/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > Contains nats route related metrics + release: ga fields: - name: total type: integer diff --git a/metricbeat/module/nats/routes/routes.go b/metricbeat/module/nats/routes/routes.go index b25830da4ba..5b85071f054 100644 --- a/metricbeat/module/nats/routes/routes.go +++ b/metricbeat/module/nats/routes/routes.go @@ -18,7 +18,6 @@ package routes import ( - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/helper/elastic" @@ -63,8 +62,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The nats routes metricset is experimental.") - config := struct{}{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/nats/stats/_meta/fields.yml b/metricbeat/module/nats/stats/_meta/fields.yml index 4f0f055504f..9317799778d 100644 --- a/metricbeat/module/nats/stats/_meta/fields.yml +++ b/metricbeat/module/nats/stats/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > Contains nats var related metrics + release: ga fields: - name: uptime type: long diff --git a/metricbeat/module/nats/stats/stats.go b/metricbeat/module/nats/stats/stats.go index 686dd672e6e..794e9d0e5b3 100644 --- a/metricbeat/module/nats/stats/stats.go +++ b/metricbeat/module/nats/stats/stats.go @@ -18,7 +18,6 @@ package stats import ( - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/helper/elastic" @@ -63,8 +62,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The nats stats metricset is experimental.") - config := struct{}{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/nats/subscriptions/_meta/fields.yml b/metricbeat/module/nats/subscriptions/_meta/fields.yml index e0751483811..1d4368a18fb 100644 --- a/metricbeat/module/nats/subscriptions/_meta/fields.yml +++ b/metricbeat/module/nats/subscriptions/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > Contains nats subscriptions related metrics + release: ga fields: - name: total type: integer diff --git a/metricbeat/module/nats/subscriptions/subscriptions.go b/metricbeat/module/nats/subscriptions/subscriptions.go index e67456bbef6..fe280e9d649 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions.go +++ b/metricbeat/module/nats/subscriptions/subscriptions.go @@ -18,7 +18,6 @@ package subscriptions import ( - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/helper/elastic" @@ -63,8 +62,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The nats subscriptions metricset is experimental.") - config := struct{}{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, err