From 78efa188603a18e05048e93debb163dc7df74685 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 1 Nov 2018 10:53:33 +0100 Subject: [PATCH] Release metricbeat Kafka module as GA (#8854) (cherry picked from commit 2480758bf52a116ba54ea8de420cbff758d9dbc9) --- CHANGELOG.asciidoc | 1 + metricbeat/docs/modules/kafka.asciidoc | 2 -- metricbeat/docs/modules/kafka/consumergroup.asciidoc | 2 -- metricbeat/docs/modules/kafka/partition.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 6 +++--- metricbeat/module/kafka/_meta/fields.yml | 2 +- metricbeat/module/kafka/consumergroup/_meta/fields.yml | 2 +- metricbeat/module/kafka/consumergroup/consumergroup.go | 3 --- metricbeat/module/kafka/fields.go | 2 +- metricbeat/module/kafka/partition/_meta/fields.yml | 2 +- metricbeat/module/kafka/partition/partition.go | 3 --- 11 files changed, 8 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index c599712c6b1..4b69a6e3547 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -162,6 +162,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff] - Precalculate composed id fields for kafka dashboards. {pull}8504[8504] - Add support for `full` status page output for php-fpm module as a separate metricset called `process`. {pull}8394[8394] - Add Kafka dashboard. {pull}8457[8457] +- Release Kafka module as GA. {pull}8854[8854] *Packetbeat* diff --git a/metricbeat/docs/modules/kafka.asciidoc b/metricbeat/docs/modules/kafka.asciidoc index c83a1f850e2..054d8cdb2be 100644 --- a/metricbeat/docs/modules/kafka.asciidoc +++ b/metricbeat/docs/modules/kafka.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-kafka]] == Kafka module -beta[] - This is the Kafka module. The default metricsets are `consumergroup` and `partition`. diff --git a/metricbeat/docs/modules/kafka/consumergroup.asciidoc b/metricbeat/docs/modules/kafka/consumergroup.asciidoc index 1614873779b..9072a7c97b4 100644 --- a/metricbeat/docs/modules/kafka/consumergroup.asciidoc +++ b/metricbeat/docs/modules/kafka/consumergroup.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-kafka-consumergroup]] === Kafka consumergroup metricset -beta[] - include::../../../module/kafka/consumergroup/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/kafka/partition.asciidoc b/metricbeat/docs/modules/kafka/partition.asciidoc index b92b1145f82..7801eaa16af 100644 --- a/metricbeat/docs/modules/kafka/partition.asciidoc +++ b/metricbeat/docs/modules/kafka/partition.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-kafka-partition]] === Kafka partition metricset -beta[] - include::../../../module/kafka/partition/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index ae84778ab72..0d52dcf865a 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -62,9 +62,9 @@ This file is generated! See scripts/docs_collector.py |<> beta[] |<> |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> -|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.2+| .2+| |<> beta[] -|<> beta[] +|<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | +.2+| .2+| |<> +|<> |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .2+| .2+| |<> beta[] |<> beta[] diff --git a/metricbeat/module/kafka/_meta/fields.yml b/metricbeat/module/kafka/_meta/fields.yml index e6b507c1449..7a0a6fed135 100644 --- a/metricbeat/module/kafka/_meta/fields.yml +++ b/metricbeat/module/kafka/_meta/fields.yml @@ -3,7 +3,7 @@ description: > Kafka module short_config: false - release: beta + release: ga fields: - name: kafka type: group diff --git a/metricbeat/module/kafka/consumergroup/_meta/fields.yml b/metricbeat/module/kafka/consumergroup/_meta/fields.yml index 62b437000cd..0cea9183255 100644 --- a/metricbeat/module/kafka/consumergroup/_meta/fields.yml +++ b/metricbeat/module/kafka/consumergroup/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > consumergroup - release: beta + release: ga fields: - name: broker type: group diff --git a/metricbeat/module/kafka/consumergroup/consumergroup.go b/metricbeat/module/kafka/consumergroup/consumergroup.go index c79ad06d1ad..595e10d4ebc 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup.go @@ -24,7 +24,6 @@ import ( "github.com/pkg/errors" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/common/transport/tlscommon" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/mb" @@ -57,8 +56,6 @@ var debugf = logp.MakeDebug("kafka") // New creates a new instance of the MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The kafka consumergroup metricset is beta") - config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { return nil, err diff --git a/metricbeat/module/kafka/fields.go b/metricbeat/module/kafka/fields.go index 80e88dd2b5b..8ca7baf6837 100644 --- a/metricbeat/module/kafka/fields.go +++ b/metricbeat/module/kafka/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJy8WE1v4zYQvftXDHJyDlFP7UGHAm1SFEaL3UV292zQ4sgmTJFaknbW/35ByrIlSqQ+7ESnmJHeexwO3wz5BHs8pbAn+Z4sAAwzHFN4+M/+flgAUNSZYqVhUqTw5wIAwP0PCkkPHBcAeieVWWdS5GybQk64tqMKORKNKWzQWOCcIac6dQBPIEiBV1L7mFOJKWyVPJTnkR7mNkwTaqPkHtVluA8viFk9fzsEeJZCHwpU8K/9FFYil6og9gPYkSPCBlGAQkIhV7KA5fmzHRGUM7FtQZodQlbjOSmPSeMFfy7N+TDaGq7nw6VHEZ1SY1qMLnp5CKUKte4l2+PpTSpfyDg+Qo+oDNNILxSdNTOyZFli/+6sW5c6QvvN4jjMEAcqJVWSSdpl8iI6SOOgwEIlXbaSKMPst0lr/aYyfalhgNEoi5vduocrHr8W2XfBfhwQGAWZu4wtr+zCDVQxHNZR7cGPkQNEUPerIk064up95zvAZF8IAfkGVz+xXd1xqbCiSlWpMCMGaQp/JL/P2oj39DMY9rRQBCDmbRDztxFThZbP1SNB/n7PgwHfm6bD55hi8iN811/VlziR2zKTuEYnXsN8oxIu23h8XRut4eqXQ4GQea7RzCqtl6SvMIAJIxvmtEEmtm4jxRUUbbe48hv86Qtr8x+0kcVVhgUCSgwBbVRzp/bS9lbA8ZPv5rrr3S5qfrsGolkgo5IyzlD0r0W/GUb1/KU12wqkZ1i3EnZF8IjC6MrcQjl4g2GN9IrnStTqBZZV4DQaY+VVahNGH4d9aye1H665QlpQQcICi41f0GexMmFQCcK9ynEmaO7amF1MLt19IHPKdsQ15mTqkTBONhzPuLrudLbsiKLRVU3MUoFvGEmQ+aX1kwOufc9vy3yZjbBx+j6CPjvgYUEzCtGM9bxWH+vGH9EMxQrjCMHQOWLUo0GVHAntNK4jlA7q+N8B23Z/WTXHnW6yESodVkCUIqeZEpjLJQsPjOowv8KSs8yv3veIwmuF3B+GcDyEPolsPSRrIyVH4qf7SGUrQZnNNQ0srwMATAMTGT9QpPWhjIknK6Z+xaCtcLBcfX0dNRO9Hsiwd5mEFe7xBiUGGyi4w/r/c+mZqkYlR5PtbHsw1tQi1xxRfTedME3nQiQszbvlgfsdQLq6xh5JzlcHU67abj+Pe2yeljnXcbdrCh5WF78CAAD//1a2ff4=" + return "eJy8WE9z2y4QvftT7OTkHKLf6deDD51pk07H007bSduzB4uVzRiBCtipv30HZNkSEuiPnegUE+m9x7K8XXiAHR4XsCPZjswADDMcF3D3xf6+mwFQ1KlihWFSLOD9DADA/Q9ySfccZwB6K5VZpVJkbLOAjHBtRxVyJBoXsLGwGUNO9cJ9/gCC5HihtI85FvZVJffFaaSDtwlTh1oruUN1Hu7CC2KWz0eHAI9S6H2OCj7bT2EpMqlyYj+ALTkgrBEFKCQUMiVzmJ8+2xJBORObBqTZIqQVnpNyn9Re8OdSnw+jjeFqPlx6FNEp1abF6KyTh1CqUOtOsh0eX6TyhQzjI/SAyjCN9EzRWjMjC5Ym9u/WurWpI7S/LI7DDHGgUlIlqaRtJi+ivTQOCixU0mYriDLMfps01m8s048KBhiNsrjZrTq44vFrkP0W7M8egVGQmcvY4sIu3EAZw34d5R58GzlABHW/StKkJa7ad74DjPaFEFDT3qontqdbHhXWU2oqFKbEIF3Au+T/Sdvwlm4G/Y4WigDEnA1i7jZgqtBwuWokyN/teNDjeuN0+BxjLH6A6/qr+hQnchtmFNfgxKtZb1TCeRMPr2qDNVzcsi8QMss0mkmF9Zz0JQYwYWTNmtbIxMZtpLiCHA3p5Df41xfW5N9rI/OLDAsElBgC2qj6Tu2k7ax/wyffznXXuZ3V/HcJRL08RiWlnKHoXotuM4zq+aA12wikJ1i3EnZF8IDC6NLcQjl4hWEN9IrHUtTyCeZl4DQaY+WVahNG7/t9ayu1H66pQhpQQcIc87VfziexMmFQCcK9ynEiqO/amF2MLtxdIOOLdsQzpuTpgTBO1hxPuLrqcjbsgKLWUY3MUYEvGEmP6YX1mwOuXM9vyXyZtbBx+jqCvjvgfkETytCE9bzUHuvFb9EKxcriAMHQOl5Uo0GVHAltta0DlPbq+OqAbas/L1vjVi9ZC5UOKyBKkeNECczlkoUHRnWYX2HBWerX7ltE4blE7g5DOB5CH0W66pO1lpIj8dN9oLKloMzmmgaWVQEApoGJlO8p0upAxsSDFVO9YtDWN5gvfz4Pmole9WTYq0zCCvd4gxKD7RPcYP0/nTumsk3J0KRb2xwMNbXIFUdU31XnS9O6DAlL82544HbHj7auoQeS07XBmGu260/jHpunZcpV3PWagkfV2b8AAAD///99e4I=" } diff --git a/metricbeat/module/kafka/partition/_meta/fields.yml b/metricbeat/module/kafka/partition/_meta/fields.yml index ae6049c6a83..12d355b9aa9 100644 --- a/metricbeat/module/kafka/partition/_meta/fields.yml +++ b/metricbeat/module/kafka/partition/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > partition - release: beta + release: ga fields: - name: offset type: group diff --git a/metricbeat/module/kafka/partition/partition.go b/metricbeat/module/kafka/partition/partition.go index bd68c155415..cd07ee144b1 100644 --- a/metricbeat/module/kafka/partition/partition.go +++ b/metricbeat/module/kafka/partition/partition.go @@ -23,7 +23,6 @@ import ( "fmt" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/common/transport/tlscommon" "github.com/elastic/beats/libbeat/logp" "github.com/elastic/beats/metricbeat/mb" @@ -57,8 +56,6 @@ var debugf = logp.MakeDebug("kafka") // New creates a new instance of the partition MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The kafka partition metricset is beta") - config := defaultConfig if err := base.Module().UnpackConfig(&config); err != nil { return nil, err