You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/12/09 14:50:15 UTC
svn commit: r1418956 [8/8] - in
/incubator/ambari/branches/AMBARI-666/ambari-web/app: ./ assets/data/apps/
assets/data/dashboard/ assets/data/wizard/stack/hdp/version01/ controllers/
controllers/global/ controllers/main/ controllers/main/admin/ control...
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/network.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/network.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/network.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/network.js Sun Dec 9 13:50:03 2012
@@ -32,7 +32,7 @@ App.ChartHostMetricsNetwork = App.ChartL
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/network/bytes_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/bytes_out[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_out[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/network/bytes_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/bytes_out[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_in[{fromSeconds},{toSeconds},{stepSeconds}],metrics/network/pkts_out[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: this.get('content').get('hostName')
}, "/data/hosts/metrics/network.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/processes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/processes.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/processes.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/processes.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartHostMetricsProcesses = App.Char
title: "Processes",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/process/proc_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/process/proc_run[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}?fields=metrics/process/proc_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/process/proc_run[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: this.get('content').get('hostName')
}, "/data/hosts/metrics/processes.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_ClusterRequ
title: "Cluster Requests",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/cluster_requests[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/cluster_requests[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/cluster_requests.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js Sun Dec 9 13:50:03 2012
@@ -32,7 +32,7 @@ App.ChartServiceMetricsHBASE_HlogSplitSi
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitSize_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitSize_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/hlog_split_size.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js Sun Dec 9 13:50:03 2012
@@ -32,7 +32,7 @@ App.ChartServiceMetricsHBASE_HlogSplitTi
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/hlog_split_time.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_RegionServe
title: "RegionServer Queue Size",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/flushQueueSize[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/compactionQueueSize[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/flushQueueSize[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/compactionQueueSize[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/regionserver_queuesize.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_RegionServe
title: "RegionServer Regions",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/regions[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/regions[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/regionserver_regions.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsHBASE_RegionServe
title: "RegionServer Requests",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/readRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/writeRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/readRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}],metrics/hbase/regionserver/writeRequestsCount[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/regionserver_rw_requests.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js Sun Dec 9 13:50:03 2012
@@ -33,7 +33,7 @@ App.ChartServiceMetricsHDFS_BlockStatus
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/block_status.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js Sun Dec 9 13:50:03 2012
@@ -33,7 +33,7 @@ App.ChartServiceMetricsHDFS_FileOperatio
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/namenode/FileInfoOps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/namenode/CreateFileOps[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/namenode/FileInfoOps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/namenode/CreateFileOps[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/file_operations.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_GC = App.Cha
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/gc.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/io.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/io.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/io.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/io.js Sun Dec 9 13:50:03 2012
@@ -32,7 +32,7 @@ App.ChartServiceMetricsHDFS_IO = App.Cha
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/HDFS/components/DATANODE?fields=metrics/dfs/datanode/bytes_written[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/datanode/bytes_read[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/HDFS/components/DATANODE?fields=metrics/dfs/datanode/bytes_written[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/datanode/bytes_read[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/io.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_JVMHeap = Ap
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?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}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?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}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/jvm_heap.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js Sun Dec 9 13:50:03 2012
@@ -33,7 +33,7 @@ App.ChartServiceMetricsHDFS_JVMThreads =
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?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}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?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}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/jvm_threads.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_RPC = App.Ch
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/rpc.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsHDFS_SpaceUtiliza
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: nameNodeHostName
}, "/data/services/metrics/hdfs/space_utilization.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsMapReduce_GC = Ap
url: function () {
var mrService = App.MapReduceService.find().objectAt(0);
var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: jtHostName
}, "/data/services/metrics/mapreduce/gc.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_JobsRun
title: "Jobs (Running/Waiting)",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/running_reduces[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_reduces[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/running_reduces[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_reduces[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/jobs_running_waiting.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_JobsSta
title: "Jobs Status",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_preparing[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_submitted[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_running[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_preparing[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_submitted[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_running[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/jobs_status.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsMapReduce_JVMHeap
url: function () {
var mrService = App.MapReduceService.find().objectAt(0);
var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?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}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?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}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: jtHostName
}, "/data/services/metrics/mapreduce/jvm_heap.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js Sun Dec 9 13:50:03 2012
@@ -33,7 +33,7 @@ App.ChartServiceMetricsMapReduce_JVMThre
url: function () {
var mrService = App.MapReduceService.find().objectAt(0);
var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?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}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?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}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: jtHostName
}, "/data/services/metrics/mapreduce/jvm_threads.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_MapSlot
title: "Map Slot Utilization",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_map_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_map_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/map_slots.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js Sun Dec 9 13:50:03 2012
@@ -31,7 +31,7 @@ App.ChartServiceMetricsMapReduce_ReduceS
title: "Reduce Slots Utilization",
url: function () {
- return App.formatUrl("/api/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/reduce_slots.json");
}.property('App.router.clusterController.clusterName'),
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js Sun Dec 9 13:50:03 2012
@@ -34,7 +34,7 @@ App.ChartServiceMetricsMapReduce_RPC = A
url: function () {
var mrService = App.MapReduceService.find().objectAt(0);
var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
+ return App.formatUrl(App.apiPrefix + "/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
clusterName: App.router.get('clusterController.clusterName'),
hostName: jtHostName
}, "/data/services/metrics/mapreduce/rpc.json");
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js Sun Dec 9 13:50:03 2012
@@ -19,21 +19,22 @@
var App = require('app');
App.MainServiceMenuView = Em.CollectionView.extend({
- content: function () {
+ content:function () {
return App.router.get('mainServiceController.content');
}.property('App.router.mainServiceController.content'),
- didInsertElement: function () {
+
+ didInsertElement:function () {
App.router.location.addObserver('lastSetURL', this, 'renderOnRoute');
this.renderOnRoute();
},
- activeServiceId : null,
+ activeServiceId:null,
/**
* Syncs navigation menu with requested URL
*/
- renderOnRoute: function () {
+ renderOnRoute:function () {
var last_url = App.router.location.lastSetURL || location.href.replace(/^[^#]*#/, '');
if (last_url.substr(1, 4) !== 'main' || !this._childViews) {
return;
@@ -45,15 +46,15 @@ App.MainServiceMenuView = Em.CollectionV
},
- tagName: 'ul',
- classNames: ["nav", "nav-list", "nav-services"],
+ tagName:'ul',
+ classNames:["nav", "nav-list", "nav-services"],
- itemViewClass: Em.View.extend({
- classNameBindings: ["active"],
- active: function(){
+ itemViewClass:Em.View.extend({
+ classNameBindings:["active"],
+ active:function () {
return this.get('content.id') == this.get('parentView.activeServiceId') ? 'active' : '';
}.property('parentView.activeServiceId'),
- alertsCount: function () {
+ alertsCount:function () {
var allAlerts = App.router.get('clusterController.alerts');
var serviceId = this.get('content.serviceName');
if (serviceId) {
@@ -62,6 +63,6 @@ App.MainServiceMenuView = Em.CollectionV
return 0;
}.property('App.router.clusterController.alerts'),
- templateName: require('templates/main/service/menu_item')
+ templateName:require('templates/main/service/menu_item')
})
});
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js Sun Dec 9 13:50:03 2012
@@ -257,11 +257,11 @@ App.ServiceConfigMultipleHostsDisplay =
}.property('value'),
hasOneHost: function () {
- return this.get('value').length === 1;
+ return this.get('value').length > 0;
}.property('value'),
hasMultipleHosts: function () {
- return this.get('value').length > 1;
+ return (this.get('value').length > 1 && typeof(this.get('value')) == 'object');
}.property('value'),
otherLength: function () {
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step6_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step6_view.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step6_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step6_view.js Sun Dec 9 13:50:03 2012
@@ -57,11 +57,14 @@ App.WizardStep6HostView = Em.View.extend
tagName: 'td',
didInsertElement: function () {
- var components = this.get('controller').getMasterComponentsForHost(this.get('host.hostname'));
- if(components){
+ var components = this.get('controller').getMasterComponentsForHost(this.get('host.hostName'));
+ if (components && components.length > 0) {
+ components = components.map(function(_component) {
+ return App.format.role(_component);
+ });
components = components.join(" /\n");
this.$().popover({
- title: 'master components hosted on ' + this.get('host.hostname'),
+ title: 'master components hosted on ' + this.get('host.hostName'),
content: components,
placement: 'right',
trigger: 'hover'
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js?rev=1418956&r1=1418955&r2=1418956&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js Sun Dec 9 13:50:03 2012
@@ -180,7 +180,7 @@ App.HostStatusView = Em.View.extend({
$.ajax({
url: url,
dataType: 'text',
- timeout: 10000,
+ timeout: App.timeout,
success: function (data) {
var task = $.parseJSON(data);
taskInfo.set('stdout', task.Tasks.stdout);