Skip to content

Commit

Permalink
Cherry-pick #10212 to 6.x: Release kubernetes apiserver and event met…
Browse files Browse the repository at this point in the history
…ricsets as GA (#10343)

* Release kubernetes apiserver and event metricsets as GA (#10212)

Rest of the module was GA already

(cherry picked from commit f95ec5d)

* Update CHANGELOG.next.asciidoc
  • Loading branch information
exekias authored Jan 28, 2019
1 parent 3334adf commit 8ae2509
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 12 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
- Release php_fpm module as GA. {pull}10198[10198]
- Release Memcached module as GA. {pull}10199[10199]
- Release etcd module as GA. {pull}10200[10200]
- Release kubernetes apiserver and event metricsets as GA {pull}10212[10212]
- Release Couchbase module as GA. {pull}10201[10201]
- Release aerospike module as GA. {pull}10203[10203]
- Release envoyproxy module GA. {pull}10223[10223]
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/kubernetes/apiserver.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/kubernetes/event.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]


Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ This file is generated! See scripts/docs_collector.py
.2+| .2+| |<<metricbeat-metricset-kibana-stats,stats>>
|<<metricbeat-metricset-kibana-status,status>>
|<<metricbeat-module-kubernetes,Kubernetes>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.13+| .13+| |<<metricbeat-metricset-kubernetes-apiserver,apiserver>> beta[]
.13+| .13+| |<<metricbeat-metricset-kubernetes-apiserver,apiserver>>
|<<metricbeat-metricset-kubernetes-container,container>>
|<<metricbeat-metricset-kubernetes-event,event>> beta[]
|<<metricbeat-metricset-kubernetes-event,event>>
|<<metricbeat-metricset-kubernetes-node,node>>
|<<metricbeat-metricset-kubernetes-pod,pod>>
|<<metricbeat-metricset-kubernetes-state_container,state_container>>
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kubernetes/apiserver/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
Kubernetes API server metrics
release: beta
release: ga
fields:
- name: request.client
type: keyword
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kubernetes/event/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/kubernetes/event/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kubernetes/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8ae2509

Please sign in to comment.