From aff11c1a928c1ec015cc540a91e3dd7d38410fe0 Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Fri, 18 Jan 2019 13:05:03 +0100 Subject: [PATCH 1/2] Making RabbitMQ Metricbeat module GA. --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/rabbitmq.asciidoc | 2 -- metricbeat/docs/modules/rabbitmq/connection.asciidoc | 2 -- metricbeat/docs/modules/rabbitmq/exchange.asciidoc | 2 -- metricbeat/docs/modules/rabbitmq/node.asciidoc | 2 -- metricbeat/docs/modules/rabbitmq/queue.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 10 +++++----- metricbeat/module/rabbitmq/_meta/fields.yml | 2 +- metricbeat/module/rabbitmq/connection/_meta/fields.yml | 2 +- metricbeat/module/rabbitmq/connection/connection.go | 3 --- metricbeat/module/rabbitmq/exchange/_meta/fields.yml | 2 +- metricbeat/module/rabbitmq/exchange/exchange.go | 3 --- metricbeat/module/rabbitmq/fields.go | 2 +- metricbeat/module/rabbitmq/node/_meta/fields.yml | 2 +- metricbeat/module/rabbitmq/node/node.go | 3 --- metricbeat/module/rabbitmq/queue/_meta/fields.yml | 2 +- metricbeat/module/rabbitmq/queue/queue.go | 3 --- 17 files changed, 12 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 3fe1901e2a9..a4e8d2ef3cd 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -176,6 +176,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Release Ceph module as GA. {pull}10202[10202] - Release aerospike module as GA. {pull}10203[10203] - Release Couchbase module as GA. {pull}10201[10201] +- Making RabbitMQ Metricbeat module GA. {pull}[] *Packetbeat* diff --git a/metricbeat/docs/modules/rabbitmq.asciidoc b/metricbeat/docs/modules/rabbitmq.asciidoc index a1c61cc5276..c52c3ce2f27 100644 --- a/metricbeat/docs/modules/rabbitmq.asciidoc +++ b/metricbeat/docs/modules/rabbitmq.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-rabbitmq]] == RabbitMQ module -beta[] - The RabbitMQ module uses http://www.rabbitmq.com/management.html[HTTP API] created by the management plugin to collect metrics. The default metricsets are `connection`, `node`, `queue` and `exchange`. diff --git a/metricbeat/docs/modules/rabbitmq/connection.asciidoc b/metricbeat/docs/modules/rabbitmq/connection.asciidoc index ee879ba08f7..ad7b3bcb349 100644 --- a/metricbeat/docs/modules/rabbitmq/connection.asciidoc +++ b/metricbeat/docs/modules/rabbitmq/connection.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-rabbitmq-connection]] === RabbitMQ connection metricset -beta[] - include::../../../module/rabbitmq/connection/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/rabbitmq/exchange.asciidoc b/metricbeat/docs/modules/rabbitmq/exchange.asciidoc index b1a84ef6186..41c7793d469 100644 --- a/metricbeat/docs/modules/rabbitmq/exchange.asciidoc +++ b/metricbeat/docs/modules/rabbitmq/exchange.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-rabbitmq-exchange]] === RabbitMQ exchange metricset -beta[] - include::../../../module/rabbitmq/exchange/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/rabbitmq/node.asciidoc b/metricbeat/docs/modules/rabbitmq/node.asciidoc index 59be715776b..f17417a441e 100644 --- a/metricbeat/docs/modules/rabbitmq/node.asciidoc +++ b/metricbeat/docs/modules/rabbitmq/node.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-rabbitmq-node]] === RabbitMQ node metricset -beta[] - include::../../../module/rabbitmq/node/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/rabbitmq/queue.asciidoc b/metricbeat/docs/modules/rabbitmq/queue.asciidoc index bb97516a62c..06c148ff97b 100644 --- a/metricbeat/docs/modules/rabbitmq/queue.asciidoc +++ b/metricbeat/docs/modules/rabbitmq/queue.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-rabbitmq-queue]] === RabbitMQ queue metricset -beta[] - include::../../../module/rabbitmq/queue/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 1d073588c94..ea1c94155fe 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -118,11 +118,11 @@ This file is generated! See scripts/docs_collector.py |<> |image:./images/icon-no.png[No prebuilt dashboards] | .2+| .2+| |<> |<> beta[] -|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.4+| .4+| |<> beta[] -|<> beta[] -|<> beta[] -|<> beta[] +|<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | +.4+| .4+| |<> +|<> +|<> +|<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .3+| .3+| |<> |<> diff --git a/metricbeat/module/rabbitmq/_meta/fields.yml b/metricbeat/module/rabbitmq/_meta/fields.yml index 5ae6ea13799..12ba67ee0de 100644 --- a/metricbeat/module/rabbitmq/_meta/fields.yml +++ b/metricbeat/module/rabbitmq/_meta/fields.yml @@ -2,7 +2,7 @@ title: "RabbitMQ" description: > RabbitMQ module - release: beta + release: ga settings: ["ssl", "http"] fields: - name: rabbitmq diff --git a/metricbeat/module/rabbitmq/connection/_meta/fields.yml b/metricbeat/module/rabbitmq/connection/_meta/fields.yml index 083cf9c472c..690c57507f7 100644 --- a/metricbeat/module/rabbitmq/connection/_meta/fields.yml +++ b/metricbeat/module/rabbitmq/connection/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > connection - release: beta + release: ga fields: - name: name type: keyword diff --git a/metricbeat/module/rabbitmq/connection/connection.go b/metricbeat/module/rabbitmq/connection/connection.go index 3651dfe946a..2f6b3cee01d 100644 --- a/metricbeat/module/rabbitmq/connection/connection.go +++ b/metricbeat/module/rabbitmq/connection/connection.go @@ -19,7 +19,6 @@ package connection import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/rabbitmq" ) @@ -38,8 +37,6 @@ type MetricSet struct { // New creates new instance of MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The rabbitmq connection metricset is beta") - ms, err := rabbitmq.NewMetricSet(base, rabbitmq.ConnectionsPath) if err != nil { return nil, err diff --git a/metricbeat/module/rabbitmq/exchange/_meta/fields.yml b/metricbeat/module/rabbitmq/exchange/_meta/fields.yml index a59ce39dec2..b706cc75b89 100644 --- a/metricbeat/module/rabbitmq/exchange/_meta/fields.yml +++ b/metricbeat/module/rabbitmq/exchange/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > exchange - release: beta + release: ga fields: - name: name type: keyword diff --git a/metricbeat/module/rabbitmq/exchange/exchange.go b/metricbeat/module/rabbitmq/exchange/exchange.go index 646afe57902..99278a6681e 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange.go +++ b/metricbeat/module/rabbitmq/exchange/exchange.go @@ -19,7 +19,6 @@ package exchange import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/rabbitmq" ) @@ -38,8 +37,6 @@ type MetricSet struct { // New creates new instance of MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The rabbitmq exchange metricset is beta") - ms, err := rabbitmq.NewMetricSet(base, rabbitmq.ExchangesPath) if err != nil { return nil, err diff --git a/metricbeat/module/rabbitmq/fields.go b/metricbeat/module/rabbitmq/fields.go index 9e5ab8cf59d..3082d388c30 100644 --- a/metricbeat/module/rabbitmq/fields.go +++ b/metricbeat/module/rabbitmq/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "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" + return "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" } diff --git a/metricbeat/module/rabbitmq/node/_meta/fields.yml b/metricbeat/module/rabbitmq/node/_meta/fields.yml index 4b2ee98462a..3f3a7be9778 100644 --- a/metricbeat/module/rabbitmq/node/_meta/fields.yml +++ b/metricbeat/module/rabbitmq/node/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > node - release: beta + release: ga fields: - name: disk.free.bytes type: long diff --git a/metricbeat/module/rabbitmq/node/node.go b/metricbeat/module/rabbitmq/node/node.go index 2ab8283cebf..6c90a986b5e 100644 --- a/metricbeat/module/rabbitmq/node/node.go +++ b/metricbeat/module/rabbitmq/node/node.go @@ -22,7 +22,6 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/rabbitmq" ) @@ -46,8 +45,6 @@ type ClusterMetricSet struct { // New creates new instance of MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The rabbitmq node metricset is beta") - config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/rabbitmq/queue/_meta/fields.yml b/metricbeat/module/rabbitmq/queue/_meta/fields.yml index 6bcb945dd96..288efd8e5f9 100644 --- a/metricbeat/module/rabbitmq/queue/_meta/fields.yml +++ b/metricbeat/module/rabbitmq/queue/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > queue - release: beta + release: ga fields: - name: name type: keyword diff --git a/metricbeat/module/rabbitmq/queue/queue.go b/metricbeat/module/rabbitmq/queue/queue.go index a52611b83da..3f8d9a21cf8 100644 --- a/metricbeat/module/rabbitmq/queue/queue.go +++ b/metricbeat/module/rabbitmq/queue/queue.go @@ -19,7 +19,6 @@ package queue import ( "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/rabbitmq" ) @@ -38,8 +37,6 @@ type MetricSet struct { // New creates new instance of MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The rabbitmq queue metricset is beta") - ms, err := rabbitmq.NewMetricSet(base, rabbitmq.QueuesPath) if err != nil { return nil, err From d3c8dc6cf4759e31e96749e90d4e62b6429f27ef Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Mon, 21 Jan 2019 14:31:53 +0100 Subject: [PATCH 2/2] fix docs build and remove title from metricset --- CHANGELOG.next.asciidoc | 2 +- metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index a4e8d2ef3cd..35629a7bc9a 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -176,7 +176,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Release Ceph module as GA. {pull}10202[10202] - Release aerospike module as GA. {pull}10203[10203] - Release Couchbase module as GA. {pull}10201[10201] -- Making RabbitMQ Metricbeat module GA. {pull}[] +- Making RabbitMQ Metricbeat module GA. {pull}10165[10165] *Packetbeat* diff --git a/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc b/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc index 0c9dddf0529..3851b79c03b 100644 --- a/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc +++ b/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc @@ -1,3 +1 @@ -=== rabbitmq exchange MetricSet - This is the exchange metricset of the module rabbitmq.