You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/06/06 06:27:52 UTC
svn commit: r1490127 - in
/incubator/ambari/branches/branch-1.4.0/ambari-web/app:
assets/data/services/metrics/yarn/ mappers/ utils/ views/common/chart/
views/main/service/info/ views/main/service/info/metrics/yarn/
Author: srimanth
Date: Thu Jun 6 04:27:52 2013
New Revision: 1490127
URL: http://svn.apache.org/r1490127
Log:
AMBARI-2295. YARN graphs have to be provided. (srimanth)
Added:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/gc.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_heap.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_threads.json
incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/rpc.json
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/ajax.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/common/chart/linear_time.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_threads.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/rpc.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js
Added: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/gc.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/gc.json?rev=1490127&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/gc.json (added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/gc.json Thu Jun 6 04:27:52 2013
@@ -0,0 +1,16 @@
+{
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/RESOURCEMANAGER?fields=metrics/jvm/gcTimeMillis[1351213550,1351217148,60]",
+ "HostRoles" : {
+ "cluster_name" : "SrimanthAmbari",
+ "component_name" : "RESOURCEMANAGER",
+ "host_name" : "hostname"
+ },
+ "host" : {
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
+ },
+ "metrics" : {
+ "jvm" : {
+ "gcTimeMillis" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.011111111111,1351215720],[0.0,1351216080],[0.0,1351216440],[1.1930462189E7,1351216800],[0.069444444444,1351217160]]"
+ }
+ }
+}
\ No newline at end of file
Added: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_heap.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_heap.json?rev=1490127&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_heap.json (added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_heap.json Thu Jun 6 04:27:52 2013
@@ -0,0 +1,19 @@
+{
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/RESOURCEMANAGER?fields=metrics/jvm/memNonHeapUsedM[1351213550,1351217148,60],metrics/jvm/memNonHeapCommittedM[1351213550,1351217148,60],metrics/jvm/memHeapUsedM[1351213550,1351217148,60],metrics/jvm/memHeapCommittedM[1351213550,1351217148,60]",
+ "HostRoles" : {
+ "cluster_name" : "SrimanthAmbari",
+ "component_name" : "RESOURCEMANAGER",
+ "host_name" : "hostname"
+ },
+ "host" : {
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
+ },
+ "metrics" : {
+ "jvm" : {
+ "memHeapCommittedM" : "[[185.1875,1351213560],[185.1875,1351213920],[185.1875,1351214280],[185.1875,1351214640],[185.1875,1351215000],[185.1875,1351215360],[185.1875,1351215720],[185.1875,1351216080],[185.1875,1351216440],[185.1875,1351216800],[185.1875,1351217160]]",
+ "memNonHeapUsedM" : "[[24.856247,1351213560],[24.856247,1351213920],[24.856247,1351214280],[24.856247,1351214640],[24.856247,1351215000],[24.856247,1351215360],[24.856247,1351215720],[24.856247,1351216080],[24.856247,1351216440],[23.964379333,1351216800],[21.711374106,1351217160]]",
+ "memHeapUsedM" : "[[58.635102042,1351213560],[76.2040755,1351213920],[93.246927389,1351214280],[110.45160614,1351214640],[127.54546414,1351215000],[144.66363658,1351215360],[96.690545511,1351215720],[20.528702175,1351216080],[38.275298164,1351216440],[59.513269842,1351216800],[127.88187832,1351217160]]",
+ "memNonHeapCommittedM" : "[[39.08203,1351213560],[39.08203,1351213920],[39.08203,1351214280],[39.08203,1351214640],[39.08203,1351215000],[39.08203,1351215360],[39.08203,1351215720],[39.08203,1351216080],[39.08203,1351216440],[36.653699028,1351216800],[23.404166667,1351217160]]"
+ }
+ }
+}
\ No newline at end of file
Added: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_threads.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_threads.json?rev=1490127&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_threads.json (added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/jvm_threads.json Thu Jun 6 04:27:52 2013
@@ -0,0 +1,19 @@
+{
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/RESOURCEMANAGER?fields=metrics/jvm/threadsRunnable[1351213550,1351217148,60],metrics/jvm/threadsBlocked[1351213550,1351217148,60],metrics/jvm/threadsWaiting[1351213550,1351217148,60],metrics/jvm/threadsTimedWaiting[1351213550,1351217148,60]",
+ "HostRoles" : {
+ "cluster_name" : "SrimanthAmbari",
+ "component_name" : "RESOURCEMANAGER",
+ "host_name" : "hostname"
+ },
+ "host" : {
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
+ },
+ "metrics" : {
+ "jvm" : {
+ "threadsBlocked" : "[[0.0,1351213560],[0.0,1351213920],[0.0,1351214280],[0.0,1351214640],[0.0,1351215000],[0.0,1351215360],[0.0,1351215720],[0.0,1351216080],[0.0,1351216440],[0.0,1351216800],[0.0,1351217160]]",
+ "threadsWaiting" : "[[59.0,1351213560],[59.0,1351213920],[59.0,1351214280],[59.0,1351214640],[59.0,1351215000],[59.0,1351215360],[59.0,1351215720],[59.0,1351216080],[59.0,1351216440],[58.388888889,1351216800],[58.627777778,1351217160]]",
+ "threadsTimedWaiting" : "[[10.0,1351213560],[10.0,1351213920],[10.0,1351214280],[10.0,1351214640],[10.0,1351215000],[10.0,1351215360],[10.0,1351215720],[10.0,1351216080],[10.0,1351216440],[10.161111111,1351216800],[10.830555556,1351217160]]",
+ "threadsRunnable" : "[[6.0,1351213560],[6.0,1351213920],[6.0,1351214280],[6.0,1351214640],[6.0,1351215000],[6.0,1351215360],[6.0,1351215720],[6.0,1351216080],[6.0,1351216440],[6.0,1351216800],[6.0,1351217160]]"
+ }
+ }
+}
\ No newline at end of file
Added: incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/rpc.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/rpc.json?rev=1490127&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/rpc.json (added)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/assets/data/services/metrics/yarn/rpc.json Thu Jun 6 04:27:52 2013
@@ -0,0 +1,16 @@
+{
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/RESOURCEMANAGER?fields=metrics/rpc/RpcQueueTime_avg_time[1351213550,1351217148,60]",
+ "HostRoles" : {
+ "cluster_name" : "SrimanthAmbari",
+ "component_name" : "RESOURCEMANAGER",
+ "host_name" : "hostname"
+ },
+ "host" : {
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname"
+ },
+ "metrics" : {
+ "rpc" : {
+ "RpcQueueTime_avg_time" : "[[0.069553376906,1351213560],[0.08265993266,1351213920],[0.096717171717,1351214280],[0.07859724698,1351214640],[0.093248663102,1351215000],[0.084630619925,1351215360],[0.09087443058,1351215720],[0.075108932462,1351216080],[0.086007130125,1351216440],[0.42323904309,1351216800],[0.14756856477,1351217160]]"
+ }
+ }
+}
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js Thu Jun 6 04:27:52 2013
@@ -323,8 +323,11 @@ App.servicesMapper = App.QuickDataMapper
item.components.forEach(function (component) {
if (component.ServiceComponentInfo && component.ServiceComponentInfo.component_name == "RESOURCEMANAGER") {
item.resourceManagerComponent = component;
- //live nodes calculation
- var nmList = App.parseJSON(component.ServiceComponentInfo.rm_metrics.cluster.nodeManagers)
+ // live nodes calculation
+ var nmList = [];
+ if (component.ServiceComponentInfo.rm_metrics && component.ServiceComponentInfo.rm_metrics.cluster && component.ServiceComponentInfo.rm_metrics.cluster.nodeManagers) {
+ nmList = App.parseJSON(component.ServiceComponentInfo.rm_metrics.cluster.nodeManagers);
+ }
nmList.forEach(function (nm) {
if (nm.State === "RUNNING") {
if (!item.node_manager_live_nodes) {
@@ -359,7 +362,7 @@ App.servicesMapper = App.QuickDataMapper
});
// Map
var finalJson = this.parseIt(item, finalConfig);
- finalJson.quick_links = [19, 20, 21, 22];
+ finalJson.quick_links = [ 19, 20, 21, 22 ];
return finalJson;
},
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/ajax.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/ajax.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/ajax.js Thu Jun 6 04:27:52 2013
@@ -349,6 +349,26 @@ var urls = {
'mock': '/data/services/metrics/hdfs/space_utilization.json',
'testInProduction': true
},
+ 'service.metrics.yarn.gc': {
+ 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'mock': '/data/services/metrics/yarn/gc.json',
+ 'testInProduction': true
+ },
+ 'service.metrics.yarn.jobs_threads': {
+ 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'mock': '/data/services/metrics/yarn/jvm_threads.json',
+ 'testInProduction': true
+ },
+ 'service.metrics.yarn.rpc': {
+ 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'mock': '/data/services/metrics/yarn/rpc.json',
+ 'testInProduction': true
+ },
+ 'service.metrics.yarn.jobs_heap': {
+ 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'mock': '/data/services/metrics/yarn/jvm_heap.json',
+ 'testInProduction': true
+ },
'dashboard.cluster_metrics.cpu': {
'real': '/clusters/{clusterName}/?fields=metrics/cpu[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/cluster_metrics/cpu_1hr.json',
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/common/chart/linear_time.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/common/chart/linear_time.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/common/chart/linear_time.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/common/chart/linear_time.js Thu Jun 6 04:27:52 2013
@@ -159,6 +159,8 @@ App.ChartLinearTimeView = Ember.View.ext
var nameNodeName = HDFSService ? HDFSService.get('nameNode.hostName') : "";
var MapReduceService = App.MapReduceService.find().objectAt(0);
var jobTrackerNode = MapReduceService ? MapReduceService.get('jobTracker.hostName') : "";
+ var YARNService = App.YARNService.find().objectAt(0);
+ var resourceManager = YARNService ? YARNService.get('resourceManagerNode.hostName') : "";
var timeUnit = this.get('timeUnitSeconds');
return {
toSeconds: toSeconds,
@@ -166,7 +168,8 @@ App.ChartLinearTimeView = Ember.View.ext
stepSeconds: 15,
hostName: hostName,
nameNodeName: nameNodeName,
- jobTrackerNode: jobTrackerNode
+ jobTrackerNode: jobTrackerNode,
+ resourceManager: resourceManager
};
},
loadDataErrorCallback: function(xhr, textStatus, errorThrown){
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_heap.js Thu Jun 6 04:27:52 2013
@@ -32,7 +32,7 @@ App.ChartServiceMetricsYARN_JVMHeap = Ap
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
- ajaxIndex: 'service.metrics.mapreduce.jobs_heap',
+ ajaxIndex: 'service.metrics.yarn.jobs_heap',
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_threads.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_threads.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/jvm_threads.js Thu Jun 6 04:27:52 2013
@@ -31,7 +31,7 @@ App.ChartServiceMetricsYARN_JVMThreads =
title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads'),
renderer: 'line',
- ajaxIndex: 'service.metrics.mapreduce.jobs_threads',
+ ajaxIndex: 'service.metrics.yarn.jobs_threads',
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/rpc.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/rpc.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/metrics/yarn/rpc.js Thu Jun 6 04:27:52 2013
@@ -31,7 +31,7 @@ App.ChartServiceMetricsYARN_RPC = App.Ch
title: Em.I18n.t('services.service.info.metrics.mapreduce.rpc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
- ajaxIndex: 'service.metrics.mapreduce.rpc',
+ ajaxIndex: 'service.metrics.yarn.rpc',
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js?rev=1490127&r1=1490126&r2=1490127&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js Thu Jun 6 04:27:52 2013
@@ -297,12 +297,12 @@ App.MainServiceInfoSummaryView = Em.View
App.ChartServiceMetricsHDFS_JVMThreads.extend()]];
break;
case 'yarn':
- graphs = [ [App.ChartServiceMetricsYARN_JobsStatus.extend(),
+ graphs = [ /*[App.ChartServiceMetricsYARN_JobsStatus.extend(),
App.ChartServiceMetricsYARN_TasksRunningWaiting.extend(),
App.ChartServiceMetricsYARN_MapSlots.extend(),
- App.ChartServiceMetricsYARN_ReduceSlots.extend()],
- [App.ChartServiceMetricsYARN_GC.extend(),
- App.ChartServiceMetricsYARN_RPC.extend(),
+ App.ChartServiceMetricsYARN_ReduceSlots.extend()],*/
+ [App.ChartServiceMetricsYARN_RPC.extend(),
+ App.ChartServiceMetricsYARN_GC.extend(),
App.ChartServiceMetricsYARN_JVMHeap.extend(),
App.ChartServiceMetricsYARN_JVMThreads.extend()]];
break;