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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick #9706 to 6.6: Remove the experimental tag from Jolokia autodiscover provider #9766

Merged
merged 1 commit into from
Dec 22, 2018
Merged

Cherry-pick #9706 to 6.6: Remove the experimental tag from Jolokia autodiscover provider #9766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ https://github.com/elastic/beats/compare/1035569addc4a3b29ffa14f8a08c27c1ace16ef

*Affecting all Beats*

- Release Jolokia autodiscover as GA. {pull}9706[9706]

*Auditbeat*

*Filebeat*
Expand Down
3 changes: 0 additions & 3 deletions libbeat/autodiscover/providers/jolokia/jolokia.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/elastic/beats/libbeat/autodiscover/template"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/bus"
"github.com/elastic/beats/libbeat/common/cfgwarn"
)

func init() {
Expand All @@ -51,8 +50,6 @@ type Provider struct {
// AutodiscoverBuilder builds a Jolokia Discovery autodiscover provider, it fails if
// there is some problem with the configuration
func AutodiscoverBuilder(bus bus.Bus, uuid uuid.UUID, c *common.Config) (autodiscover.Provider, error) {
cfgwarn.Experimental("The Jolokia Discovery autodiscover is experimental")

config := defaultConfig()
err := c.Unpack(&config)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/shared-autodiscover.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ After they are de-duplicated, only one will be used.

ifdef::autodiscoverJolokia[]
[float]
===== Jolokia (experimental)
===== Jolokia

The Jolokia autodiscover provider uses Jolokia Discovery to find agents running
in your host or your network.
Expand Down