Skip to content

Commit

Permalink
Release Jolokia autodiscover provider as GA (elastic#9706) (elastic#9765
Browse files Browse the repository at this point in the history
)

(cherry picked from commit d286b62)
  • Loading branch information
jsoriano authored Dec 22, 2018
1 parent 09f0159 commit 818bfac
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ https://github.com/elastic/beats/compare/v6.5.0...6.x[Check the HEAD diff]
- Add cache.ttl to add_host_metadata. {pull}9359[9359]
- Add support for index lifecycle management (beta). {pull}7963[7963]
- Always include Pod UID as part of Pod metadata. {pull]9517[9517]
- Release Jolokia autodiscover as GA. {pull}9706[9706]

*Auditbeat*

Expand Down
3 changes: 0 additions & 3 deletions libbeat/autodiscover/providers/jolokia/jolokia.go
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
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

0 comments on commit 818bfac

Please sign in to comment.