diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index cebb87ce771..ad16e87e569 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -312,6 +312,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Add Elasticsearch index recovery metricset. {pull}7225[7225] - Run Kafka integration tests on version 1.1.0 {pull}7616[7616] - Release raid and socket metricset from system module as GA. {pull}7658[7658] +- Release elasticsearch module and all its metricsets as beta. {pull}7662[7662] *Packetbeat* diff --git a/metricbeat/docs/modules/elasticsearch/index.asciidoc b/metricbeat/docs/modules/elasticsearch/index.asciidoc index ac7068b734c..a0507662484 100644 --- a/metricbeat/docs/modules/elasticsearch/index.asciidoc +++ b/metricbeat/docs/modules/elasticsearch/index.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-elasticsearch-index]] === Elasticsearch index metricset -experimental[] +beta[] include::../../../module/elasticsearch/index/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/elasticsearch/index_recovery.asciidoc b/metricbeat/docs/modules/elasticsearch/index_recovery.asciidoc index 8c18a79e830..b93dae1af63 100644 --- a/metricbeat/docs/modules/elasticsearch/index_recovery.asciidoc +++ b/metricbeat/docs/modules/elasticsearch/index_recovery.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-elasticsearch-index_recovery]] === Elasticsearch index_recovery metricset -experimental[] +beta[] include::../../../module/elasticsearch/index_recovery/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/elasticsearch/index_summary.asciidoc b/metricbeat/docs/modules/elasticsearch/index_summary.asciidoc index 3ec0e62ef19..41fe56869b1 100644 --- a/metricbeat/docs/modules/elasticsearch/index_summary.asciidoc +++ b/metricbeat/docs/modules/elasticsearch/index_summary.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-elasticsearch-index_summary]] === Elasticsearch index_summary metricset -experimental[] +beta[] include::../../../module/elasticsearch/index_summary/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/elasticsearch/ml_job.asciidoc b/metricbeat/docs/modules/elasticsearch/ml_job.asciidoc index 5b0a27380f7..374c9dfc620 100644 --- a/metricbeat/docs/modules/elasticsearch/ml_job.asciidoc +++ b/metricbeat/docs/modules/elasticsearch/ml_job.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-elasticsearch-ml_job]] === Elasticsearch ml_job metricset -experimental[] +beta[] include::../../../module/elasticsearch/ml_job/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/elasticsearch/pending_tasks.asciidoc b/metricbeat/docs/modules/elasticsearch/pending_tasks.asciidoc index 4a6ed4586f9..eef6ac66d1a 100644 --- a/metricbeat/docs/modules/elasticsearch/pending_tasks.asciidoc +++ b/metricbeat/docs/modules/elasticsearch/pending_tasks.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-elasticsearch-pending_tasks]] === Elasticsearch pending_tasks metricset -experimental[] +beta[] include::../../../module/elasticsearch/pending_tasks/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/elasticsearch/shard.asciidoc b/metricbeat/docs/modules/elasticsearch/shard.asciidoc index c463610725a..9c13a6544e2 100644 --- a/metricbeat/docs/modules/elasticsearch/shard.asciidoc +++ b/metricbeat/docs/modules/elasticsearch/shard.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-elasticsearch-shard]] === Elasticsearch shard metricset -experimental[] +beta[] include::../../../module/elasticsearch/shard/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 809bab134b9..94a0d06d86f 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -33,14 +33,14 @@ This file is generated! See scripts/docs_collector.py |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | -.8+| .8+| |<> experimental[] -|<> experimental[] -|<> experimental[] -|<> experimental[] +.8+| .8+| |<> beta[] +|<> beta[] +|<> beta[] +|<> beta[] |<> beta[] |<> beta[] -|<> experimental[] -|<> experimental[] +|<> beta[] +|<> beta[] |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .3+| .3+| |<> beta[] |<> beta[] diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 196650b03eb..b917d9823af 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJzsWt1u4zYTvfdTDHIfPYAvvpsP3TYFdrtosgWKovDS4thmwh8tSXnjPn1BSnIkirJkWY69qHVn2T7nzHBmOEPpHl5wNwfkxFiWGiQ63cwALLMc53D3U/3+3QyAokk1yyxTcg7/mwEANH4DQtGc4wxAI0dicA5LtGQGYNBaJtdmDn/dGcPv/nb3NkrbRarkiq3nsCLcuH+uGHJq5h78HiQR2BboLrvLcA5rrfKsvBNR14SrQ6Y8NxZ14j7tv6xQX3D3XWlaux/FLq6mB0pcz5LMOmkZPQcpowcojSUWJyb2mJ42ZGWS4muLqr5cPUQhQLiQdbJgEQ+Z1sPqrgfHXC5gjM0qS3iULjSvS3cdjarUJKnKpW39pILlSq4jX/aY4a4nJxVkLpaoQa0cWS5QWgNMgt1g4eXksDiKHC2GTjyLvILpaJnGKo2JYf9gstxZNMdKXSktiJ1D158Hm+IkOEP2mp0BHvWAeFx7W98tCAphe9p+YQKF0rsLu/ZNfyEHcoMUljvv60pqxN3xypRoTNUW9e69ShQL86fTaz0eedwQTaGS36i9dT4HP11JDEgdUpw200yQhlffmJdKcSTyOOYnnSOwVQUMximJcxtL1hPa/HtlrceNBFSd2xK9Rpt0rPIo/icPCVJR7F7lgnajTFg4CmIW7kZHcDpQIJRqNOYg+7S7b11Ccw+OL7rKdYqTOv7RQx52fEk7mePrnP2OL9mndXxdQtPxzcppchGk+FkLZ5H4rLV53DquSeTdOq5bx9Wr/7iOC26z0i1zb5n7A2ZuZY3gybNanrLDC37aXDSqg/ki2bccQXB4Vsvu1s0SO2Hb9KtaFpBxNkosWfhoNUmmVYrGIF24SUrTRSyKx86FnytwTwm4bQdsTBOTW8IZXVBicVI9TxusxWFhsIHvzG4Amd2gBgKCGcPk2gnCIkpAufv+s90QC6nKOQWpLCwRMqIN0shA0Apg18SeEr7B/8PT7Op6vzPJT+2uvE62RW2YCkfrU/lK1Djl81YM3tf7UuiPj/AgVyosr33tQNzqPssHCKpERR1QV1BW+w2SLGGS2YvV/V+QZOAUNEq9s6F/U60bIcjrZW0Q5HW8CVLJyy/FJyXvJ1iOypZLrsjelOGr8ja2++0oEVylL4THZ4BRJ4IPqwocHDZSp6R0WnQj8E++zKnbwSJEGbMpMElZesRRxpAqXWJCqK9LC1xqoMJXZqzf7quR5XqHqSsaQX604aOa63pOCGDCmXTUzOlJe6rY81Y4pyaZUnyyrHXFs5zLHO6oxFW8Oy1ikgZ66TdO29La69atr67x0M4FfUsKA0IyNKrjJwAfyWtXCNYFZ0herkTxZyQvQyUvrsfRXrYY5m3XT1yJ7C9Fa3OwRu1UHhVycs796YBvWXcNim9Zd21ZZ3K9ZVulz5F4jyX2LfeuQfEt9y6de50d8DpNUsU5plbpybrgn/8Pe9B41g3ogStdh04BT2yH3xhgnY4tDF2zIgxZ9AFC9wVodGT1kDS6oDN7vWiI/tt+j+biykRevoFTkvAD4whmZywKiEP3JaF/wH+RE4e9VzRe5lF2JYBsCeNkyd9XRfh6f4aSMrleWGJeZiH1EWedX2OAXyFV0hImDRAovwD3RR2pnqSHD0ENartQmmLY14192PjgIaENWXuLTGlm44kz5mFrBK75dl6U6YQX8xL4oDTgKxEZdwbl9l6QLGOB9H1eMoELJhffcswxadWn0U91mfBnZh62FYv+5dxTgs8DlMEzMJrO9sax3TADzPizwgFvHxcHtlO5ufHw3CsJqOORN+2rDU/+lJRYDEX8GwAA//8W5g1w" + return "eJzsW92O2zYTvfdTDPZ+9QC++G4+NO0WSBo0mwJFUTi0OLa5yx+FpJx1n74gJXklirJkWRs5qHW3sn3OmeHMcIbS3sMzHpaAnBjLUoNEp7sFgGWW4xLufqrfv1sAUDSpZpllSi7hfwsAgMZ3QCiac1wAaORIDC5hjZYsAAxay+TWLOGvO2P43d/u3k5pu0qV3LDtEjaEG/fLDUNOzdKD34MkAtsC3WUPGS5hq1WelXci6ppwdciU58aiTtxfxw8r1Gc8fFOa1u5HsYur6YES17Mki05aRt+ClNETlMYSixMTe0xPG7IySfGlRVVfrh6iECCMqOoKF7guIljcUyb3qHHXg1NULmyMzSpLeJQuNLtLdx2NqtQkqcqlbX2lguVKbiMf9pjhrkcnFWQu1qhBbRxZLlBaA0yC3WHh/eS0OIocLYZOfBN5BdPZMo1VGhPD/sFkfbBozpW6UVoQu4SuHw82xUlwhhw1OwM86gnxuPW2frcgKIQdafuFCRRKH2Z27av+Qg7kBimsD97XldSIu+MVK9GYqj3qw9yli4V51enNHk992hFNoTKrUavrfA5+ulIZkDqkOG2mmSANb78yr5XiSOR5zI86R2CbChiMUxLnNpZsJ7T598pajxsJtDq3JXqLNulY5VH8jx4SpKLYvcoF7U6ZsKAUxCzcpc7gdKBAKNVozEn2aXfluoTm3hxfdJXrFCd1/CcPedrxJe1kjq9z9ju+ZJ/W8XUJTcc3K6rJRZDisxTUoiCw1mZz69AmkXfr0G4dWq/+8zo0uM1Wt8y9Ze4PmLmVNYInT2p9yc4v+NvMUaM6ns+Sfc0RBIcnte5u9SyxE7ZZv6p1ARlno8SSlY9ik2RapWgM0pWbvDRdxaJ77Bz5sQL3lID7diDHNDG5J5zRFSUWJ9XzuMNafBYGG/jG7A6Q2R1qICCYMUxunSAsogSUu+//tjtiIVU5pyCVhTVCRrRBGhkgWoHtmt5Lwjr4/fxnmx/aXXydbI/aMBWO4pfylahxyqe9GLzf96XQH+/hQW5UWHb72oS41X2WDxBUiYo6oK6g3AV2SLKESWZn2w9+QZKBU9DYApwN/Ztt3QhBXua1QZCX8SZIJedfig9K3k+wHJUtc67I0ZThq/I6zvvtKBFcpc+Ex2eDUSeID5sKHBw2UqekdFp0I/BP1syl28EqRBnV7UjK0jOOOIZU6RITQn1dWmCuQQtfmLF+u69Gmesdsq5oNPnRhpJq3us5OYAJZ9VRs6gn7aliT3vhnJpkSvHJstYVz3Jec7ijElfx7rSISRropd84bUtrr1u3vrrGUzsX9C0pDAjJ0KiOrwC8Jy9dIVgXnCF5vhLFH5E8D5W8uh5He9limLddP3Elsj8Xrc3JGnVQeVTIxTn3pwO+Zd01KL5l3bVlncn1nu2VfovE+1Ri33LvGhTfcm/u3OvsgLdpkirOMbVKT9YF//x/OILGs25AD1zpOnUKeGE7/MoA23RsYeiaFWHIog8QeixAoyOrh6TRBb2x14uG6L/t92gubkzkZR24JAnfMY5gDsaigDh0XxL6B/+znDgcvaJxnkfclQCyJ4yTNf++KsJ/H8hQUia3K0vM8yKkPuOs80sM8AukSlrCpAEC5QfgPqgj1ZN03OGoQW1XSlMM+72xDyEfPCS0IWtvnSnNbDyhxjyEjcA13/KLMl3wgl8C75QGfCEi486g3N4LkmUskH7MVyZwxeTqa445Jq26NfppLxP+LM3DtmLUv+R7SVB6gDJ4LoyyN3uj2e6YAWb82eKAt5uLA96p3N942O6VBNTxiJz2VYhHf6pKLIYi/g0AAP//s2UyNg==" } diff --git a/metricbeat/module/elasticsearch/index/_meta/fields.yml b/metricbeat/module/elasticsearch/index/_meta/fields.yml index 1e9ee003936..01772e33894 100644 --- a/metricbeat/module/elasticsearch/index/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > index + release: beta fields: - name: name type: keyword diff --git a/metricbeat/module/elasticsearch/index/index.go b/metricbeat/module/elasticsearch/index/index.go index a4162b4b6be..622d90794ae 100644 --- a/metricbeat/module/elasticsearch/index/index.go +++ b/metricbeat/module/elasticsearch/index/index.go @@ -43,7 +43,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The elasticsearch index metricset is experimental") + cfgwarn.Beta("The elasticsearch index metricset is beta") // TODO: This currently gets index data for all indices. Make it configurable. ms, err := elasticsearch.NewMetricSet(base, statsPath) diff --git a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml index bd667b6e8ba..0df224657cd 100644 --- a/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > index + release: beta fields: - name: id type: long diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go index cddc3fa92bb..769839a641f 100644 --- a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go +++ b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go @@ -45,7 +45,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The elasticsearch index_recovery metricset is experimental") + cfgwarn.Beta("The elasticsearch index_recovery metricset is beta") config := struct { ActiveOnly bool `config:"index_recovery.active_only"` diff --git a/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml b/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml index 98396cffbec..0ae26e0201b 100644 --- a/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > index + release: beta fields: - name: primaries type: group diff --git a/metricbeat/module/elasticsearch/index_summary/index_summary.go b/metricbeat/module/elasticsearch/index_summary/index_summary.go index b0744cf4945..379c6aa60fa 100644 --- a/metricbeat/module/elasticsearch/index_summary/index_summary.go +++ b/metricbeat/module/elasticsearch/index_summary/index_summary.go @@ -52,7 +52,7 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The elasticsearch index_summary metricset is experimental") + cfgwarn.Beta("The elasticsearch index_summary metricset is beta") // Get the stats from the local node ms, err := elasticsearch.NewMetricSet(base, statsPath) diff --git a/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml b/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml index 1b321356f2d..41b7b1b98e8 100644 --- a/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > ml + release: beta fields: - name: id type: keyword diff --git a/metricbeat/module/elasticsearch/ml_job/ml_job.go b/metricbeat/module/elasticsearch/ml_job/ml_job.go index 14e834701d0..c712024b9d6 100644 --- a/metricbeat/module/elasticsearch/ml_job/ml_job.go +++ b/metricbeat/module/elasticsearch/ml_job/ml_job.go @@ -43,7 +43,7 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The elasticsearch ml_job metricset is experimental.") + cfgwarn.Beta("The elasticsearch ml_job metricset is beta.") // Get the stats from the local node ms, err := elasticsearch.NewMetricSet(base, jobPath) diff --git a/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml b/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml index 2b9ad086b38..f30856f860c 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > `cluster.pending_task` contains a pending task description. + release: beta fields: - name: insert_order type: long diff --git a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go index b71507aef5b..c6cb6d5d0cb 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go +++ b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go @@ -53,7 +53,7 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The elasticsearch pending_tasks metricset is experimental.") + cfgwarn.Beta("The elasticsearch pending_tasks metricset is beta.") http, err := helper.NewHTTP(base) if err != nil { diff --git a/metricbeat/module/elasticsearch/shard/_meta/fields.yml b/metricbeat/module/elasticsearch/shard/_meta/fields.yml index ee4c7f281fc..97337cfce0d 100644 --- a/metricbeat/module/elasticsearch/shard/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/shard/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > shard fields + release: beta fields: - name: primary type: boolean