Disable Kafka metricsets based on Jolokia (#20989)

jsoriano · web-flow · commit cce29d46a572 · 2020-09-09T13:31:20.000+02:00
Kafka metricsets based on Jolokia require a different configuration to
the native metricsets. Disable the Jolokia ones by default,  if someone
wants to use them, they need to explicitly enable and configure them.
Reference configuration contains information about this.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -337,6 +337,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736]
 - Update fields.yml in the azure module, missing metrics field. {pull}20918[20918]
 - The `elasticsearch/index` metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. {pull}20938[20938]
+- Disable Kafka metricsets based on Jolokia by default. They require a different configuration. {pull}20989[20989]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/modules/kafka/broker.asciidoc b/metricbeat/docs/modules/kafka/broker.asciidoc
@@ -9,7 +9,6 @@ beta[]
 
 include::../../../module/kafka/broker/_meta/docs.asciidoc[]
 
-This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
 
 ==== Fields
 
diff --git a/metricbeat/docs/modules/kafka/consumer.asciidoc b/metricbeat/docs/modules/kafka/consumer.asciidoc
@@ -9,7 +9,6 @@ beta[]
 
 include::../../../module/kafka/consumer/_meta/docs.asciidoc[]
 
-This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
 
 ==== Fields
 
diff --git a/metricbeat/docs/modules/kafka/producer.asciidoc b/metricbeat/docs/modules/kafka/producer.asciidoc
@@ -9,7 +9,6 @@ beta[]
 
 include::../../../module/kafka/producer/_meta/docs.asciidoc[]
 
-This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
 
 ==== Fields
 
diff --git a/metricbeat/module/kafka/broker/manifest.yml b/metricbeat/module/kafka/broker/manifest.yml
@@ -1,4 +1,4 @@
-default: true
+default: false
 input:
   module: jolokia
   metricset: jmx
diff --git a/metricbeat/module/kafka/consumer/manifest.yml b/metricbeat/module/kafka/consumer/manifest.yml
@@ -1,4 +1,4 @@
-default: true
+default: false
 input:
   module: jolokia
   metricset: jmx
diff --git a/metricbeat/module/kafka/producer/manifest.yml b/metricbeat/module/kafka/producer/manifest.yml
@@ -1,4 +1,4 @@
-default: true
+default: false
 input:
   module: jolokia
   metricset: jmx

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ beta[]`
`9`	`9`
`10`	`10`	`include::../../../module/kafka/broker/_meta/docs.asciidoc[]`
`11`	`11`
`12`		`-This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.`
`13`	`12`
`14`	`13`	`==== Fields`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-default: true`
	`1`	`+default: false`
`2`	`2`	`input:`
`3`	`3`	`module: jolokia`
`4`	`4`	`metricset: jmx`