From f95ec5dd18084de0396b6945c49eb08e15511232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Mon, 21 Jan 2019 17:45:13 +0100 Subject: [PATCH] Release kubernetes apiserver and event metricsets as GA (#10212) Rest of the module was GA already --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/kubernetes/apiserver.asciidoc | 2 -- metricbeat/docs/modules/kubernetes/event.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 4 ++-- metricbeat/module/kubernetes/apiserver/_meta/fields.yml | 2 +- metricbeat/module/kubernetes/event/_meta/fields.yml | 2 +- metricbeat/module/kubernetes/event/event.go | 3 --- metricbeat/module/kubernetes/fields.go | 2 +- 8 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b102d2676c00..d8c3b968e8ae 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -178,6 +178,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Release etcd module as GA. {pull}10200[10200] - Release Ceph module as GA. {pull}10202[10202] - 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] diff --git a/metricbeat/docs/modules/kubernetes/apiserver.asciidoc b/metricbeat/docs/modules/kubernetes/apiserver.asciidoc index f32fa961bdd9..9f37b58ae7f8 100644 --- a/metricbeat/docs/modules/kubernetes/apiserver.asciidoc +++ b/metricbeat/docs/modules/kubernetes/apiserver.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-kubernetes-apiserver]] === Kubernetes apiserver metricset -beta[] - include::../../../module/kubernetes/apiserver/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/kubernetes/event.asciidoc b/metricbeat/docs/modules/kubernetes/event.asciidoc index 55bff4255079..b45468e6ba5a 100644 --- a/metricbeat/docs/modules/kubernetes/event.asciidoc +++ b/metricbeat/docs/modules/kubernetes/event.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-kubernetes-event]] === Kubernetes event metricset -beta[] - include::../../../module/kubernetes/event/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 4ede237ad7c6..d6cb559b1fb4 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -70,9 +70,9 @@ This file is generated! See scripts/docs_collector.py .2+| .2+| |<> |<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.13+| .13+| |<> beta[] +.13+| .13+| |<> |<> -|<> beta[] +|<> |<> |<> |<> diff --git a/metricbeat/module/kubernetes/apiserver/_meta/fields.yml b/metricbeat/module/kubernetes/apiserver/_meta/fields.yml index a8ceb71e2793..c1fb4b055d39 100644 --- a/metricbeat/module/kubernetes/apiserver/_meta/fields.yml +++ b/metricbeat/module/kubernetes/apiserver/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > Kubernetes API server metrics - release: beta + release: ga fields: - name: request.client type: keyword diff --git a/metricbeat/module/kubernetes/event/_meta/fields.yml b/metricbeat/module/kubernetes/event/_meta/fields.yml index d33a70e79c9a..a2854bfd8f42 100644 --- a/metricbeat/module/kubernetes/event/_meta/fields.yml +++ b/metricbeat/module/kubernetes/event/_meta/fields.yml @@ -3,7 +3,7 @@ description: > The Kubernetes events metricset collects events that are generated by objects running inside of Kubernetes - release: beta + release: ga fields: - name: count type: long diff --git a/metricbeat/module/kubernetes/event/event.go b/metricbeat/module/kubernetes/event/event.go index a6813624eed1..2d10068d8a56 100644 --- a/metricbeat/module/kubernetes/event/event.go +++ b/metricbeat/module/kubernetes/event/event.go @@ -22,7 +22,6 @@ import ( "time" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/libbeat/common/kubernetes" "github.com/elastic/beats/libbeat/common/safemapstr" "github.com/elastic/beats/metricbeat/mb" @@ -57,8 +56,6 @@ type dedotConfig 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 kubernetes event metricset is beta") - config := defaultKubernetesEventsConfig() err := base.Module().UnpackConfig(&config) diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index c4932629092d..d3452c3b9c53 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/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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" }