Repository: incubator-eagle Updated Branches: refs/heads/master c4a0b94d7 -> 6002c6140
[EAGLE-695] fetching hadoop.cluster.allocatedvirtualcores instead of hadoop.cluster.totalvirtualcores Virtual Core related metrics are additional, starting from hadoop version 2.7.x. And we were originally fetching hadoop.cluster.allocatedvirtualcores. Now it seems that hadoop.cluster.totalvirtualcores is more meaningful. So change code to fetch and show it up in hadoop-queue monitoring application. Author: anyway1021 <m...@apache.org> Closes #574 from anyway1021/EAGLE-695. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/6002c614 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/6002c614 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/6002c614 Branch: refs/heads/master Commit: 6002c61404d952a553b929e5026dcd681eb5639c Parents: c4a0b94 Author: anyway1021 <m...@apache.org> Authored: Fri Oct 28 15:40:40 2016 +0800 Committer: anyway1021 <m...@apache.org> Committed: Fri Oct 28 15:40:40 2016 +0800 ---------------------------------------------------------------------- .../eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java | 2 +- ...g.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/6002c614/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java index d26e295..d3219ef 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java @@ -83,7 +83,7 @@ public class ClusterMetricsParseListener { createMetric(MetricName.HADOOP_CLUSTER_TOTAL_MEMORY, currentTimestamp, metrics.getTotalMB(), AggregateFunc.MAX); createMetric(MetricName.HADOOP_CLUSTER_AVAILABLE_MEMORY, currentTimestamp, metrics.getAvailableMB(), AggregateFunc.AVG); createMetric(MetricName.HADOOP_CLUSTER_RESERVED_MEMORY, currentTimestamp, metrics.getReservedMB(), AggregateFunc.AVG); - createMetric(MetricName.HADOOP_CLUSTER_TOTAL_VIRTUAL_CORES, currentTimestamp, metrics.getAllocatedVirtualCores(), AggregateFunc.MAX); + createMetric(MetricName.HADOOP_CLUSTER_ALLOCATED_VIRTUAL_CORES, currentTimestamp, metrics.getAllocatedVirtualCores(), AggregateFunc.MAX); } public void flush() { http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/6002c614/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml b/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml index 43092d2..a9ef355 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml +++ b/eagle-jpm/eagle-hadoop-queue/src/main/resources/META-INF/providers/org.apache.eagle.hadoop.queue.HadoopQueueRunningAppProvider.xml @@ -43,8 +43,8 @@ </property> <property> <name>dataSourceConfig.fetchIntervalSec</name> - <displayName>Fetch Interval in Seconds</displayName> - <description>fetching interval in seconds</description> + <displayName>Fetching Metric Interval in Seconds</displayName> + <description>interval seconds of fetching metric from resource manager</description> <value>10</value> </property> </configuration>
