From 7a707ff9a1314c3191aa6fd857a8ff4c53c8018f Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 21 Dec 2018 22:10:57 +0100
Subject: [PATCH] Release Jolokia autodiscover provider as GA (#9706)

(cherry picked from commit d286b62de594cd7ee023a42bf3cc32cca8c28407)
---
 CHANGELOG.asciidoc                                | 1 +
 libbeat/autodiscover/providers/jolokia/jolokia.go | 3 ---
 libbeat/docs/shared-autodiscover.asciidoc         | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5d19f73f757..a9b4b23d6b4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -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*
 
diff --git a/libbeat/autodiscover/providers/jolokia/jolokia.go b/libbeat/autodiscover/providers/jolokia/jolokia.go
index 9c81925278d..7d3282b69c5 100644
--- a/libbeat/autodiscover/providers/jolokia/jolokia.go
+++ b/libbeat/autodiscover/providers/jolokia/jolokia.go
@@ -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() {
@@ -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 {
diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc
index 1dde343a4a6..cc3ce48197a 100644
--- a/libbeat/docs/shared-autodiscover.asciidoc
+++ b/libbeat/docs/shared-autodiscover.asciidoc
@@ -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.