Skip to content

Commit

Permalink
Cherry-pick #10094 to 6.x: Release Elastic stack Metricbeat modules a…
Browse files Browse the repository at this point in the history
…s GA (#10183)

Cherry-pick of PR #10094 to 6.x branch. Original message: 

This PR releases the following Elastic stack Metricbeat modules as GA:

* Elasticsearch
* Logstash
* Kibana

Note that the use of the `xpack.enabled` flag with these modules is still experimental. When this setting is set to `true`, a log message will be emitted.
  • Loading branch information
ycombinator authored Jan 24, 2019
1 parent 8733346 commit d1c04af
Show file tree
Hide file tree
Showing 52 changed files with 40 additions and 111 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
- Release Graphite module as GA. {pull}10240[10240]
- Release http.server metricset as GA. {pull}10240[10240]
- Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222]
- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
- Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094]

*Packetbeat*

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch.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-module-elasticsearch]]
== Elasticsearch module

beta[]

The Elasticsearch module contains a minimal set of metrics to enable monitoring of Elasticsearch across multiple versions. To monitor more Elasticsearch metrics, use our {monitoringdoc}/xpack-monitoring.html[monitoring] feature.

The default metricsets are `node` and `node_stats`.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/ccr.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-elasticsearch-ccr]]
=== Elasticsearch ccr metricset

beta[]

include::../../../module/elasticsearch/ccr/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/cluster_stats.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-elasticsearch-cluster_stats]]
=== Elasticsearch cluster_stats metricset

beta[]

include::../../../module/elasticsearch/cluster_stats/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/index.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-elasticsearch-index]]
=== Elasticsearch index metricset

beta[]

include::../../../module/elasticsearch/index/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/index_recovery.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-elasticsearch-index_recovery]]
=== Elasticsearch index_recovery metricset

beta[]

include::../../../module/elasticsearch/index_recovery/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/index_summary.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-elasticsearch-index_summary]]
=== Elasticsearch index_summary metricset

beta[]

include::../../../module/elasticsearch/index_summary/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/ml_job.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-elasticsearch-ml_job]]
=== Elasticsearch ml_job metricset

beta[]

include::../../../module/elasticsearch/ml_job/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/node.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-elasticsearch-node]]
=== Elasticsearch node metricset

beta[]

include::../../../module/elasticsearch/node/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/node_stats.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-elasticsearch-node_stats]]
=== Elasticsearch node_stats metricset

beta[]

include::../../../module/elasticsearch/node_stats/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/pending_tasks.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-elasticsearch-pending_tasks]]
=== Elasticsearch pending_tasks metricset

beta[]

include::../../../module/elasticsearch/pending_tasks/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/elasticsearch/shard.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-elasticsearch-shard]]
=== Elasticsearch shard metricset

beta[]

include::../../../module/elasticsearch/shard/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/kibana.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-module-kibana]]
== Kibana module

beta[]

The Kibana module only tracks the high-level metrics. To monitor more Kibana metrics, use our {monitoringdoc}/xpack-monitoring.html[monitoring] feature.

The default metricset is `status`.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/kibana/stats.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-kibana-stats]]
=== Kibana stats metricset

beta[]

include::../../../module/kibana/stats/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/kibana/status.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-kibana-status]]
=== Kibana status metricset

beta[]

include::../../../module/kibana/status/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/logstash.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-module-logstash]]
== Logstash module

beta[]

This is the Logstash module.

The default metricsets are `node` and `node_stats`.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/logstash/node.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-logstash-node]]
=== Logstash node metricset

beta[]

include::../../../module/logstash/node/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/logstash/node_stats.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-logstash-node_stats]]
=== Logstash node_stats metricset

beta[]

include::../../../module/logstash/node_stats/_meta/docs.asciidoc[]


