From 2e497ec6178e30e4515751519ca38512f60a8164 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Wed, 9 Sep 2020 13:31:20 +0200 Subject: [PATCH] Disable Kafka metricsets based on Jolokia (#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 cce29d46a57280c696e41ad16748a1607a867e90) --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/kafka/broker.asciidoc | 1 - metricbeat/docs/modules/kafka/consumer.asciidoc | 1 - metricbeat/docs/modules/kafka/producer.asciidoc | 1 - metricbeat/module/kafka/broker/manifest.yml | 2 +- metricbeat/module/kafka/consumer/manifest.yml | 2 +- metricbeat/module/kafka/producer/manifest.yml | 2 +- 7 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index aecfab555bf..f757849910a 100644 --- 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 index 9ef1c702ce2..191351eb98f 100644 --- 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 index a30bd900118..3a2acd51cda 100644 --- 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 index d7e9e6b9d53..2ce5ab0a3f4 100644 --- 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 index c2d5b543318..1ff01429fd7 100644 --- 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 index 4d431393f14..e7332aa69a3 100644 --- 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 index a10e366103b..49618aae769 100644 --- 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