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

[Metricbeat] Release nats module as GA #10281

Merged
merged 3 commits into from
Jan 23, 2019
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
3 changes: 1 addition & 2 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,14 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Release Couchbase module as GA. {pull}10201[10201]
- Release RabbitMQ module GA. {pull}10165[10165]
- Release envoyproxy module GA. {pull}10223[10223]
- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
- Release mongodb.metrics and mongodb.replstatus as GA. {pull}10242[10242]
- Release mysql.galera_status as GA. {pull}10242[10242]
- Release postgresql.statement as GA. {pull}10242[10242]
- 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]
- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsoriano FYI I'm removing RabbitMQ twice here as it is already on line 204.

- Release Nats module as GA. {pull}10281[10281]
- Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222]

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

experimental[]

This is the nats module.

This is the Nats Module. The Nats module uses http://localhost:8222 APIs to collect metrics.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/nats/connections.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-nats-connections]]
=== Nats connections metricset

experimental[]

include::../../../module/nats/connections/_meta/docs.asciidoc[]


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

experimental[]

include::../../../module/nats/routes/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/nats/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-nats-stats]]
=== Nats stats metricset

experimental[]

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


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

experimental[]

include::../../../module/nats/subscriptions/_meta/docs.asciidoc[]


Expand Down
10 changes: 5 additions & 5 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-module-mysql,MySQL>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.2+| .2+| |<<metricbeat-metricset-mysql-galera_status,galera_status>>
|<<metricbeat-metricset-mysql-status,status>>
|<<metricbeat-module-nats,Nats>> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] |
.4+| .4+| |<<metricbeat-metricset-nats-connections,connections>> experimental[]
|<<metricbeat-metricset-nats-routes,routes>> experimental[]
|<<metricbeat-metricset-nats-stats,stats>> experimental[]
|<<metricbeat-metricset-nats-subscriptions,subscriptions>> experimental[]
|<<metricbeat-module-nats,Nats>> |image:./images/icon-no.png[No prebuilt dashboards] |
.4+| .4+| |<<metricbeat-metricset-nats-connections,connections>>
|<<metricbeat-metricset-nats-routes,routes>>
|<<metricbeat-metricset-nats-stats,stats>>
|<<metricbeat-metricset-nats-subscriptions,subscriptions>>
|<<metricbeat-module-nginx,Nginx>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.1+| .1+| |<<metricbeat-metricset-nginx-stubstatus,stubstatus>>
|<<metricbeat-module-php_fpm,PHP_FPM>> |image:./images/icon-no.png[No prebuilt dashboards] |
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/nats/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: "Nats"
description: >
nats Module
release: ga
fields:
- name: nats
type: group
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/nats/connections/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
Contains nats connection related metrics
release: ga
fields:
- name: total
type: integer
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/nats/connections/connections.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package connections

import (
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/helper/elastic"
Expand Down Expand Up @@ -63,8 +62,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.Experimental("The nats connections metricset is experimental.")

config := struct{}{}
if err := base.Module().UnpackConfig(&config); err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nats/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/nats/routes/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
Contains nats route related metrics
release: ga
fields:
- name: total
type: integer
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/nats/routes/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package routes

import (
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/helper/elastic"
Expand Down Expand Up @@ -63,8 +62,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.Experimental("The nats routes metricset is experimental.")

config := struct{}{}
if err := base.Module().UnpackConfig(&config); err != nil {
return nil, err
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/nats/stats/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
Contains nats var related metrics
release: ga
fields:
- name: uptime
type: long
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/nats/stats/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package stats

import (
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/helper/elastic"
Expand Down Expand Up @@ -63,8 +62,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.Experimental("The nats stats metricset is experimental.")

config := struct{}{}
if err := base.Module().UnpackConfig(&config); err != nil {
return nil, err
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/nats/subscriptions/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
Contains nats subscriptions related metrics
release: ga
fields:
- name: total
type: integer
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/nats/subscriptions/subscriptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package subscriptions

import (
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/helper/elastic"
Expand Down Expand Up @@ -63,8 +62,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.Experimental("The nats subscriptions metricset is experimental.")

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