AMBARI-21470 : Kafka Sink does not exclude excluded metrics of type 'guage'. (Qin Liu via avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9bfea653 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9bfea653 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9bfea653 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 9bfea6530bc9759f518fd616e15bb08244152ab1 Parents: f7fac03 Author: Aravindan Vijayan <[email protected]> Authored: Fri Jul 14 09:47:47 2017 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Fri Jul 14 09:47:47 2017 -0700 ---------------------------------------------------------------------- .../metrics2/sink/kafka/KafkaTimelineMetricsReporter.java | 6 ++++-- .../common-services/KAFKA/0.9.0/configuration/kafka-broker.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9bfea653/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java index 6f5e9e0..e126016 100644 --- a/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java @@ -406,8 +406,10 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink final String sanitizedName = sanitizeName(name); try { - cacheSanitizedTimelineMetric(currentTimeMillis, sanitizedName, "", Double.parseDouble(String.valueOf(gauge.value()))); - populateMetricsList(context, MetricType.GAUGE, sanitizedName); + if (!isExcludedMetric(sanitizedName)) { + cacheSanitizedTimelineMetric(currentTimeMillis, sanitizedName, "", Double.parseDouble(String.valueOf(gauge.value()))); + populateMetricsList(context, MetricType.GAUGE, sanitizedName); + } } catch (NumberFormatException ex) { LOG.debug(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/9bfea653/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml index 73a5eff..4cd2b0d 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml @@ -138,7 +138,7 @@ </property> <property> <name>external.kafka.metrics.exclude.prefix</name> - <value>kafka.network.RequestMetrics,kafka.server.DelayedOperationPurgatory,kafka.server.BrokerTopicMetrics.BytesRejectedPerSec</value> + <value>kafka.network.RequestMetrics,kafka.server.DelayedOperationPurgatory,kafka.server.BrokerTopicMetrics.BytesRejectedPerSec,kafka.server.KafkaServer.ClusterId</value> <description> Exclude metrics starting with these prefixes from being collected. </description>
