You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2013/05/31 18:06:22 UTC
svn commit: r1488287 - in /incubator/ambari/branches/branch-1.4.0:
CHANGES.txt ambari-server/src/main/resources/ganglia_properties.json
ambari-server/src/main/resources/jmx_properties_2.json
Author: ncole
Date: Fri May 31 16:06:21 2013
New Revision: 1488287
URL: http://svn.apache.org/r1488287
Log:
Hadoop 2: Added YARN metrics
Modified:
incubator/ambari/branches/branch-1.4.0/CHANGES.txt
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/ganglia_properties.json
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/jmx_properties_2.json
Modified: incubator/ambari/branches/branch-1.4.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/CHANGES.txt?rev=1488287&r1=1488286&r2=1488287&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-1.4.0/CHANGES.txt Fri May 31 16:06:21 2013
@@ -17,6 +17,8 @@ Branch 1.4.0:
IMPROVEMENTS
+ AMBARI-2244. Hadoop 2: Added YARN metrics. (ncole)
+
AMBARI-2237. Hadoop 2: Add user configs for MR2/YARN. (yusaku)
AMBARI-2236. Hadoop 2: set appropriate non-default values. (yusaku)
Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/ganglia_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/ganglia_properties.json?rev=1488287&r1=1488286&r2=1488287&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/ganglia_properties.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/ganglia_properties.json Fri May 31 16:06:21 2013
@@ -6285,109 +6285,109 @@
"temporal":true
},
- "metrics/yarn/Queue/running_0":{
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/running_0":{
"metric":"yarn.Queue.running_0",
- "pointInTime":false,
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/running_60":{
- "metric":"yarn.Queue.running_60",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/running_60":{
+ "metric":"yarn.QueueMetrics.running_60",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/running_300":{
- "metric":"yarn.Queue.running_300",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/running_300":{
+ "metric":"yarn.QueueMetrics.running_300",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/running_1440":{
- "metric":"yarn.Queue.running_1440",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/running_1440":{
+ "metric":"yarn.QueueMetrics.running_1440",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AppsSubmitted":{
- "metric":"yarn.Queue.AppsSubmitted",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsSubmitted":{
+ "metric":"yarn.QueueMetrics.AppsSubmitted",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AppsRunning":{
- "metric":"yarn.Queue.AppsRunning",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsRunning":{
+ "metric":"yarn.QueueMetrics.AppsRunning",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AppsPending":{
- "metric":"yarn.Queue.AppsPending",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsPending":{
+ "metric":"yarn.QueueMetrics.AppsPending",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AppsCompleted":{
- "metric":"yarn.Queue.AppsCompleted",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsCompleted":{
+ "metric":"yarn.QueueMetrics.AppsCompleted",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AppsKilled":{
- "metric":"yarn.Queue.AppsKilled",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsKilled":{
+ "metric":"yarn.QueueMetrics.AppsKilled",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AppsFailed":{
- "metric":"yarn.Queue.AppsFailed",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsFailed":{
+ "metric":"yarn.QueueMetrics.AppsFailed",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AllocatedMB":{
- "metric":"yarn.Queue.AllocatedMB",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AllocatedMB":{
+ "metric":"yarn.QueueMetrics.AllocatedMB",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AllocatedContainers":{
- "metric":"yarn.Queue.AllocatedContainers",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AllocatedContainers":{
+ "metric":"yarn.QueueMetrics.AllocatedContainers",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AggregateContainersAllocated":{
- "metric":"yarn.Queue.AggregateContainersAllocated",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AggregateContainersAllocated":{
+ "metric":"yarn.QueueMetrics.AggregateContainersAllocated",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AggregateContainersReleased":{
- "metric":"yarn.Queue.AggregateContainersReleased",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AggregateContainersReleased":{
+ "metric":"yarn.QueueMetrics.AggregateContainersReleased",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/AvailableMB":{
- "metric":"yarn.Queue.AvailableMB",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/AvailableMB":{
+ "metric":"yarn.QueueMetrics.AvailableMB",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/PendingMB":{
- "metric":"yarn.Queue.PendingMB",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/PendingMB":{
+ "metric":"yarn.QueueMetrics.PendingMB",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/PendingContainers":{
- "metric":"yarn.Queue.PendingContainers",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/PendingContainers":{
+ "metric":"yarn.QueueMetrics.PendingContainers",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/ReservedMB":{
- "metric":"yarn.Queue.ReservedMB",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/ReservedMB":{
+ "metric":"yarn.QueueMetrics.ReservedMB",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/ReservedContainers":{
- "metric":"yarn.Queue.ReservedContainers",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/ReservedContainers":{
+ "metric":"yarn.QueueMetrics.ReservedContainers",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/ActiveUsers":{
- "metric":"yarn.Queue.ActiveUsers",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/ActiveUsers":{
+ "metric":"yarn.QueueMetrics.ActiveUsers",
+ "pointInTime":true,
"temporal":true
},
- "metrics/yarn/Queue/ActiveApplications":{
- "metric":"yarn.Queue.ActiveApplications",
- "pointInTime":false,
+ "ServiceComponentInfo/rm_metrics/yarn/Queue/ActiveApplications":{
+ "metric":"yarn.QueueMetrics.ActiveApplications",
+ "pointInTime":true,
"temporal":true
},
@@ -20620,4 +20620,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/jmx_properties_2.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/jmx_properties_2.json?rev=1488287&r1=1488286&r2=1488287&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/jmx_properties_2.json (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/resources/jmx_properties_2.json Fri May 31 16:06:21 2013
@@ -3440,6 +3440,124 @@
"pointInTime":true,
"temporal":false
}
+ },
+ "RESOURCEMANAGER":{
+ "metrics/jvm/gcCount":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.GcCount",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/gcTimeMillis":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.GcTimeMillis",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/logError":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogError",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/logFatal":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogFatal",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/logInfo":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogInfo",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/logWarn":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogWarn",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/memHeapCommittedM":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapCommittedM",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/memHeapUsedM":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapUsedM",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/memNonHeapCommittedM":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemNonHeapCommittedM",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/memNonHeapUsedM":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemNonHeapUsedM",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/threadsBlocked":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsBlocked",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/threadsNew":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsNew",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/threadsRunnable":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsRunnable",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/threadsTerminated":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsTerminated",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/threadsTimedWaiting":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsTimedWaiting",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/threadsWaiting":{
+ "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsWaiting",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "metrics/jvm/startTime":{
+ "metric" : "java.lang:type=Runtime.StartTime",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+
+ "ServiceComponentInfo/rm_metrics/cluster/activeNMcount":{
+ "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumActiveNMs",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "ServiceComponentInfo/rm_metrics/cluster/decommissionedNMcount":{
+ "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumDecommissionedNMs",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "ServiceComponentInfo/rm_metrics/cluster/lostNMcount":{
+ "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumLostNMs",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "ServiceComponentInfo/rm_metrics/cluster/unhealthyNMcount":{
+ "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumUnhealthyNMs",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "ServiceComponentInfo/rm_metrics/cluster/rebootedNMcount":{
+ "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumRebootedNMs",
+ "pointInTime" : true,
+ "temporal" : false
+ },
+ "ServiceComponentInfo/rm_metrics/cluster/nodeManagers":{
+ "metric" : "Hadoop:service=ResourceManager,name=RMNMInfo.LiveNodeManagers",
+ "pointInTime" : true,
+ "temporal" : false
+ }
}
},
"HostComponent":{
@@ -7428,88 +7546,6 @@
"temporal":false
}
},
- "RESOURCEMANAGER":{
- "metrics/jvm/gcCount":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.GcCount",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/gcTimeMillis":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.GcTimeMillis",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/logError":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogError",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/logFatal":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogFatal",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/logInfo":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogInfo",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/logWarn":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.LogWarn",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/memHeapCommittedM":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapCommittedM",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/memHeapUsedM":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapUsedM",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/memNonHeapCommittedM":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemNonHeapCommittedM",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/memNonHeapUsedM":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemNonHeapUsedM",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/threadsBlocked":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsBlocked",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/threadsNew":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsNew",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/threadsRunnable":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsRunnable",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/threadsTerminated":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsTerminated",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/threadsTimedWaiting":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsTimedWaiting",
- "pointInTime" : true,
- "temporal" : false
- },
- "metrics/jvm/threadsWaiting":{
- "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsWaiting",
- "pointInTime" : true,
- "temporal" : false
- }
- },
"NODEMANAGER":{
"metrics/jvm/gcCount":{
"metric" : "Hadoop:service=NodeManager,name=JvmMetrics.GcCount",