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 13:07:00 UTC
svn commit: r1418902 - in
/incubator/ambari/branches/AMBARI-666/ambari-web/app: ./ utils/
views/main/host/metrics/ views/main/service/info/metrics/hbase/
views/main/service/info/metrics/hdfs/
views/main/service/info/metrics/mapreduce/
Author: yusaku
Date: Sun Dec 9 12:06:57 2012
New Revision: 1418902
URL: http://svn.apache.org/viewvc?rev=1418902&view=rev
Log:
AMBARI-976. Hook HDFS/MapReduce/HBase/Host graphs to backend API. (Srimanth Gunturi via yusaku)
Modified:
incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/cpu.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/disk.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/load.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/memory.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/network.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/processes.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/io.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_running_waiting.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js?rev=1418902&r1=1418901&r2=1418902&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js Sun Dec 9 12:06:57 2012
@@ -42,8 +42,7 @@ App.initialize();
/**
* Test Mode values
*/
-//App.Cluster.FIXTURES[0].cluster_name = 'vmc';
-//App.test_hostname = 'hostname';
+App.test_hostname = 'hostname';
console.log('after initialize');
console.log('TRACE: app.js-> localStorage:Ambari.authenticated=' + localStorage.getItem('Ambari' + 'authenticated'));
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js?rev=1418902&r1=1418901&r2=1418902&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/helper.js Sun Dec 9 12:06:57 2012
@@ -112,7 +112,7 @@ Number.prototype.countPercentageRatio =
App.formatUrl = function (urlTemplate, substitutes, testUrl) {
var formatted = urlTemplate;
if (urlTemplate) {
- if (App.testMode) {
+ if (!App.testMode) {
var toSeconds = Math.round(new Date().getTime() / 1000);
var allSubstitutes = {
toSeconds: toSeconds,
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/cpu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/cpu.js?rev=1418902&r1=1418901&r2=1418902&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/cpu.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/cpu.js Sun Dec 9 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartHostMetricsCPU = App.ChartLinea
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/cpu/cpu_user[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_wio[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_nice[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_aidle[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_system[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_idle[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/hosts/metrics/cpu.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/disk.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/disk.js?rev=1418902&r1=1418901&r2=1418902&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/disk.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/disk.js Sun Dec 9 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartHostMetricsDisk = App.ChartLine
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/disk/disk_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/disk/part_max_used[{fromSeconds},{toSeconds},{stepSeconds}],metrics/disk/disk_free[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/hosts/metrics/disk.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/load.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/load.js?rev=1418902&r1=1418901&r2=1418902&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/load.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/load.js Sun Dec 9 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartHostMetricsLoad = App.ChartLine
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/load/load_fifteen[{fromSeconds},{toSeconds},{stepSeconds}],metrics/load/load_one[{fromSeconds},{toSeconds},{stepSeconds}],metrics/load/load_five[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/hosts/metrics/load.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/memory.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/memory.js?rev=1418902&r1=1418901&r2=1418902&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/memory.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host/metrics/memory.js Sun Dec 9 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartHostMetricsMemory = App.ChartLi
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/memory/swap_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_free[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_cached[{fromSeconds},{toSeconds},{stepSeconds}],metrics/memory/mem_buffers[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/hosts/metrics/memory.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartHostMetricsNetwork = App.ChartL
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/hosts/metrics/network.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartHostMetricsProcesses = App.Char
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}?fields=metrics/processes/proc_total[{fromSeconds},{toSeconds},{stepSeconds}],metrics/processes/proc_run[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/hosts/metrics/processes.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsHBASE_ClusterRequ
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/cluster_requests[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/cluster_requests.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsHBASE_HlogSplitSi
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitSize_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/hlog_split_size.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsHBASE_HlogSplitTi
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_MASTER?fields=metrics/hbase/master/splitTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/hlog_split_time.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsHBASE_RegionServe
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/regionserver_queuesize.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsHBASE_RegionServe
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/regions[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/regionserver_regions.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsHBASE_RegionServe
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hbase/regionserver_rw_requests.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsHDFS_FileOperatio
url: function () {
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/file_operations.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsHDFS_GC = App.Cha
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/gc.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsHDFS_IO = App.Cha
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/io.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsHDFS_JVMHeap = Ap
url: function () {
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/jvm_heap.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsHDFS_JVMThreads =
url: function () {
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/jvm_threads.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsHDFS_RPC = App.Ch
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/hdfs/rpc.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsMapReduce_GC = Ap
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/gc.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsMapReduce_JobsRun
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/jobs_running_waiting.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsMapReduce_JobsSta
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/jobs_status.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsMapReduce_JVMHeap
url: function () {
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/jvm_heap.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsMapReduce_JVMThre
url: function () {
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/jvm_threads.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsMapReduce_MapSlot
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/map_slots.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -32,9 +32,9 @@ App.ChartServiceMetricsMapReduce_ReduceS
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}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/reduce_slots.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];
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=1418902&r1=1418901&r2=1418902&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 12:06:57 2012
@@ -33,9 +33,9 @@ App.ChartServiceMetricsMapReduce_RPC = A
url: function () {
return App.formatUrl("/api/clusters/{clusterName}/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]", {
- clusterName: App.router.get('mainController.cluster').get('clusterName')
+ clusterName: App.router.get('clusterController.clusterName')
}, "/data/services/metrics/mapreduce/rpc.json");
- }.property('App.router.mainController.cluster'),
+ }.property('App.router.clusterController.clusterName'),
transformToSeries: function (jsonData) {
var seriesArray = [];