Disable Kafka metricsets based on Jolokia (elastic#20989)

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. (cherry picked from commit cce29d4)
jsoriano · Sep 9, 2020 · 2e497ec · 2e497ec
1 parent 54e379c
commit 2e497ec
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 6 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -385,6 +385,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736]
 - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680]
 - 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