Expand Down
34 changes: 17 additions & 17 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-docker-network,network>>
|<<metricbeat-module-dropwizard,Dropwizard>> |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-dropwizard-collector,collector>>
|<<metricbeat-module-elasticsearch,Elasticsearch>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.10+| .10+| |<<metricbeat-metricset-elasticsearch-ccr,ccr>> beta[]
|<<metricbeat-metricset-elasticsearch-cluster_stats,cluster_stats>> beta[]
|<<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>> beta[]
|<<metricbeat-metricset-elasticsearch-shard,shard>> beta[]
|<<metricbeat-module-elasticsearch,Elasticsearch>> |image:./images/icon-no.png[No prebuilt dashboards] |
.10+| .10+| |<<metricbeat-metricset-elasticsearch-ccr,ccr>>
|<<metricbeat-metricset-elasticsearch-cluster_stats,cluster_stats>>
|<<metricbeat-metricset-elasticsearch-index,index>>
|<<metricbeat-metricset-elasticsearch-index_recovery,index_recovery>>
|<<metricbeat-metricset-elasticsearch-index_summary,index_summary>>
|<<metricbeat-metricset-elasticsearch-ml_job,ml_job>>
|<<metricbeat-metricset-elasticsearch-node,node>>
|<<metricbeat-metricset-elasticsearch-node_stats,node_stats>>
|<<metricbeat-metricset-elasticsearch-pending_tasks,pending_tasks>>
|<<metricbeat-metricset-elasticsearch-shard,shard>>
|<<metricbeat-module-envoyproxy,envoyproxy>> |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-envoyproxy-server,server>>
|<<metricbeat-module-etcd,Etcd>> |image:./images/icon-no.png[No prebuilt dashboards] |
Expand All @@ -66,9 +66,9 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-module-kafka,Kafka>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.2+| .2+| |<<metricbeat-metricset-kafka-consumergroup,consumergroup>>
|<<metricbeat-metricset-kafka-partition,partition>>
|<<metricbeat-module-kibana,Kibana>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-kibana-stats,stats>> beta[]
|<<metricbeat-metricset-kibana-status,status>> beta[]
|<<metricbeat-module-kibana,Kibana>> |image:./images/icon-no.png[No prebuilt dashboards] |
.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[]
|<<metricbeat-metricset-kubernetes-container,container>>
Expand All @@ -85,9 +85,9 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-kubernetes-volume,volume>>
|<<metricbeat-module-kvm,kvm>> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-kvm-dommemstat,dommemstat>> experimental[]
|<<metricbeat-module-logstash,Logstash>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-logstash-node,node>> beta[]
|<<metricbeat-metricset-logstash-node_stats,node_stats>> beta[]
|<<metricbeat-module-logstash,Logstash>> |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-logstash-node,node>>
|<<metricbeat-metricset-logstash-node_stats,node_stats>>
|<<metricbeat-module-memcached,Memcached>> |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-memcached-stats,stats>>
|<<metricbeat-module-mongodb,MongoDB>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Elasticsearch"
description: >
Elasticsearch module
release: beta
release: ga
settings: ["ssl", "http"]
short_config: false
fields:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/ccr/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
Cross-cluster replication stats
release: beta
release: ga
fields:
- name: leader
type: group
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/elasticsearch/ccr/ccr.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (

"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper/elastic"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/elasticsearch"
Expand All @@ -49,8 +48,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("the " + base.FullyQualifiedName() + " metricset is beta")

ms, err := elasticsearch.NewMetricSet(base, ccrStatsPath)
if err != nil {
return nil, err
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
Cluster stats
release: beta
release: ga
fields:
- name: status
type: keyword
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package cluster_stats
import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper/elastic"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/elasticsearch"
Expand All @@ -44,8 +43,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("the " + base.FullyQualifiedName() + " metricset is beta")

ms, err := elasticsearch.NewMetricSet(base, clusterStatsPath)
if err != nil {
return nil, err
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.

2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/index/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
index
release: beta
release: ga
fields:
- name: name
type: keyword
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/elasticsearch/index/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package index
import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper/elastic"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/elasticsearch"
Expand All @@ -46,8 +45,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("the " + base.FullyQualifiedName() + " metricset is beta")

// TODO: This currently gets index data for all indices. Make it configurable.
ms, err := elasticsearch.NewMetricSet(base, statsPath)
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
index
release: beta
release: ga
fields:
- name: id
type: long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package index_recovery
import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper/elastic"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/elasticsearch"
Expand All @@ -44,8 +43,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("The " + base.FullyQualifiedName() + " metricset is beta")

config := struct {
ActiveOnly bool `config:"index_recovery.active_only"`
XPack bool `config:"xpack.enabled"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
index
release: beta
release: ga
fields:
- name: primaries
type: group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package index_summary
import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper/elastic"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/mb/parse"
Expand Down Expand Up @@ -54,8 +53,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("the " + base.FullyQualifiedName() + " metricset is beta")

// Get the stats from the local node
ms, err := elasticsearch.NewMetricSet(base, statsPath)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/ml_job/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
ml
release: beta
release: ga
fields:
- name: id
type: keyword
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/elasticsearch/ml_job/ml_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package ml_job
import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper/elastic"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/elasticsearch"
Expand All @@ -45,8 +44,6 @@ 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.Beta("The " + base.FullyQualifiedName() + " metricset is beta.")

// Get the stats from the local node
ms, err := elasticsearch.NewMetricSet(base, jobPath)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/node/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
node
release: beta
release: ga
fields:
- name: version
type: keyword
Expand Down
Loading

0 comments on commit d1c04af

Please sign in to comment.