Repository: incubator-eagle Updated Branches: refs/heads/master 8416f64da -> 5ef6c183f
[MINOR] Rename beam_group_filter to bean_group_filter Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/5ef6c183 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/5ef6c183 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/5ef6c183 Branch: refs/heads/master Commit: 5ef6c183f5b8708f83d08c5e51b2556c6371b82a Parents: 8416f64 Author: Hao Chen <h...@apache.org> Authored: Wed Dec 7 10:57:12 2016 +0800 Committer: Hao Chen <h...@apache.org> Committed: Wed Dec 7 10:57:12 2016 +0800 ---------------------------------------------------------------------- .../hadoop_jmx_collector/hadoop_jmx_config-sample.json | 4 ++-- eagle-external/hadoop_jmx_collector/hbase_jmx_config-sample.json | 2 +- eagle-external/hadoop_jmx_collector/metric_collector.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/5ef6c183/eagle-external/hadoop_jmx_collector/hadoop_jmx_config-sample.json ---------------------------------------------------------------------- diff --git a/eagle-external/hadoop_jmx_collector/hadoop_jmx_config-sample.json b/eagle-external/hadoop_jmx_collector/hadoop_jmx_config-sample.json old mode 100644 new mode 100755 index 07bdc84..f5c16fd --- a/eagle-external/hadoop_jmx_collector/hadoop_jmx_config-sample.json +++ b/eagle-external/hadoop_jmx_collector/hadoop_jmx_config-sample.json @@ -23,7 +23,7 @@ } ], "filter": { - "beam_group_filter": ["hadoop","java.lang"], + "bean_group_filter": ["hadoop","java.lang"], "metric_name_filter": [ "hadoop.memory.heapmemoryusage.used", "hadoop.memory.nonheapmemoryusage.used", @@ -67,4 +67,4 @@ ] } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/5ef6c183/eagle-external/hadoop_jmx_collector/hbase_jmx_config-sample.json ---------------------------------------------------------------------- diff --git a/eagle-external/hadoop_jmx_collector/hbase_jmx_config-sample.json b/eagle-external/hadoop_jmx_collector/hbase_jmx_config-sample.json index 906f134..2275ccc 100644 --- a/eagle-external/hadoop_jmx_collector/hbase_jmx_config-sample.json +++ b/eagle-external/hadoop_jmx_collector/hbase_jmx_config-sample.json @@ -17,7 +17,7 @@ } ], "filter": { - "beam_group_filter": ["hadoop","java.lang","java.nio"], + "bean_group_filter": ["hadoop","java.lang","java.nio"], "metric_name_filter": [ "hadoop.memory.heapmemoryusage.used", "hadoop.memory.nonheapmemoryusage.used", http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/5ef6c183/eagle-external/hadoop_jmx_collector/metric_collector.py ---------------------------------------------------------------------- diff --git a/eagle-external/hadoop_jmx_collector/metric_collector.py b/eagle-external/hadoop_jmx_collector/metric_collector.py index 4b7b209..c4fc457 100644 --- a/eagle-external/hadoop_jmx_collector/metric_collector.py +++ b/eagle-external/hadoop_jmx_collector/metric_collector.py @@ -359,7 +359,7 @@ class JmxMetricCollector(MetricCollector): raise Exception("port not defined in " + str(input)) if not input.has_key("https"): input["https"] = False - self.selected_domain = [s.encode('utf-8') for s in config[u'filter'].get('beam_group_filter')] + self.selected_domain = [s.encode('utf-8') for s in config[u'filter'].get('bean_group_filter')] if config["env"].has_key("metric_prefix"): self.metric_prefix = config["env"]["metric_prefix"] logging.info("Override env.metric_prefix: " + self.metric_prefix + ", default: hadoop.")