From a13ccb9360585cc5bef7777bca699c84bf2091e5 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 4 Sep 2020 16:34:59 +0200 Subject: [PATCH 1/2] Disable Kafka metricsets based on Jolokia Kafka metricsets based on Jolokia require a different configuration to the native metricsets. Disable the Jolokia ones by default, if they want to be used they need to be explicitly enabled and configured. Reference configuration contains information about this. --- CHANGELOG.next.asciidoc | 2 ++ 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, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 120f71c2b0c..b5b06a53297 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -340,6 +340,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680] - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736] - The `elasticsearch/index` metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. {pull}20938[20938] +- Add a switch to the driver definition on SQL module to use pretty names {pull}17378[17378] +- Disable Kafka metricsets based on Jolokia by default. They require a different configuration. {pull}[] *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 From 4c87ef0ce28afda62e2faf7827c5ae5277dad2da Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 4 Sep 2020 16:48:07 +0200 Subject: [PATCH 2/2] Fix changelog --- CHANGELOG.next.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b5b06a53297..99c840002c9 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -340,8 +340,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680] - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736] - The `elasticsearch/index` metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. {pull}20938[20938] -- Add a switch to the driver definition on SQL module to use pretty names {pull}17378[17378] -- Disable Kafka metricsets based on Jolokia by default. They require a different configuration. {pull}[] +- Disable Kafka metricsets based on Jolokia by default. They require a different configuration. {pull}20989[20989] *Packetbeat*