You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/07/09 16:59:15 UTC
[pulsar] branch master updated: Added delayed messages in
Prometheus when using namespace-level metrics aggregation (#4691)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 363b6ba Added delayed messages in Prometheus when using namespace-level metrics aggregation (#4691)
363b6ba is described below
commit 363b6bae6867d2810d01719a86f6f60060c7226b
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Tue Jul 9 09:59:10 2019 -0700
Added delayed messages in Prometheus when using namespace-level metrics aggregation (#4691)
---
.../pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java | 3 +++
.../pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java
index 272cbb4..cc5388e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java
@@ -36,6 +36,7 @@ public class AggregatedNamespaceStats {
public long storageSize;
public long msgBacklog;
+ public long msgDelayed;
long backlogSize;
long offloadedStorageUsed;
@@ -89,6 +90,7 @@ public class AggregatedNamespaceStats {
stats.subscriptionStats.forEach((n, as) -> {
AggregatedSubscriptionStats subsStats =
subscriptionStats.computeIfAbsent(n, k -> new AggregatedSubscriptionStats());
+ msgDelayed += as.msgDelayed;
subsStats.blockedSubscriptionOnUnackedMsgs = as.blockedSubscriptionOnUnackedMsgs;
subsStats.msgBacklog += as.msgBacklog;
subsStats.msgDelayed += as.msgDelayed;
@@ -116,6 +118,7 @@ public class AggregatedNamespaceStats {
storageSize = 0;
msgBacklog = 0;
+ msgDelayed = 0;
storageWriteRate = 0;
storageReadRate = 0;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
index 89f4a2c..b1dfbbd 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
@@ -201,9 +201,14 @@ public class NamespaceStatsAggregator {
metric(stream, cluster, namespace, "pulsar_throughput_out", stats.throughputOut);
metric(stream, cluster, namespace, "pulsar_storage_size", stats.storageSize);
+ metric(stream, cluster, namespace, "pulsar_storage_backlog_size", stats.backlogSize);
+ metric(stream, cluster, namespace, "pulsar_storage_offloaded_size", stats.offloadedStorageUsed);
+
metric(stream, cluster, namespace, "pulsar_storage_write_rate", stats.storageWriteRate);
metric(stream, cluster, namespace, "pulsar_storage_read_rate", stats.storageReadRate);
+ metric(stream, cluster, namespace, "pulsar_subscription_delayed", stats.msgDelayed);
+
metricWithRemoteCluster(stream, cluster, namespace, "pulsar_msg_backlog", "local", stats.msgBacklog);
stats.storageWriteLatencyBuckets.refresh();