Merge branch 'STORM-1700-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/18f5c32f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/18f5c32f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/18f5c32f Branch: refs/heads/1.x-branch Commit: 18f5c32f5ac1dfa4b844db7454be0b4155bfac68 Parents: a59007d 5f4e37e Author: Jungtaek Lim <[email protected]> Authored: Mon Jun 13 13:12:27 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Jun 13 13:12:27 2016 +0900 ---------------------------------------------------------------------- conf/storm.yaml.example | 11 ++ .../src/clj/org/apache/storm/daemon/common.clj | 18 +-- .../storm/metric/MetricsConsumerBolt.java | 94 ++++++++++++++-- .../storm/metric/filter/FilterByMetricName.java | 111 +++++++++++++++++++ .../storm/metric/filter/MetricsFilter.java | 26 +++++ .../metric/filter/FilterByMetricNameTest.java | 95 ++++++++++++++++ 6 files changed, 340 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
