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 16:11:06 UTC
svn commit: r1419002 [20/20] - in
/incubator/ambari/branches/AMBARI-666/ambari-web: ./ app/
app/assets/data/wizard/deploy/ app/assets/data/wizard/deploy/2_hosts/
app/assets/data/wizard/deploy/5_hosts/
app/assets/data/wizard/deploy/master_failure/ app/a...
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsHDFS_BlockStatus = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-block-status",
title: "Block Status",
-
+ renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsHDFS_FileOperations = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-file-operations",
title: "File Operations",
-
+ renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -30,7 +30,7 @@ App.ChartServiceMetricsHDFS_IO = App.Cha
id: "service-metrics-hdfs-io",
title: "HDFS I/O",
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
-
+ renderer: 'line',
url: function () {
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')
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -30,7 +30,7 @@ App.ChartServiceMetricsHDFS_JVMHeap = Ap
id: "service-metrics-hdfs-jvm-heap",
title: "JVM Memory Status",
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
-
+ renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsHDFS_JVMThreads = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-jvm-threads",
title: "JVM Thread Status",
-
+ renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -30,7 +30,7 @@ App.ChartServiceMetricsHDFS_SpaceUtiliza
id: "service-metrics-hdfs-space-utilization",
title: "Total Space Utilization",
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
-
+ renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsMapReduce_JobsRunningWaiting = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jobs-running-waiting",
title: "Jobs (Running/Waiting)",
-
+ renderer: 'line',
url: function () {
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')
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsMapReduce_JobsStatus = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jobs-status",
title: "Jobs Status",
-
+ renderer: 'line',
url: function () {
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')
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsMapReduce_MapSlots = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-map-slots",
title: "Map Slot Utilization",
-
+ renderer: 'line',
url: function () {
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')
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -29,7 +29,7 @@ var App = require('app');
App.ChartServiceMetricsMapReduce_ReduceSlots = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-reduce-slots",
title: "Reduce Slots Utilization",
-
+ renderer: 'line',
url: function () {
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')
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js?rev=1419002&r1=1419001&r2=1419002&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js Sun Dec 9 15:10:57 2012
@@ -192,10 +192,22 @@ App.MainServiceInfoSummaryView = Em.View
$(summaryTable).attr('style', "height:" + alertsList.clientHeight + "px;");
}
}
- // Tooltips for alerts need to be enabled.
- $("div[rel=tooltip]").tooltip();
},
+ alertItemView:Em.View.extend({
+ tagName:"li",
+ templateName: require('templates/main/service/info/summary_alert'),
+ classNameBindings: ["status"],
+ status: function () {
+ return "status-" + this.get("content.status");
+ }.property('content'),
+ didInsertElement: function () {
+ // Tooltips for alerts need to be enabled.
+ $("div[rel=tooltip]").tooltip();
+ $(".tooltip").remove();
+ }
+ }),
+
clientHosts:App.Host.find(),
clientHostsLength:function () {
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -331,7 +331,7 @@ App.SlaveComponentGroupsMenu = Em.Collec
errorCount: function () {
return this.get('content.properties').filterProperty('isValid', false).filterProperty('isVisible', true).get('length');
- }.property('content.properties.@each.isValid','content.properties.@each.isVisible'),
+ }.property('content.properties.@each.isValid', 'content.properties.@each.isVisible'),
template: Ember.Handlebars.compile('<a {{action showSlaveComponentGroup view.content target="controller"}} href="#"> {{view.content.name}}{{#if view.errorCount}}<span class="badge badge-important">{{view.errorCount}}</span>{{/if}}</a><i {{action removeSlaveComponentGroup view.content target="controller"}} class="icon-remove"></i>')
})
@@ -468,3 +468,4 @@ App.SlaveComponentChangeGroupNameView =
}
}
});
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step7_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step7_view.js?rev=1419002&r1=1419001&r2=1419002&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step7_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step7_view.js Sun Dec 9 15:10:57 2012
@@ -60,7 +60,6 @@ App.WizardStep7.ServiceConfigsByCategory
this.set('category.isCollapsed', false);
}
},
-
layout: Ember.Handlebars.compile('<div {{bindAttr id="view.category.name"}} class="accordion-body collapse in"><div class="accordion-inner">{{yield}}</div></div>')
});
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=1419002&r1=1419001&r2=1419002&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 15:10:57 2012
@@ -67,6 +67,7 @@ App.HostStatusView = Em.View.extend({
var controller = this.get('controller');
this.onStatus();
},
+
barWidth: function () {
var barWidth = 'width: ' + this.get('obj.progress') + '%;';
return barWidth;
@@ -117,6 +118,10 @@ App.HostStatusView = Em.View.extend({
}
}.property('controller.isStepCompleted', 'controller.status'),
+ isHostCompleted: function () {
+ return this.get('obj.progress') == 100 || this.get('controller.isStepCompleted');
+ }.property('controller.isStepCompleted', 'obj.progress'),
+
hostLogPopup: function (event, context) {
var self = this;
var host = event.context;
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml?rev=1419002&r1=1419001&r2=1419002&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml Sun Dec 9 15:10:57 2012
@@ -45,6 +45,21 @@
<version>1.7</version>
<executions>
<execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="ambari-web-clean">
+ <exec dir="${basedir}" executable="rm" failonerror="false">
+ <arg value="-rf"/>
+ <arg value="public"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
<id>compile</id>
<phase>compile</phase>
<goals>