You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2022/11/17 09:36:30 UTC
[ambari-metrics] branch master updated: AMBARI-25383: Ambari Metrics whitelisting is failing on * wildcard for Kafka Topics (#64)
This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new dd34f09 AMBARI-25383: Ambari Metrics whitelisting is failing on * wildcard for Kafka Topics (#64)
dd34f09 is described below
commit dd34f09066e760c43f736fd542e299c161d45aa0
Author: Zhiguo Wu <wu...@apache.org>
AuthorDate: Thu Nov 17 17:36:25 2022 +0800
AMBARI-25383: Ambari Metrics whitelisting is failing on * wildcard for Kafka Topics (#64)
---
.../conf/unix/metrics_whitelist | 61 +++++++++++-----------
.../core/timeline/TimelineMetricsFilter.java | 2 +-
2 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/ambari-metrics-timelineservice/conf/unix/metrics_whitelist b/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
index 8074a81..69e80c6 100644
--- a/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
+++ b/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
@@ -280,8 +280,8 @@ kafka.controller.KafkaController.OfflinePartitionsCount
kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate
kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count
kafka.network.RequestMetrics.RequestsPerSec.request.Produce.count
-kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.version.*.count
-kafka.network.RequestMetrics.RequestsPerSec.request.Produce.version.*.count
+._p_kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.version.*.count
+._p_kafka.network.RequestMetrics.RequestsPerSec.request.Produce.version.*.count
kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.99percentile
kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.max
kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.mean
@@ -296,21 +296,22 @@ kafka.network.RequestMetrics.TotalTimeMs.request.Produce.mean
kafka.network.RequestMetrics.TotalTimeMs.request.Produce.min
kafka.server.BrokerTopicMetrics.BytesInPerSec.1MinuteRate
kafka.server.BrokerTopicMetrics.BytesInPerSec.count
-kafka.server.BrokerTopicMetrics.BytesInPerSec.topic.*.count
+._p_kafka.server.BrokerTopicMetrics.BytesInPerSec.topic.*.count
kafka.server.BrokerTopicMetrics.BytesOutPerSec.1MinuteRate
kafka.server.BrokerTopicMetrics.BytesOutPerSec.count
-kafka.server.BrokerTopicMetrics.BytesOutPerSec.topic.*.count
+._p_kafka.server.BrokerTopicMetrics.BytesOutPerSec.topic.*.count
kafka.server.BrokerTopicMetrics.MessagesInPerSec.1MinuteRate
kafka.server.BrokerTopicMetrics.MessagesInPerSec.count
-kafka.server.BrokerTopicMetrics.MessagesInPerSec.topic.*.count
-kafka.server.BrokerTopicMetrics.TotalProduceRequestsPerSec.topic.*.count
-kafka.server.FetcherLagMetrics.ConsumerLag.clientId.ReplicaFetcherThread-0-1001.partition.0.topic.*
+._p_kafka.server.BrokerTopicMetrics.MessagesInPerSec.topic.*.count
+._p_kafka.server.BrokerTopicMetrics.TotalProduceRequestsPerSec.topic.*.count
+._p_kafka.server.FetcherLagMetrics.ConsumerLag.clientId.ReplicaFetcherThread-0-1001.partition.0.topic.*
kafka.server.ReplicaFetcherManager.MaxLag.clientId.Replica
kafka.server.ReplicaManager.IsrExpandsPerSec.count
kafka.server.ReplicaManager.IsrShrinksPerSec.count
kafka.server.ReplicaManager.LeaderCount
kafka.server.ReplicaManager.PartitionCount
kafka.server.ReplicaManager.UnderReplicatedPartitions
+._p_kafka.log.Log.*
load_fifteen
load_five
load_one
@@ -584,29 +585,29 @@ solr.admin.mbeans.updateHandler.docsPending
solr.admin.mbeans.updateHandler.errors
swap_free
swap_total
-topology.*.%.--ack-count.%
-topology.*.%.--complete-latency.%
-topology.*.%.--emit-count.%
-topology.*.%.--execute-count.%
-topology.*.%.--fail-count.%
-topology.*.%.--receive.population
-topology.*.%.--sendqueue.population
-topology.*.*.%.--ack-count.%
-topology.*.*.%.--complete-latency.%
-topology.*.*.%.--emit-count.%
-topology.*.*.%.--execute-count.%
-topology.*.*.%.--fail-count.%
-topology.*.*.%.--process-latency.%
-topology.*.*.%.--receive.population
-topology.*.*.%.--sendqueue.population
-topology.*.--system.%.%.-1.GC/PSMarkSweep.count
-topology.*.--system.%.%.-1.GC/PSMarkSweep.timeMs
-topology.*.--system.%.%.-1.GC/PSScavenge.count
-topology.*.--system.%.%.-1.GC/PSScavenge.timeMs
-topology.*.--system.%.%.-1.memory/heap.usedBytes
-topology.*.--system.%.%.-1.memory/nonHeap.usedBytes
-topology.*.kafka-topic.*.*.latestCompletedOffset
-topology.*.kafka-topic.*.*.latestTimeOffset
+._p_topology.*.%.--ack-count.%
+._p_topology.*.%.--complete-latency.%
+._p_topology.*.%.--emit-count.%
+._p_topology.*.%.--execute-count.%
+._p_topology.*.%.--fail-count.%
+._p_topology.*.%.--receive.population
+._p_topology.*.%.--sendqueue.population
+._p_topology.*.*.%.--ack-count.%
+._p_topology.*.*.%.--complete-latency.%
+._p_topology.*.*.%.--emit-count.%
+._p_topology.*.*.%.--execute-count.%
+._p_topology.*.*.%.--fail-count.%
+._p_topology.*.*.%.--process-latency.%
+._p_topology.*.*.%.--receive.population
+._p_topology.*.*.%.--sendqueue.population
+._p_topology.*.--system.%.%.-1.GC/PSMarkSweep.count
+._p_topology.*.--system.%.%.-1.GC/PSMarkSweep.timeMs
+._p_topology.*.--system.%.%.-1.GC/PSScavenge.count
+._p_topology.*.--system.%.%.-1.GC/PSScavenge.timeMs
+._p_topology.*.--system.%.%.-1.memory/heap.usedBytes
+._p_topology.*.--system.%.%.-1.memory/nonHeap.usedBytes
+._p_topology.*.kafka-topic.*.*.latestCompletedOffset
+._p_topology.*.kafka-topic.*.*.latestTimeOffset
write_bps
write_bytes
write_count
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilter.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilter.java
index 1364e71..4d9fd98 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilter.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilter.java
@@ -76,7 +76,7 @@ public class TimelineMetricsFilter {
if (configuration.isWhitelistingEnabled()) {
String whitelistFile = metricsConf.get(TimelineMetricConfiguration.TIMELINE_METRICS_WHITELIST_FILE, TimelineMetricConfiguration.TIMELINE_METRICS_WHITELIST_FILE_LOCATION_DEFAULT);
readMetricWhitelistFromFile(whitelistedMetrics, whitelistedMetricPatterns, whitelistFile);
- LOG.info("Whitelisting " + whitelistedMetrics.size() + " metrics");
+ LOG.info("Whitelisting " + whitelistedMetrics.size() + " metrics and " + whitelistedMetricPatterns.size() + " metric patterns");
LOG.debug("Whitelisted metrics : " + Arrays.toString(whitelistedMetrics.toArray()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org