You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/04/01 06:12:22 UTC
[1/3] storm git commit: STORM-713: Include topic information with
Kafka metrics.
Repository: storm
Updated Branches:
refs/heads/master 20084ba34 -> 2aaa71809
STORM-713: Include topic information with Kafka metrics.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1e3bf8c0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1e3bf8c0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1e3bf8c0
Branch: refs/heads/master
Commit: 1e3bf8c09cb1be6b60ca57fce2b6d859a57e173a
Parents: bb8d48d
Author: Craig Hawco <cr...@upsight.com>
Authored: Thu Mar 19 11:35:59 2015 -0400
Committer: Craig Hawco <cr...@upsight.com>
Committed: Thu Mar 19 14:02:26 2015 -0400
----------------------------------------------------------------------
.../storm-kafka/src/jvm/storm/kafka/KafkaUtils.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1e3bf8c0/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
index 137dc99..50241f7 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/KafkaUtils.java
@@ -121,19 +121,19 @@ public class KafkaUtils {
}
long latestEmittedOffset = e.getValue();
long spoutLag = latestTimeOffset - latestEmittedOffset;
- ret.put(partition.getId() + "/" + "spoutLag", spoutLag);
- ret.put(partition.getId() + "/" + "earliestTimeOffset", earliestTimeOffset);
- ret.put(partition.getId() + "/" + "latestTimeOffset", latestTimeOffset);
- ret.put(partition.getId() + "/" + "latestEmittedOffset", latestEmittedOffset);
+ ret.put(_topic + "/" + partition.getId() + "/" + "spoutLag", spoutLag);
+ ret.put(_topic + "/" + partition.getId() + "/" + "earliestTimeOffset", earliestTimeOffset);
+ ret.put(_topic + "/" + partition.getId() + "/" + "latestTimeOffset", latestTimeOffset);
+ ret.put(_topic + "/" + partition.getId() + "/" + "latestEmittedOffset", latestEmittedOffset);
totalSpoutLag += spoutLag;
totalEarliestTimeOffset += earliestTimeOffset;
totalLatestTimeOffset += latestTimeOffset;
totalLatestEmittedOffset += latestEmittedOffset;
}
- ret.put("totalSpoutLag", totalSpoutLag);
- ret.put("totalEarliestTimeOffset", totalEarliestTimeOffset);
- ret.put("totalLatestTimeOffset", totalLatestTimeOffset);
- ret.put("totalLatestEmittedOffset", totalLatestEmittedOffset);
+ ret.put(_topic + "/" + "totalSpoutLag", totalSpoutLag);
+ ret.put(_topic + "/" + "totalEarliestTimeOffset", totalEarliestTimeOffset);
+ ret.put(_topic + "/" + "totalLatestTimeOffset", totalLatestTimeOffset);
+ ret.put(_topic + "/" + "totalLatestEmittedOffset", totalLatestEmittedOffset);
return ret;
} else {
LOG.info("Metrics Tick: Not enough data to calculate spout lag.");
[3/3] storm git commit: Added STORM-713 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-713 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2aaa7180
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2aaa7180
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2aaa7180
Branch: refs/heads/master
Commit: 2aaa718094af0d0e931eb3a7a66251268d64896b
Parents: 55c3f22
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Mar 31 21:06:25 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Mar 31 21:06:25 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2aaa7180/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb1e4e6..0656691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-713: Include topic information with Kafka metrics.
* STORM-708: CORS support for STORM UI.
* STORM-615: Add REST API to upload topology.
* STORM-741: Allow users to pass a config value to perform impersonation.
[2/3] storm git commit: Merge branch 'storm-kafka-metrics-with-topic'
of https://github.com/chawco/storm into STORM-713
Posted by sr...@apache.org.
Merge branch 'storm-kafka-metrics-with-topic' of https://github.com/chawco/storm into STORM-713
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55c3f22d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55c3f22d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55c3f22d
Branch: refs/heads/master
Commit: 55c3f22ddacec13273596dbe9618818a33166b36
Parents: 20084ba 1e3bf8c
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Mar 31 21:05:49 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Mar 31 21:05:49 2015 -0700
----------------------------------------------------------------------
.../storm-kafka/src/jvm/storm/kafka/KafkaUtils.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------