Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Marking Elasticsearch module and its metricsets as beta #7662

Merged
merged 2 commits into from
Jul 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/elasticsearch/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/elasticsearch/ml_job.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/elasticsearch/shard.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
12 changes: 6 additions & 6 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-module-dropwizard,Dropwizard>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-dropwizard-collector,collector>> beta[]
|<<metricbeat-module-elasticsearch,Elasticsearch>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.8+| .8+| |<<metricbeat-metricset-elasticsearch-index,index>> experimental[]
|<<metricbeat-metricset-elasticsearch-index_recovery,index_recovery>> experimental[]
|<<metricbeat-metricset-elasticsearch-index_summary,index_summary>> experimental[]
|<<metricbeat-metricset-elasticsearch-ml_job,ml_job>> experimental[]
.8+| .8+| |<<metricbeat-metricset-elasticsearch-index,index>> beta[]
|<<metricbeat-metricset-elasticsearch-index_recovery,index_recovery>> beta[]
|<<metricbeat-metricset-elasticsearch-index_summary,index_summary>> beta[]
|<<metricbeat-metricset-elasticsearch-ml_job,ml_job>> beta[]
|<<metricbeat-metricset-elasticsearch-node,node>> beta[]
|<<metricbeat-metricset-elasticsearch-node_stats,node_stats>> beta[]
|<<metricbeat-metricset-elasticsearch-pending_tasks,pending_tasks>> experimental[]
|<<metricbeat-metricset-elasticsearch-shard,shard>> experimental[]
|<<metricbeat-metricset-elasticsearch-pending_tasks,pending_tasks>> beta[]
|<<metricbeat-metricset-elasticsearch-shard,shard>> beta[]
|<<metricbeat-module-etcd,Etcd>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.3+| .3+| |<<metricbeat-metricset-etcd-leader,leader>> beta[]
|<<metricbeat-metricset-etcd-self,self>> beta[]
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/fields.go

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

1 change: 1 addition & 0 deletions metricbeat/module/elasticsearch/index/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
index
release: beta
fields:
- name: name
type: keyword
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/index/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
index
release: beta
fields:
- name: id
type: long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
index
release: beta
fields:
- name: primaries
type: group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/elasticsearch/ml_job/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
ml
release: beta
fields:
- name: id
type: keyword
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/ml_job/ml_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
`cluster.pending_task` contains a pending task description.
release: beta
fields:
- name: insert_order
type: long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/elasticsearch/shard/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
shard fields
release: beta
fields:
- name: primary
type: boolean
Expand Down