diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 1528f0e57186..3d49701a0498 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -274,6 +274,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di - Set all metricsets as default metricsets in uwsgi module. {pull}6688[6688] - Mark kubernetes.event metricset as beta. {pull}6715[6715] - Set all metricsets as default metricsets in couchbase module. {pull}6683[6683] +- Mark Golang module and metricsets as beta. {pull}6711[6711] - Mark system.raid metricset as beta. {pull}6710[6710] - Mark http.server metricset as beta. {pull}6712[6712] - Mark metricbeat logstash module and metricsets as beta. {pull}6713[6713] diff --git a/metricbeat/docs/modules/golang.asciidoc b/metricbeat/docs/modules/golang.asciidoc index bd078c015f18..d23b3cb2654c 100644 --- a/metricbeat/docs/modules/golang.asciidoc +++ b/metricbeat/docs/modules/golang.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-golang]] == Golang module -experimental[] +beta[] The golang module collects metrics by submitting HTTP GET requests to https://golang.org/pkg/expvar/[golang-expvar-api]. diff --git a/metricbeat/docs/modules/golang/expvar.asciidoc b/metricbeat/docs/modules/golang/expvar.asciidoc index 9029744fb92c..7a6b81653cf3 100644 --- a/metricbeat/docs/modules/golang/expvar.asciidoc +++ b/metricbeat/docs/modules/golang/expvar.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-golang-expvar]] === Golang expvar metricset -experimental[] +beta[] include::../../../module/golang/expvar/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/golang/heap.asciidoc b/metricbeat/docs/modules/golang/heap.asciidoc index f40f20d2287b..136041dd3e95 100644 --- a/metricbeat/docs/modules/golang/heap.asciidoc +++ b/metricbeat/docs/modules/golang/heap.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-golang-heap]] === Golang heap metricset -experimental[] +beta[] include::../../../module/golang/heap/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index d6129ed4028f..41cedba679b9 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -39,9 +39,9 @@ This file is generated! See scripts/docs_collector.py .3+| |<> beta[] |<> beta[] |<> beta[] -|<> experimental[] | -.2+| |<> experimental[] -|<> experimental[] +|<> beta[] | +.2+| |<> beta[] +|<> beta[] |<> beta[] | .1+| |<> beta[] |<> | diff --git a/metricbeat/module/golang/_meta/fields.yml b/metricbeat/module/golang/_meta/fields.yml index f980a17ca94f..c0b1b36fbbcc 100644 --- a/metricbeat/module/golang/_meta/fields.yml +++ b/metricbeat/module/golang/_meta/fields.yml @@ -3,7 +3,7 @@ description: > Golang module short_config: false - release: experimental + release: beta settings: ["ssl"] fields: - name: golang diff --git a/metricbeat/module/golang/expvar/_meta/fields.yml b/metricbeat/module/golang/expvar/_meta/fields.yml index a6b740abddc9..b316b60508e7 100644 --- a/metricbeat/module/golang/expvar/_meta/fields.yml +++ b/metricbeat/module/golang/expvar/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > expvar - release: experimental + release: beta fields: - name: cmdline type: keyword diff --git a/metricbeat/module/golang/expvar/expvar.go b/metricbeat/module/golang/expvar/expvar.go index cb3376fb22cc..e7c7dbf41eae 100644 --- a/metricbeat/module/golang/expvar/expvar.go +++ b/metricbeat/module/golang/expvar/expvar.go @@ -44,7 +44,7 @@ type MetricSet 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.Experimental("The golang expvar metricset is experimental") + cfgwarn.Beta("The golang expvar metricset is beta") config := struct { Namespace string `config:"expvar.namespace" validate:"required"` diff --git a/metricbeat/module/golang/heap/_meta/fields.yml b/metricbeat/module/golang/heap/_meta/fields.yml index 7675349d4ed6..b37a746b91ae 100644 --- a/metricbeat/module/golang/heap/_meta/fields.yml +++ b/metricbeat/module/golang/heap/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > The golang program heap information exposed by expvar. - release: experimental + release: beta fields: - name: cmdline type: keyword diff --git a/metricbeat/module/golang/heap/heap.go b/metricbeat/module/golang/heap/heap.go index 44b138ce562d..61da13dffc10 100644 --- a/metricbeat/module/golang/heap/heap.go +++ b/metricbeat/module/golang/heap/heap.go @@ -48,7 +48,7 @@ type MetricSet 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.Experimental("The golang heap metricset is experimental") + cfgwarn.Beta("The golang heap metricset is beta") http, err := helper.NewHTTP(base) if err != nil {