Skip to content

Commit

Permalink
Cherry-pick #10240 to 6.x: [Metricbeat] Release Dropwizard,Graphite m…
Browse files Browse the repository at this point in the history
…odule as GA (#10250)

Release also http.server metricset as GA.

(cherry picked from commit 4f826ed)
  • Loading branch information
ruflin authored Jan 23, 2019
1 parent 80f9580 commit 82856b5
Show file tree
Hide file tree
Showing 16 changed files with 15 additions and 27 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
- Release etcd module as GA. {pull}10200[10200]
- Release Couchbase module as GA. {pull}10201[10201]
- Release aerospike module as GA. {pull}10203[10203]
- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
- Release RabbitMQ Metricbeat module GA. {pull}10165[10165]
- Release Dropwizard module as GA. {pull}10240[10240]
- Release Graphite module as GA. {pull}10240[10240]
- Release http.server metricset as GA. {pull}10240[10240]

*Packetbeat*

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

beta[]

This is the http://dropwizard.io[Dropwizard] module. The default metricset is `collector`.

[float]
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/dropwizard/collector.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-dropwizard-collector]]
=== Dropwizard collector metricset

beta[]

include::../../../module/dropwizard/collector/_meta/docs.asciidoc[]


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

beta[]

include::../../../module/graphite/server/_meta/docs.asciidoc[]


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

beta[]

include::../../../module/http/server/_meta/docs.asciidoc[]


Expand Down
8 changes: 4 additions & 4 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-docker-info,info>>
|<<metricbeat-metricset-docker-memory,memory>>
|<<metricbeat-metricset-docker-network,network>>
|<<metricbeat-module-dropwizard,Dropwizard>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-dropwizard-collector,collector>> beta[]
|<<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[]
Expand All @@ -54,13 +54,13 @@ This file is generated! See scripts/docs_collector.py
.2+| .2+| |<<metricbeat-metricset-golang-expvar,expvar>> beta[]
|<<metricbeat-metricset-golang-heap,heap>> beta[]
|<<metricbeat-module-graphite,Graphite>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-graphite-server,server>> beta[]
.1+| .1+| |<<metricbeat-metricset-graphite-server,server>>
|<<metricbeat-module-haproxy,HAProxy>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.2+| .2+| |<<metricbeat-metricset-haproxy-info,info>>
|<<metricbeat-metricset-haproxy-stat,stat>>
|<<metricbeat-module-http,HTTP>> |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-http-json,json>>
|<<metricbeat-metricset-http-server,server>> beta[]
|<<metricbeat-metricset-http-server,server>>
|<<metricbeat-module-jolokia,Jolokia>> |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-jolokia-jmx,jmx>>
|<<metricbeat-module-kafka,Kafka>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/dropwizard/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Dropwizard"
description: >
Stats collected from Dropwizard.
release: beta
release: ga
settings: ["ssl", "http"]
short_config: false
fields:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/dropwizard/collector/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- release: beta
- release: ga
2 changes: 0 additions & 2 deletions metricbeat/module/dropwizard/collector/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"strings"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/mb/parse"
Expand Down Expand Up @@ -65,7 +64,6 @@ 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.Beta("The dropwizard collector metricset is beta")
config := struct {
Namespace string `config:"namespace" validate:"required"`
}{}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/dropwizard/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/graphite/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/graphite/server/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
server
release: beta
release: ga
fields:
- name: example
type: keyword
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/graphite/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package server
import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/logp"
serverhelper "github.com/elastic/beats/metricbeat/helper/server"
"github.com/elastic/beats/metricbeat/helper/server/tcp"
Expand Down Expand Up @@ -50,7 +49,6 @@ 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.Beta("The graphite server metricset is beta")

config := DefaultGraphiteCollectorConfig()
if err := base.Module().UnpackConfig(&config); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/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/http/server/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
type: group
description: >
server
release: beta
release: ga
fields:
3 changes: 0 additions & 3 deletions metricbeat/module/http/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package server
import (
"fmt"

"github.com/elastic/beats/libbeat/common/cfgwarn"
serverhelper "github.com/elastic/beats/metricbeat/helper/server"
"github.com/elastic/beats/metricbeat/helper/server/http"
"github.com/elastic/beats/metricbeat/mb"
Expand Down Expand Up @@ -48,8 +47,6 @@ 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.Beta("The http server metricset is beta")

config := defaultHttpServerConfig()
if err := base.Module().UnpackConfig(&config); err != nil {
return nil, err
Expand Down

0 comments on commit 82856b5

Please sign in to comment.