diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index efa568b8f086..5a1a18fd05d4 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 metricbeat logstash module and metricsets as beta. {pull}6713[6713] *Packetbeat* diff --git a/metricbeat/docs/modules/logstash.asciidoc b/metricbeat/docs/modules/logstash.asciidoc index 956991321be7..4fd00c867a1f 100644 --- a/metricbeat/docs/modules/logstash.asciidoc +++ b/metricbeat/docs/modules/logstash.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-logstash]] == Logstash module -experimental[] +beta[] This is the Logstash module. diff --git a/metricbeat/docs/modules/logstash/node.asciidoc b/metricbeat/docs/modules/logstash/node.asciidoc index e93d6ef3bb3c..1470332454d0 100644 --- a/metricbeat/docs/modules/logstash/node.asciidoc +++ b/metricbeat/docs/modules/logstash/node.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-logstash-node]] === Logstash node metricset -experimental[] +beta[] include::../../../module/logstash/node/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/logstash/node_stats.asciidoc b/metricbeat/docs/modules/logstash/node_stats.asciidoc index 7632977866f7..bcec5c351029 100644 --- a/metricbeat/docs/modules/logstash/node_stats.asciidoc +++ b/metricbeat/docs/modules/logstash/node_stats.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-logstash-node_stats]] === Logstash node_stats metricset -experimental[] +beta[] include::../../../module/logstash/node_stats/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 11a484b49523..501ffe810fcb 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 |<> |<> |<> -|<> experimental[] | -.2+| |<> experimental[] -|<> experimental[] +|<> beta[] | +.2+| |<> beta[] +|<> beta[] |<> beta[] | .1+| |<> beta[] |<> | diff --git a/metricbeat/module/logstash/_meta/fields.yml b/metricbeat/module/logstash/_meta/fields.yml index fd124eb01265..a4bc50882f19 100644 --- a/metricbeat/module/logstash/_meta/fields.yml +++ b/metricbeat/module/logstash/_meta/fields.yml @@ -2,7 +2,7 @@ title: "Logstash" description: > Logstash module - release: experimental + release: beta settings: ["ssl"] fields: - name: logstash diff --git a/metricbeat/module/logstash/node/_meta/fields.yml b/metricbeat/module/logstash/node/_meta/fields.yml index 5ca497fc9ad5..5fe3293fd925 100644 --- a/metricbeat/module/logstash/node/_meta/fields.yml +++ b/metricbeat/module/logstash/node/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > node + release: beta fields: - name: host type: keyword diff --git a/metricbeat/module/logstash/node/node.go b/metricbeat/module/logstash/node/node.go index bda26fe20808..6079cb87aade 100644 --- a/metricbeat/module/logstash/node/node.go +++ b/metricbeat/module/logstash/node/node.go @@ -32,7 +32,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The logstash node metricset is experimental") + cfgwarn.Beta("The logstash node metricset is beta") http, err := helper.NewHTTP(base) if err != nil { return nil, err diff --git a/metricbeat/module/logstash/node_stats/_meta/fields.yml b/metricbeat/module/logstash/node_stats/_meta/fields.yml index d718ec55cf1d..d65c8d42298a 100644 --- a/metricbeat/module/logstash/node_stats/_meta/fields.yml +++ b/metricbeat/module/logstash/node_stats/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > node_stats metrics. - release: experimental + release: beta fields: - name: events type: group diff --git a/metricbeat/module/logstash/node_stats/node_stats.go b/metricbeat/module/logstash/node_stats/node_stats.go index 8d5d8d25ea85..44d0ecc1dda8 100644 --- a/metricbeat/module/logstash/node_stats/node_stats.go +++ b/metricbeat/module/logstash/node_stats/node_stats.go @@ -32,7 +32,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The logstash node_stats metricset is experimental") + cfgwarn.Beta("The logstash node_stats metricset is beta") http, err := helper.NewHTTP(base) if err != nil {