diff options
| author | Yusaku Sako <yusaku@apache.org> | 2012-12-09 14:11:19 +0000 |
|---|---|---|
| committer | Yusaku Sako <yusaku@apache.org> | 2012-12-09 14:11:19 +0000 |
| commit | 0769fc6f9f2cf39c30c0e7e597d7a01b85b70f28 (patch) | |
| tree | 0daa91ad48ff9888ca283493ef5aba5ff1cbc33b /ambari-web | |
| parent | 41dfe5d74f5c5d5bbda94ae7e9652c6e3020bbdf (diff) | |
AMBARI-1059. Refactor cluster management. (yusaku)
git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418965 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'ambari-web')
56 files changed, 753 insertions, 342 deletions
diff --git a/ambari-web/app/assets/data/hosts/hosts.json b/ambari-web/app/assets/data/hosts/hosts.json index eede59c1be..5e6ef20c35 100644 --- a/ambari-web/app/assets/data/hosts/hosts.json +++ b/ambari-web/app/assets/data/hosts/hosts.json @@ -14,6 +14,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -88,7 +93,11 @@ "host_name" : "dev2.hortonworks.com", "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, - "os_type" : "centos6", + "os_type" : "centos6","load" : { + "load_fifteen" : 9.13213888889, + "load_five" : 8.68588888889 + }, + "ip" : "10.0.2.15" }, "host_components" : [ @@ -164,6 +173,10 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -238,6 +251,10 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -304,6 +321,9 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -370,6 +390,9 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -436,6 +459,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -502,6 +530,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -568,6 +601,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -634,6 +672,10 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -700,6 +742,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -766,6 +813,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -832,6 +884,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js index dfe44c6d11..9547259b3f 100644 --- a/ambari-web/app/controllers.js +++ b/ambari-web/app/controllers.js @@ -42,7 +42,6 @@ require('controllers/main/alert'); require('controllers/main/host'); require('controllers/main/host/details'); require('controllers/main/host/add_controller'); -require('controllers/main/dashboard'); require('controllers/main/charts'); require('controllers/main/charts/heatmap_metrics/heatmap_metric'); require('controllers/main/charts/heatmap_metrics/heatmap_metric_processrun'); diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index 02bada678d..7a9e06af76 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -97,8 +97,7 @@ App.ClusterController = Em.Controller.extend({ if (nagiosSvcComponent) { var hostName = nagiosSvcComponent.get('host.hostName'); if (hostName) { - return null; - //return "http://"+hostName+"/nagios"; + return "http://"+hostName+"/nagios"; } } } @@ -198,7 +197,7 @@ App.ClusterController = Em.Controller.extend({ console.log('update finished') setTimeout(function(){ self.updateStatus(); - }, 1000); + }, 3000); } }, null); }, @@ -370,7 +369,7 @@ App.ClusterController = Em.Controller.extend({ setTimeout(function(){ self.updateStatus(); - }, 1000); + }, 8000); }, diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js index b90f33e5f0..8aafc00dd9 100644 --- a/ambari-web/app/controllers/installer.js +++ b/ambari-web/app/controllers/installer.js @@ -772,7 +772,11 @@ App.InstallerController = Em.Controller.extend({ * Generate clients list for selected services and save it to model * called form stepController step8WizardController or step9WizardController */ - installServices: function () { + installServices: function (isRetry) { + if(!isRetry && this.get('content.cluster.requestId')){ + return; + } + var self = this; var clusterName = this.get('content.cluster.name'); var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT'; diff --git a/ambari-web/app/controllers/main/charts/heatmap.js b/ambari-web/app/controllers/main/charts/heatmap.js index 645696e66d..04d8d45fa6 100644 --- a/ambari-web/app/controllers/main/charts/heatmap.js +++ b/ambari-web/app/controllers/main/charts/heatmap.js @@ -27,7 +27,13 @@ App.MainChartsHeatmapController = Em.Controller.extend({ }) ], selectedMetric: null, - + /** + * route on host detail page + * @param event + */ + routeHostDetail: function(event){ + App.router.transitionTo('main.hostDetails.summary', event.context) + }, showHeatMapMetric: function (event) { var metricItem = event.context; if (metricItem) { diff --git a/ambari-web/app/controllers/main/dashboard.js b/ambari-web/app/controllers/main/dashboard.js deleted file mode 100644 index a1ef10cd71..0000000000 --- a/ambari-web/app/controllers/main/dashboard.js +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var App = require('app'); - -App.MainDashboardController = Em.Controller.extend({ - name:'mainDashboardController', - alerts: function(){ - return App.router.get('clusterController.alerts'); - }.property('App.router.clusterController.alerts'), - - alertsFilteredByName: 'All', - alertsFilteredByType: 'All', - alertsFilter: function(event) { - if (event.context && event.context.model && event.context.model.get('serviceName')){ - this.set('alertsFilteredByName', event.context.model.get('displayName')); - this.set('alertsFilteredByType', event.context.model.get('serviceName')); - } else { - this.set('alertsFilteredByName', 'All'); - this.set('alertsFilteredByType', 'All'); - } - }, - /** - * We do not want to re-get all the data everytime the filter - * is changed. Hence we just filtered the alerts got during page - * load. - */ - displayAlerts: function(){ - if(this.get('alertsFilteredByType')=='All') - return this.get('alerts'); - else - var type = this.get('alertsFilteredByType').toLowerCase(); - return this.get('alerts').filter(function(item){ - var serviceType = item.get('serviceType'); - return serviceType && serviceType.toLowerCase()==type.toLowerCase(); - }); - }.property('alerts', 'alertsFilteredByType'), - - nagiosUrl: function(){ - return App.router.get('clusterController.nagiosUrl'); - }.property('App.router.clusterController.nagiosUrl'), - - isNagiosInstalled: function(){ - return App.router.get('clusterController.isNagiosInstalled'); - }.property('App.router.clusterController.isNagiosInstalled'), - - alertsCount: function() { - var alerts = this.get('alerts'); - return alerts ? alerts.filterProperty('status', 'corrupt').length : 0; - }.property('alerts') -});
\ No newline at end of file diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js index 522c732bdb..dc89e04a66 100644 --- a/ambari-web/app/controllers/main/host/add_controller.js +++ b/ambari-web/app/controllers/main/host/add_controller.js @@ -199,6 +199,17 @@ App.AddHostController = Em.Controller.extend({ }, /** + * save status of the cluster. This is called from step8 and step9 to persist install and start requestId + * @param clusterStatus object with status, isCompleted, requestId, isInstallError and isStartError field. + */ + saveClusterStatus: function (clusterStatus) { + clusterStatus.name = this.get('content.cluster.name'); + this.set('content.cluster', clusterStatus); + console.log('called saveClusterStatus ' + JSON.stringify(clusterStatus)); + App.db.setClusterStatus(clusterStatus); + }, + + /** * Temporary function for wizardStep9, before back-end integration */ setInfoForStep9: function () { @@ -728,7 +739,11 @@ App.AddHostController = Em.Controller.extend({ * Generate clients list for selected services and save it to model * @param stepController step8WizardController or step9WizardController */ - installServices: function () { + installServices: function (isRetry) { + if(!isRetry && this.get('content.cluster.requestId')){ + return; + } + var self = this; var clusterName = this.get('content.cluster.name'); var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT'; @@ -757,7 +772,7 @@ App.AddHostController = Em.Controller.extend({ isCompleted: false, installStartTime: installSartTime }; - //self.saveClusterStatus(clusterStatus); + self.saveClusterStatus(clusterStatus); } else { console.log('ERROR: Error occurred in parsing JSON data'); } @@ -773,7 +788,7 @@ App.AddHostController = Em.Controller.extend({ isInstallError: true, isCompleted: false }; - //self.saveClusterStatus(clusterStatus); + self.saveClusterStatus(clusterStatus); }, statusCode: require('data/statusCodes') diff --git a/ambari-web/app/controllers/main/service.js b/ambari-web/app/controllers/main/service.js index 9fb99cd0c6..4d05b3d1a1 100644 --- a/ambari-web/app/controllers/main/service.js +++ b/ambari-web/app/controllers/main/service.js @@ -20,5 +20,6 @@ var App = require('app'); App.MainServiceController = Em.ArrayController.extend({ name:'mainServiceController', - content: App.Service.find() + content: App.Service.find(), + additionalMenuItem:Em.Object.create({ id:'Clients', displayName:'Clients', isClients:true }) })
\ No newline at end of file diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js index a70017900c..ec094f65af 100644 --- a/ambari-web/app/controllers/main/service/add_controller.js +++ b/ambari-web/app/controllers/main/service/add_controller.js @@ -287,7 +287,11 @@ App.AddServiceController = Em.Controller.extend({ }); this.set('content.services', servicesInfo); console.log('AddServiceController.loadServices: loaded data ', servicesInfo); - console.log('selected services ', servicesInfo.filterProperty('isSelected', true).filterProperty('isDisabled', false).mapProperty('serviceName')); + + var serviceNames = servicesInfo.filterProperty('isSelected', true).filterProperty('isDisabled', false).mapProperty('serviceName'); + console.log('selected services ', serviceNames); + + this.set('content.missSlavesStep', !serviceNames.contains('MAPREDUCE') && !serviceNames.contains('HBASE')); }, /** @@ -304,6 +308,8 @@ App.AddServiceController = Em.Controller.extend({ this.set('content.selectedServiceNames', serviceNames); App.db.setSelectedServiceNames(serviceNames); console.log('AddServiceController.selectedServiceNames:', serviceNames); + + this.set('content.missSlavesStep', !serviceNames.contains('MAPREDUCE') && !serviceNames.contains('HBASE')); }, /** @@ -328,6 +334,8 @@ App.AddServiceController = Em.Controller.extend({ console.log("AddServiceController.saveMasterComponentHosts: saved hosts ", masterComponentHosts); App.db.setMasterComponentHosts(masterComponentHosts); this.set('content.masterComponentHosts', masterComponentHosts); + + this.set('content.missMasterStep', this.get('content.masterComponentHosts').everyProperty('isInstalled', true)); }, /** @@ -348,6 +356,8 @@ App.AddServiceController = Em.Controller.extend({ } this.set("content.masterComponentHosts", masterComponentHosts); console.log("AddServiceController.loadMasterComponentHosts: loaded hosts ", masterComponentHosts); + + this.set('content.missMasterStep', this.get('content.masterComponentHosts').everyProperty('isInstalled', true)); }, /** @@ -556,12 +566,16 @@ App.AddServiceController = Em.Controller.extend({ dataLoading: function(){ var dfd = $.Deferred(); this.connectOutlet('loading'); - var interval = setInterval(function(){ - if (App.router.get('clusterController.isLoaded')){ - dfd.resolve(); - clearInterval(interval); - } - },50); + if (App.router.get('clusterController.isLoaded')){ + dfd.resolve(); + } else{ + var interval = setInterval(function(){ + if (App.router.get('clusterController.isLoaded')){ + dfd.resolve(); + clearInterval(interval); + } + },50); + } return dfd.promise(); }, /** @@ -666,7 +680,11 @@ App.AddServiceController = Em.Controller.extend({ * Generate clients list for selected services and save it to model * @param stepController step8WizardController or step9WizardController */ - installServices: function () { + installServices: function (isRetry) { + if(!isRetry && this.get('content.cluster.requestId')){ + return; + } + var self = this; var clusterName = this.get('content.cluster.name'); var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT'; diff --git a/ambari-web/app/controllers/wizard/step10_controller.js b/ambari-web/app/controllers/wizard/step10_controller.js index b9d6202a73..883a456c6f 100644 --- a/ambari-web/app/controllers/wizard/step10_controller.js +++ b/ambari-web/app/controllers/wizard/step10_controller.js @@ -275,7 +275,7 @@ App.WizardStep10Controller = Em.Controller.extend({ loadOozieServer: function (component) { if (component.get('hostName')) { - var statement = 'Hive Metastore installed on ' + component.get('hostName'); + var statement = 'Oozie Server installed on ' + component.get('hostName'); this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({ id: 1, color: 'text-info', diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index fbb88ff146..b9ffda4923 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -152,6 +152,10 @@ App.WizardStep6Controller = Em.Controller.extend({ console.log("WizardStep6Controller: Loading step6: Assign Slaves"); this.clearStep(); this.renderSlaveHosts(); + + if(this.get('content.missSlavesStep')){ + App.router.send('next'); + } }, /** diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index a57977423b..b820ada0d3 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -514,7 +514,8 @@ App.WizardStep8Controller = Em.Controller.extend({ this.loadOozieServerValue(_component); break; case 'Database': - this.loadOozieDbValue(_component); + // TODO: uncomment when ready to integrate with Oozie Database other than Derby + // this.loadOozieDbValue(_component); break; default: } @@ -600,13 +601,15 @@ App.WizardStep8Controller = Em.Controller.extend({ //return; } - this.createCluster(); - this.createSelectedServices(); - this.createConfigurations(); - this.applyCreatedConfToServices(); - this.createComponents(); - this.registerHostsToCluster(); - this.createHostComponents(); + if(!this.get('content.cluster.requestId')){ + this.createCluster(); + this.createSelectedServices(); + this.createConfigurations(); + this.applyCreatedConfToServices(); + this.createComponents(); + this.registerHostsToCluster(); + this.createHostComponents(); + } App.router.send('next'); }, diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js index 4a6ed6648b..ab15be1f62 100644 --- a/ambari-web/app/controllers/wizard/step9_controller.js +++ b/ambari-web/app/controllers/wizard/step9_controller.js @@ -43,6 +43,10 @@ App.WizardStep9Controller = Em.Controller.extend({ } }.property('hosts.@each.status'), + showRetry: function(){ + return this.get('status') == 'failed'; + }.property('status'), + navigateStep: function () { if (this.get('content.cluster.isCompleted') === false) { this.loadStep(); diff --git a/ambari-web/app/data/config_properties.js b/ambari-web/app/data/config_properties.js index 724cb840e2..4ec39a54d2 100644 --- a/ambari-web/app/data/config_properties.js +++ b/ambari-web/app/data/config_properties.js @@ -1874,6 +1874,7 @@ module.exports = "serviceName": "OOZIE", "category": "Oozie Server" }, + /* { "id": "puppet var", "name": "oozie_database", @@ -1947,7 +1948,6 @@ module.exports = "serviceName": "OOZIE", "category": "Oozie Server" }, - { "id": "puppet var", "name": "oozie_database_name", @@ -1984,6 +1984,7 @@ module.exports = "serviceName": "OOZIE", "category": "Oozie Server" }, + */ { "id": "puppet var", "name": "oozie_data_dir", @@ -2021,18 +2022,6 @@ module.exports = "serviceName": "OOZIE", "category": "Advanced" }, - /*{ - "id": "puppet var", - "name": "oozie-site.xml", - "displayName": "Custom Oozie Configs", - "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into oozie-site.xml verbatim.", - "defaultValue": "", - "isRequired": false, - "displayType": "custom", - "isVisible": true, - "serviceName": "OOZIE", - "category": "Advanced" - },*/ { "id": "puppet var", "name": "zookeeperserver_hosts", diff --git a/ambari-web/app/data/review_configs.js b/ambari-web/app/data/review_configs.js index 065fcccc8a..54e8bfb2b2 100644 --- a/ambari-web/app/data/review_configs.js +++ b/ambari-web/app/data/review_configs.js @@ -114,11 +114,12 @@ module.exports = [ Ember.Object.create({ display_name: 'Server', component_value: '' - }), - Ember.Object.create({ - display_name: 'Database', - component_value: '' }) + // TODO: uncomment when ready to integrate with database other than Derby + // Ember.Object.create({ + // display_name: 'Database', + // component_value: '' + // }) ] }), Ember.Object.create({ diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js index aa59a35511..d25f7be499 100644 --- a/ambari-web/app/mappers/hosts_mapper.js +++ b/ambari-web/app/mappers/hosts_mapper.js @@ -39,7 +39,9 @@ App.hostsMapper = App.QuickDataMapper.create({ disk_info: 'Hosts.disk_info', $disk_usage: '-', health_status: 'Hosts.host_status', - $load_avg: '-', + load_one: 'Hosts.load.load_one', + load_five: 'Hosts.load.load_five', + load_fifteen: 'Hosts.load.load_fifteen', $cpu_usage: 33, $memory_usage: 26, $network_usage: 36, @@ -53,7 +55,6 @@ App.hostsMapper = App.QuickDataMapper.create({ if (!this.get('model')) { return; } - if (json.items) { var result = []; diff --git a/ambari-web/app/mappers/users_mapper.js b/ambari-web/app/mappers/users_mapper.js index 4bdff3edf5..8a37d2e970 100644 --- a/ambari-web/app/mappers/users_mapper.js +++ b/ambari-web/app/mappers/users_mapper.js @@ -22,6 +22,6 @@ App.usersMapper = App.QuickDataMapper.create({ config : { user_name : 'Users.user_name', roles : 'Users.roles', - type: 'Users.type' + is_ldap: 'Users.ldap_user' } }); diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e7f993fb54..b9e18df0b1 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -231,6 +231,7 @@ Em.I18n.translations = { 'services.service.summary.averageLoad':'Average Load', 'services.service.summary.masterHeap':'Master Heap', 'services.service.summary.moreStats':'more stats here', + 'services.service.summary.clientCount': '{0} Client Hosts', 'services.service.actions.run.rebalancer':'Run Rebalancer', 'services.service.actions.run.compaction':'Run Compaction', 'services.service.actions.run.smoke':'Run Smoke Test', @@ -351,5 +352,6 @@ Em.I18n.translations = { 'timeRange.presets.1month':'1mo', 'timeRange.presets.1year':'1yr', - 'apps.filters.customRunDate':'Run Date custom filter' + 'apps.filters.customRunDate':'Run Date custom filter', + 'apps.dagCharts.popup':'DAG/Charts' };
\ No newline at end of file diff --git a/ambari-web/app/models/host.js b/ambari-web/app/models/host.js index a7896152ec..3db321a6fc 100644 --- a/ambari-web/app/models/host.js +++ b/ambari-web/app/models/host.js @@ -28,7 +28,6 @@ App.Host = DS.Model.extend({ cpu: DS.attr('string'), memory: DS.attr('string'), diskUsage: DS.attr('string'), - loadAvg: DS.attr('string'), osArch: DS.attr('string'), ip: DS.attr('string'), rack: DS.attr('string'), @@ -40,6 +39,9 @@ App.Host = DS.Model.extend({ lastHeartBeatTime: DS.attr('number'), osType: DS.attr("string"), diskInfo: DS.attr('string'), + loadOne:DS.attr('number'), + loadFive:DS.attr('number'), + loadFifteen:DS.attr('number'), /** @@ -55,6 +57,13 @@ App.Host = DS.Model.extend({ return ((new Date()).getTime() - this.get('lastHeartBeatTime')) > 180 * 1000; }.property('lastHeartBeatTime'), + loadAvg: function() { + console.log(this.get('loadOne'), this.get('loadFive'), this.get('loadFifteen')); + if (this.get('loadOne') != null) return this.get('loadOne'); + if (this.get('loadFive') != null) return this.get('loadFive'); + if (this.get('loadFifteen') != null) return this.get('loadFifteen'); + }.property('loadOne', 'loadFive', 'loadFifteen'), + updateHostStatus: function(){ /** diff --git a/ambari-web/app/models/host_component.js b/ambari-web/app/models/host_component.js index 20825c5aba..0bd8a53e1f 100644 --- a/ambari-web/app/models/host_component.js +++ b/ambari-web/app/models/host_component.js @@ -23,7 +23,9 @@ App.HostComponent = DS.Model.extend({ componentName: DS.attr('string'), host: DS.belongsTo('App.Host'), service: DS.belongsTo('App.Service'), - + isClient:function () { + return Boolean(this.get('componentName').match(/_client/gi)); + }.property('componentName'), isRunning: function(){ return (this.get('workStatus') == 'STARTED' || this.get('workStatus') == 'STARTING'); }.property('workStatus'), diff --git a/ambari-web/app/models/service.js b/ambari-web/app/models/service.js index 3660d8be6e..612913caf2 100644 --- a/ambari-web/app/models/service.js +++ b/ambari-web/app/models/service.js @@ -55,7 +55,37 @@ App.Service = DS.Model.extend({ var components = this.get('components').filterProperty('isMaster', true); return components.everyProperty('workStatus', App.Component.Status.started); }.property('components.@each.workStatus'), - + isMaintained: function(){ + var maintainedServices = [ + "HDFS", + "MAPREDUCE", + "HBASE", + "OOZIE", + "HIVE", + "ZOOKEEPER", + "PIG", + "SQOOP" + ]; + for(var i in maintainedServices){ + if(this.get('serviceName') == maintainedServices[i]) return true; + } + }.property('serviceName'), + isConfigurable:function(){ + var configurableServices = [ + "HDFS", + "MAPREDUCE", + "HBASE", + "OOZIE", + "HIVE", + "ZOOKEEPER", + "PIG", + "SQOOP", + "NAGIOS" + ]; + for(var i in configurableServices){ + if(this.get('serviceName') == configurableServices[i]) return true; + } + }.property('serviceName'), displayName: function () { switch (this.get('serviceName').toLowerCase()) { case 'hdfs': diff --git a/ambari-web/app/models/user.js b/ambari-web/app/models/user.js index cd2037a244..7f5a2ab4d9 100644 --- a/ambari-web/app/models/user.js +++ b/ambari-web/app/models/user.js @@ -27,7 +27,13 @@ App.UserModel = Em.Object.extend({ App.User = DS.Model.extend({ userName:DS.attr('string'), roles:DS.attr('string'), - type:DS.attr('string'), + isLdap:DS.attr('boolean'), + type: function(){ + if(this.get('isLdap')){ + return 'LDAP'; + } + return 'Local'; + }.property('isLdap'), auditItems:DS.hasMany('App.ServiceAudit'), admin:function () { return !!(/^admin/.test(this.get('roles'))) @@ -45,7 +51,8 @@ App.EditUserForm = App.Form.extend({ { name:"old_password", displayName:"Old Password", displayType:"password", isRequired: function(){ return this.get('form.isObjectNew'); }.property('form.isObjectNew') }, { name:"new_password", displayName:"New Password", displayType:"password", isRequired: false }, { name:"admin", displayName:"Admin", displayType:"checkbox", isRequired:false }, - { name:"roles", displayName:"Role", isRequired:false, isHidden:true } + { name:"roles", displayName:"Role", isRequired:false, isHidden:true }, + { name:"isLdap", displayName:"Type", isRequired:false, isHidden:true } ], fields:[], disableUsername:function () { diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js index 4402eb4d44..23e8c406e2 100644 --- a/ambari-web/app/routes/add_host_routes.js +++ b/ambari-web/app/routes/add_host_routes.js @@ -209,8 +209,11 @@ module.exports = Em.Route.extend({ retry: function(router,context) { var addHostController = router.get('addHostController'); var wizardStep9Controller = router.get('wizardStep9Controller'); - addHostController.installServices(); - wizardStep9Controller.navigateStep(); + if (!wizardStep9Controller.get('isSubmitDisabled')) { + addHostController.installServices(true); + addHostController.setInfoForStep9(); + wizardStep9Controller.navigateStep(); + } }, next: function (router) { var addHostController = router.get('addHostController'); diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js index d055234f74..05451741a5 100644 --- a/ambari-web/app/routes/add_service_routes.js +++ b/ambari-web/app/routes/add_service_routes.js @@ -92,7 +92,7 @@ module.exports = Em.Route.extend({ }, back: function(router){ var controller = router.get('addServiceController'); - if(controller.get('content.masterComponentHosts').someProperty('isInstalled', false)){ + if(!controller.get('content.missMasterStep')){ router.transitionTo('step2'); } else { router.transitionTo('step1'); @@ -123,7 +123,16 @@ module.exports = Em.Route.extend({ controller.connectOutlet('wizardStep7', controller.get('content')); }) }, - back: Em.Router.transitionTo('step3'), + back: function(router){ + var controller = router.get('addServiceController'); + if(!controller.get('content.missSlavesStep')){ + router.transitionTo('step3'); + } else if(!controller.get('content.missMasterStep')) { + router.transitionTo('step2'); + } else { + router.transitionTo('step1'); + } + }, next: function (router) { var addServiceController = router.get('addServiceController'); var wizardStep7Controller = router.get('wizardStep7Controller'); @@ -169,7 +178,7 @@ module.exports = Em.Route.extend({ var addServiceController = router.get('addServiceController'); var wizardStep9Controller = router.get('wizardStep9Controller'); if (!wizardStep9Controller.get('isSubmitDisabled')) { - addServiceController.installServices(); + addServiceController.installServices(true); addServiceController.setInfoForStep9(); wizardStep9Controller.navigateStep(); } diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js index 96cbdc3ee6..2be48c750c 100644 --- a/ambari-web/app/routes/installer.js +++ b/ambari-web/app/routes/installer.js @@ -271,7 +271,7 @@ module.exports = Em.Route.extend({ var installerController = router.get('installerController'); var wizardStep9Controller = router.get('wizardStep9Controller'); if (!wizardStep9Controller.get('isSubmitDisabled')) { - installerController.installServices(); + installerController.installServices(true); installerController.setInfoForStep9(); wizardStep9Controller.navigateStep(); } diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index ffb9952a96..d097135b78 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -97,7 +97,7 @@ module.exports = Em.Route.extend({ showDetails:function (router, event) { router.get('mainHostDetailsController').setBack(true); - router.transitionTo('hostDetails.summary', event.context) + router.transitionTo('hostDetails.index', event.context) }, addHost:function (router) { @@ -279,6 +279,9 @@ module.exports = Em.Route.extend({ service:Em.Route.extend({ route:'/:service_id', connectOutlets:function (router, service) { + if (service && service.get('id') == 'Clients') { + service = App.router.get('mainServiceController.additionalMenuItem'); + } router.get('mainServiceController').connectOutlet('mainServiceItem', service); router.transitionTo('summary'); }, @@ -289,6 +292,7 @@ module.exports = Em.Route.extend({ route:'/summary', connectOutlets:function (router, context) { var item = router.get('mainServiceItemController.content'); + var viewName = 'mainServiceInfoSummary'; router.get('mainServiceItemController').connectOutlet('mainServiceInfoSummary', item); } }), diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index ec16fd6a38..8080bbd73e 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -643,6 +643,12 @@ a:focus { margin-top: 4px; } +.modal-graph-line { + .modal-body { + min-height: 320px !important; + } +} + /*end alerts summary*/ /*start chart/style graphs*/ @@ -1499,7 +1505,8 @@ ul.filter { } h4{ - color: #777; + color: #777777; + margin-top: 5px; } } diff --git a/ambari-web/app/styles/apps.less b/ambari-web/app/styles/apps.less index 2ec88aaa84..0ceeafc7b8 100644 --- a/ambari-web/app/styles/apps.less +++ b/ambari-web/app/styles/apps.less @@ -214,3 +214,127 @@ -moz-border-radius: 4px; } +/*Big modal window*/ +.big-modal { + .modal { + width: 1150px; + margin: -350px 0 0 -575px; + } + + .clear { + clear:both; + } + > div > .dataTable { + border: 1px solid silver; + th { + border-top:none; + } + } + .content { + padding: 0; + } + + .page-bar { + border: 1px solid silver; + text-align:right; + div { + display: inline-block; + margin:0 10px; + } + .dataTables_length { + label { + display:inline; + } + select { + margin-bottom: 4px; + margin-top: 4px; + width:70px; + } + } + .dataTables_paginate { + a { + padding:0 5px; + } + } + } + + #graph1 { + margin-left: 30px; + width: 440px; + #legend_container { + margin: 40px 0 0 20px; + } + } + + #graph2 { + margin-right: 30px; + width: 500px; + #tasks_legend_container { + margin: 40px 0 0 20px; + } + } + + ul.nav-tabs{ + margin-bottom: 0; + } + + #jobs, #bars{ + border: 1px solid #ddd; + border-top: none; + background: #fff; + padding: 10px; + box-sizing: border-box; + width: auto; + } + + #jobs h2{ + margin-top: 0; + } +//fix stripped in inner table + .table-striped tbody tr:nth-child(odd) + td .table-striped tbody + tr:nth-child(odd) td, + tr:nth-child(even) th{ + background-color: none; + } + + .sorting_asc { background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAEwATAwERAAIRAQMRAf/EAHgAAAMBAQAAAAAAAAAAAAAAAAAFCAYKAQACAQUAAAAAAAAAAAAAAAAABQMCBAYHCBAAAQUAAQMEAwAAAAAAAAAAAwECBAUGABESByExIghBMxQRAAIBAwMDAwUAAAAAAAAAAAECAwAEBRESBiExUUHhB2GBIhMU/9oADAMBAAIRAxEAPwDvA8k+Qc54sxGj32qlNi0ucrjTj/JqGlmROyJXQ2u/bOsZTmBExPd70/HXmQcW41lOX5+145h0L391KEHhR3Z28Ii6sx9AKgubiO1gaeU6Io19h9TUg/S/7eP+wia3NbBIFbuqiyn3VTCjIMArHHTJarEDGGiNU8vOKVsc7/VxBuGR3yV683X86/Cq/GpssrhP2S8emiSKRm1JS5VfyLH0WfQug7KwZR0CilWHy39++ObQTgkgeV9ux+xq9uc6U8pLfZzP6mClZpKWrvq1DilJAt4Mewh/0hRyBOsaUMoVKLvXtVU6t6+nL/HZTJYi4/rxU81tdbSu+N2Rtp7jcpB0OnUa9aoeOOVdsgDL4I1pFS+NPHmcsQ2+fw+UpLWOwwwWNVQ1kCaIcgaiONkmLGEZrDDXtcnXo5PfjC+5VybKWrWWSyF5cWbEEpJNI6kqdQSrMRqD1B9KjS2t423xoqt5AArb8QVPRwoo4UUcKK//2Q==) no-repeat 85% 50%; } + .sorting_desc { background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAEwATAwERAAIRAQMRAf/EAIEAAAIDAQAAAAAAAAAAAAAAAAAGBwgJCgEBAAIDAQAAAAAAAAAAAAAAAAMFBAYHCBAAAAUDAwMFAAAAAAAAAAAAAQIDBAUABgcSNTYRFQgTZFUWZhEAAAQEAggGAwAAAAAAAAAAAAECAxEhBAYSMjFBYRMzFDQFUZFSYmMHJFRk/9oADAMBAAIRAxEAPwDv4oAKACgCKc1tMmusb3Eph6cSgsgx7fucEZxGRks2llGIGVWgVm8q1dt0+6ogKaapSgdNbQPXTqAdwsN602bopk3vTnUW24rduwccbU2S5E8Sm1JM92czSZwNOKUYDFrCqTp1corDUFMpEcYap+Ipb4P5O8n81y9xXXlG50yY+thR3AEivqFvRDmduvSUrhuLtrFNXqCFvJm1LAQ5RMuchB6gBy13f7+tP6lsOipuz2jSGdy1ZJeNzmXnEtU+pWFTikmbxyTEjgglKKZpMU3ZanudYtTtSr8dMoYSKKvKMte0aUV5YGxgoASbD2iQ4Tyi6uB7Rvz/AHD9R8r7/wBWr64uta6/pKfq+JwUZP5/1/hwCFjIeTMrLo0np93q2xDtVCJh/9k=) no-repeat 85% 50%; } + .sorting { background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAEwATAwERAAIRAQMRAf/EAGgAAAIDAQAAAAAAAAAAAAAAAAUHAAYICgEBAQAAAAAAAAAAAAAAAAAAAAEQAAEEAQIFAgcAAAAAAAAAAAECAwQFABEGIRI0NQcTFDFBMmNUZRYRAQEBAQAAAAAAAAAAAAAAAAABEUH/2gAMAwEAAhEDEQA/AO93cd/XbXpLC9tHQ1Dr46nljUBby/gzGZB+p+Q6QhA+ZOApfDnllW/ha1tv6Ee7iyH5kRlvlbTIqHndWkNJ0HO7XFQbWeJUkpUeOpySrZh65UUnyFUW1ztaexRmIbaPyzoLE6vg2UWW9GC1e0XHnsSGEqfQohCwApK9OIGuAjfBP9VuG0m39vGqINVUe4r2xF21TVsuXZOI9N9lMmLBYkttQ21auBKhqtSUngCMkW5xqjKiYASh6SR2Tulr2HpOvf6j9p+V9/mwDeB//9k=) no-repeat 85% 50%; } + + a.paginate_disabled_next, a.paginate_disabled_previous { + color: gray; + &:hover { + color: gray; + text-decoration: none; + } + } + + a.paginate_enabled_next, a.paginate_enabled_previous { + &:hover { + text-decoration: none; + } + } + + div.view-wrapper { + float: left; + } + + a.ui-icon-circle-close { + float: right; + opacity: 0.2; + padding: 1px; + position: relative; + top: -32px; + &:hover { + opacity: 0.7; + } + } + .notActive { + a.ui-icon-circle-close { + visibility: hidden; + } + } +} + +/*Big modal window end*/
\ No newline at end of file diff --git a/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs b/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs index 0bb176b975..a87191c73f 100644 --- a/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs +++ b/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs @@ -44,8 +44,11 @@ <!--</div>--> <div {{bindAttr class="view.heatmapTogglerClass view.hostsBlockClass"}}> {{#each rack.hosts}} + <a href="#" {{action "routeHostDetail" this target="controller"}}> <div {{bindAttr style="view.hostCssStyle"}}> {{view App.MainChartsHeatmapHostView contentBinding="this"}} </div> + </a> {{/each}} + </div>
\ No newline at end of file diff --git a/ambari-web/app/templates/main/charts/linear_time.hbs b/ambari-web/app/templates/main/charts/linear_time.hbs index 272e611d8d..fe8f5cb0b0 100644 --- a/ambari-web/app/templates/main/charts/linear_time.hbs +++ b/ambari-web/app/templates/main/charts/linear_time.hbs @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<div id="{{unbound view.id}}-container" class="chart-container"> +<div id="{{unbound view.id}}-container" class="chart-container" {{action showGraphInPopup target="view"}}> <div id="{{unbound view.id}}-yaxis" class="chart-y-axis"></div> <div id="{{unbound view.id}}-xaxis" class="chart-x-axis"></div> <div id="{{unbound view.id}}-legend" class="chart-legend"></div> diff --git a/ambari-web/app/templates/main/dashboard.hbs b/ambari-web/app/templates/main/dashboard.hbs index 4a5906fa5e..13a0583297 100644 --- a/ambari-web/app/templates/main/dashboard.hbs +++ b/ambari-web/app/templates/main/dashboard.hbs @@ -60,60 +60,5 @@ </div> </div> </div> - <div class="box alerts-section"> - <div class="box-header"> - <h4>Alerts</h4> - <div class="btn-group"> - <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{{controller.alertsFilteredByName}} <span class="caret"></span></button> - <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a> - <ul class="dropdown-menu"> - <li><a {{action alertsFilter target="controller"}} href="javascript:void(null)">All</a></li> - {{#each service in view.content}} - <li><a {{action alertsFilter service target="controller"}} href="javascript:void(null)">{{service.model.displayName}}</a></li> - {{/each}} - </ul> - </div> - </div> - <ul class="alerts"> - {{#if controller.displayAlerts.length}} - {{#each controller.displayAlerts}} - <li class="status-{{unbound status}}"> - <div class="container-fluid"> - <div class="row-fluid"> - <div class="span1 status-icon"> - {{#if isOk}} - <i class="icon-ok icon-large"></i> - {{else}} - <i class="icon-remove icon-large"></i> - {{/if}} - </div> - <div class="span11"> - <div class="row-fluid"> - <div class="span8 title">{{title}} - {{#if serviceLink}} - <a class="serviceLink" href="{{unbound serviceLink}}">{{serviceName}}</a> - {{/if}} - </div> - <div class="span4 date-time">{{dateDisplay}}</div> - </div> - <div class="row-fluid message">{{message}}</div> - </div> - </div> - </div> - </li> - {{/each}} - {{else}} - {{#if controller.isNagiosInstalled}} - <div class="alert alert-info"> - No alerts - </div> - {{else}} - <div class="alert"> - Nagios service required for viewing alerts - </div> - {{/if}} - {{/if}} - </ul> - </div> </div> </div> diff --git a/ambari-web/app/templates/main/dashboard/service/hbase.hbs b/ambari-web/app/templates/main/dashboard/service/hbase.hbs index 3326763ed6..2d13ad2816 100644 --- a/ambari-web/app/templates/main/dashboard/service/hbase.hbs +++ b/ambari-web/app/templates/main/dashboard/service/hbase.hbs @@ -22,7 +22,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.criticalAlertsCount}} - <span class="label label-important alerts-count">{{view.criticalAlertsCount}}</span> + <a {{action selectService view.service href=true}} class="label label-important">{{view.criticalAlertsCount}}</a> {{/if}} </div> <div class="summary span"> diff --git a/ambari-web/app/templates/main/dashboard/service/hdfs.hbs b/ambari-web/app/templates/main/dashboard/service/hdfs.hbs index ef612c44f0..c94eade94f 100644 --- a/ambari-web/app/templates/main/dashboard/service/hdfs.hbs +++ b/ambari-web/app/templates/main/dashboard/service/hdfs.hbs @@ -22,7 +22,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.criticalAlertsCount}} - <span class="label label-important alerts-count">{{view.criticalAlertsCount}}</span> + <a {{action selectService view.service href=true}} class="label label-important">{{view.criticalAlertsCount}}</a> {{/if}} </div> <div class="summary span"> diff --git a/ambari-web/app/templates/main/dashboard/service/hive.hbs b/ambari-web/app/templates/main/dashboard/service/hive.hbs index 97f44488fc..7bd2161d42 100644 --- a/ambari-web/app/templates/main/dashboard/service/hive.hbs +++ b/ambari-web/app/templates/main/dashboard/service/hive.hbs @@ -21,7 +21,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.criticalAlertsCount}} - <span class="label label-important alerts-count">{{view.criticalAlertsCount}}</span> + <a {{action selectService view.service href=true}} class="label label-important">{{view.criticalAlertsCount}}</a> {{/if}} </div> <div class="summary span"> diff --git a/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs b/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs index 1d01efb344..4675b3162c 100644 --- a/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs +++ b/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs @@ -22,7 +22,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.criticalAlertsCount}} - <span class="label label-important alerts-count">{{view.criticalAlertsCount}}</span> + <a {{action selectService view.service href=true}} class="label label-important">{{view.criticalAlertsCount}}</a> {{/if}} </div> <div class="summary span"> diff --git a/ambari-web/app/templates/main/dashboard/service/oozie.hbs b/ambari-web/app/templates/main/dashboard/service/oozie.hbs index 97f44488fc..7bd2161d42 100644 --- a/ambari-web/app/templates/main/dashboard/service/oozie.hbs +++ b/ambari-web/app/templates/main/dashboard/service/oozie.hbs @@ -21,7 +21,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.criticalAlertsCount}} - <span class="label label-important alerts-count">{{view.criticalAlertsCount}}</span> + <a {{action selectService view.service href=true}} class="label label-important">{{view.criticalAlertsCount}}</a> {{/if}} </div> <div class="summary span"> diff --git a/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs b/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs index 97f44488fc..7bd2161d42 100644 --- a/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs +++ b/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs @@ -21,7 +21,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} <a {{action selectService view.service href=true}}>{{view.service.displayName}}</a> {{#if view.criticalAlertsCount}} - <span class="label label-important alerts-count">{{view.criticalAlertsCount}}</span> + <a {{action selectService view.service href=true}} class="label label-important">{{view.criticalAlertsCount}}</a> {{/if}} </div> <div class="summary span"> diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs index e562f1e2b8..f5f5c6f410 100644 --- a/ambari-web/app/templates/main/host.hbs +++ b/ambari-web/app/templates/main/host.hbs @@ -41,7 +41,7 @@ <th class="notActive"><div class="view-wrapper">{{view view.cpuFilterView viewName="cpuFilterViewInstance"}}</div> <a href="#" {{action "clearFilterButtonClick" target="view"}} id="view_cpuFilterViewInstance" class="ui-icon ui-icon-circle-close ui-cpu"></a></th> <th class="notActive"><div class="view-wrapper">{{view view.ramFilterView viewName="ramFilterViewInstance"}}</div> <a href="#" {{action "clearFilterButtonClick" target="view"}} id="view_ramFilterViewInstance" class="ui-icon ui-icon-circle-close ui-ram"></a></th> <th></th> - <th></th> + <th class="notActive"><div class="view-wrapper">{{view view.loadAvgFilterView viewName="loadAvgFilterViewInstance"}}</div> <a href="#" {{action "clearFilterButtonClick" target="view"}} id="view_loadAvgFilterViewInstance" class="ui-icon ui-icon-circle-close ui-load_avg"></a></th> <th class="notActive"><input id="components_filter" type="hidden" /> <div class="view-wrapper">{{view view.componentsFilterView viewName="componentsFilterViewInstance"}}</div> <a href="#" {{action "clearFilterButtonClick" target="view"}} id="view_componentsFilterViewInstance" class="ui-icon ui-icon-circle-close ui-components"></a> </th> diff --git a/ambari-web/app/templates/main/service/info/client_summary.hbs b/ambari-web/app/templates/main/service/info/client_summary.hbs new file mode 100644 index 0000000000..07cfd89507 --- /dev/null +++ b/ambari-web/app/templates/main/service/info/client_summary.hbs @@ -0,0 +1,111 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} + +<div class="row-fluid service-block"> + <div class="span6"> + {{#if view.service.quickLinks.length}} + {{#view App.QuickViewLinks contentBinding="view.service"}} + <ul class="nav nav-pills move"> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" href="#">Quick Links <b class="caret"></b></a> + <ul class="dropdown-menu"> + {{#each view.quickLinks}} + <a {{bindAttr href="url"}}>{{label}}</a> + {{/each}} + </ul> + </li> + </ul> + {{/view}} + {{/if}} + + <div class="box"> + <div class="box-header"> + <h4>{{controller.content.label}} Summary</h4> + </div> + <div class="service-content"> + <table id="summary-info" class="table table-bordered table-striped table-condensed"> + <tbody> + + {{#if controller.content.isClients}} + <tr> + <td class="summary-label">Client Hosts</td> + <td>{{view.clientHostsLength}}</td> + </tr> + {{#if view.clientComponentsString}} + <tr> + <td style="text-align: left;" colspan="2"> + {{view.clientComponentsString}} + </td> + </tr> + {{/if}} + {{/if}} + </tbody> + </table> + </div> + </div> + </div> + <div class="span6"> + <div class="box"> + <div class="box-header"> + <h4>Alerts</h4> + + <div class="btn-group"> + <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i + class="icon-link"></i></a> + </div> + </div> + <ul id='summary-alerts-list' class="alerts"> + {{#if controller.alerts.length}} + {{#each controller.alerts}} + <li class="status-{{unbound status}}"> + <div class="container-fluid"> + <div class="row-fluid"> + <div class="span1 status-icon"> + {{#if isOk}} + <i class="icon-ok icon-large"></i> + {{else}} + <i class="icon-remove icon-large"></i> + {{/if}} + </div> + <div class="span11"> + <div class="row-fluid"> + <div class="span7 title">{{title}} + </div> + <div class="span5 date-time">{{dateDisplay}}</div> + </div> + <div class="row-fluid message">{{message}}</div> + </div> + </div> + </div> + </li> + {{/each}} + {{else}} + {{#if controller.isNagiosInstalled}} + <div class="alert alert-info"> + No alerts + </div> + {{else}} + <div class="alert"> + Nagios service required for viewing alerts + </div> + {{/if}} + {{/if}} + </ul> + </div> + </div> +</div> diff --git a/ambari-web/app/templates/main/service/item.hbs b/ambari-web/app/templates/main/service/item.hbs index eb2569a377..482b12cf2f 100644 --- a/ambari-web/app/templates/main/service/item.hbs +++ b/ambari-web/app/templates/main/service/item.hbs @@ -16,8 +16,10 @@ * limitations under the License. }} -{{view App.MainServiceInfoMenuView}} +{{view App.MainServiceInfoMenuView configTabBinding="view.hasConfigTab"}} +{{#unless controller.content.isClients}} <div class="service-button"> + {{#if view.hasMaintenanceControl}} <div class="btn-group display-inline-block"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> {{t services.service.actions.maintenance}} @@ -32,6 +34,7 @@ {{/each}} </ul> </div> + {{/if}} <a href="javascript:void(null)" {{bindAttr class=":btn controller.content.isRunning:disabled:btn-success" }} data-toggle="modal" {{action "startService" target="controller"}}> <i class="icon-play"></i> @@ -43,4 +46,5 @@ Stop </a> </div> +{{/unless}} {{outlet}}
\ No newline at end of file diff --git a/ambari-web/app/templates/main/service/menu_item.hbs b/ambari-web/app/templates/main/service/menu_item.hbs index 9c67c975ce..aeee6a24be 100644 --- a/ambari-web/app/templates/main/service/menu_item.hbs +++ b/ambari-web/app/templates/main/service/menu_item.hbs @@ -17,7 +17,11 @@ }} <a href="#/main/services/{{unbound view.content.id}}/summary"> - {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}} <span>{{unbound view.content.displayName}}</span> + {{#if view.content.isClients}} + {{else}} + {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}} + {{/if}} + <span>{{unbound view.content.displayName}}</span> {{#if view.alertsCount}} <span class="label operations-count"> {{view.alertsCount}} diff --git a/ambari-web/app/templates/wizard/step7.hbs b/ambari-web/app/templates/wizard/step7.hbs index ba009caa32..82d62f3137 100644 --- a/ambari-web/app/templates/wizard/step7.hbs +++ b/ambari-web/app/templates/wizard/step7.hbs @@ -121,7 +121,7 @@ {{/if}} <div class="btn-area"> - <a class="btn" {{action back href="true"}}>← Back</a> + <a class="btn" {{action back}}>← Back</a> <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}>Next →</a> diff --git a/ambari-web/app/templates/wizard/step9.hbs b/ambari-web/app/templates/wizard/step9.hbs index 100d408587..a28457fb65 100644 --- a/ambari-web/app/templates/wizard/step9.hbs +++ b/ambari-web/app/templates/wizard/step9.hbs @@ -39,10 +39,12 @@ <div class="box"> <div class="box-header"> <div class="pull-left"> + {{#if controller.showRetry}} <a class="btn btn-primary" {{bindAttr disabled="isSubmitDisabled"}} href="#" {{action retry}}><i class="icon-repeat icon-white"></i> Retry </a> + {{/if}} {{#if App.testMode}} <a class="btn btn-info" href="#" {{action mockBtn target="controller"}}> mockData diff --git a/ambari-web/app/utils/data_table.js b/ambari-web/app/utils/data_table.js index 5a4bcf2fe7..049e622bc6 100644 --- a/ambari-web/app/utils/data_table.js +++ b/ambari-web/app/utils/data_table.js @@ -20,7 +20,7 @@ jQuery.extend(jQuery.fn.dataTableExt.oSort, { "num-html-pre": function(date_string) { date_string = $(date_string).text(); - return parseInt(date_string, 10); + return parseFloat(date_string, 10); }, "num-html-asc": function (a, b) { @@ -156,6 +156,7 @@ jQuery.extend($.fn.dataTableExt.afnFiltering.push( var inputFilters = [ {iColumn: '0', elementId: 'star_filter', type: 'star'}, {iColumn: '2', elementId: 'cpu_filter', type: 'number'}, + {iColumn: '5', elementId: 'load_avg_filter', type: 'number'}, {iColumn: '4', elementId: 'user_filter', type: 'multiple'}, {iColumn: '6', elementId: 'components_filter', type: 'multiple'}, {iColumn: '5', elementId: 'jobs_filter', type: 'number' }, @@ -350,7 +351,7 @@ jQuery.extend($.fn.dataTableExt.afnFiltering.push( function numberFilter(rangeExp, rowValue) { var compareChar = rangeExp.charAt(0); - var compareValue = parseInt(rangeExp.substr(1, rangeExp.length - 1)); + var compareValue = parseFloat(rangeExp.substr(1, rangeExp.length - 1)); rowValue = (jQuery(rowValue).text()) ? jQuery(rowValue).text() : rowValue; match = false; switch (compareChar) { diff --git a/ambari-web/app/views/common/chart/linear_time.js b/ambari-web/app/views/common/chart/linear_time.js index 17f7846ebb..6f46bb6891 100644 --- a/ambari-web/app/views/common/chart/linear_time.js +++ b/ambari-web/app/views/common/chart/linear_time.js @@ -81,6 +81,10 @@ App.ChartLinearTimeView = Ember.View.extend({ */ _graph: null, + popupSuffix: '-popup', + + isPopup: false, + /** * Color palette used for this chart * @@ -103,6 +107,10 @@ App.ChartLinearTimeView = Ember.View.extend({ didInsertElement: function () { this._super(); + this.loadData(); + }, + + loadData: function() { var validUrl = this.get('url'); if (validUrl) { var hash = {}; @@ -129,6 +137,9 @@ App.ChartLinearTimeView = Ember.View.extend({ */ _showMessage: function(type, title, message){ var chartOverlayId = '#' + this.id + '-chart'; + if (this.get('isPopup')) { + chartOverlayId += this.get('popupSuffix'); + } var typeClass; switch (type) { case 'error': @@ -209,6 +220,41 @@ App.ChartLinearTimeView = Ember.View.extend({ _refreshGraph: function (jsonData) { var seriesData = this.transformToSeries(jsonData); if (seriesData instanceof Array && seriesData.length>0) { + this.draw(seriesData); + } + else { + this._showMessage('info', 'No Data', 'There was no data available.'); + } + }, + + /** + * @private + * + * When a graph is given a particular width and height,the lines are drawn + * in a slightly bigger area thereby chopping off some of the UI. Hence + * after the rendering, we adjust the SVGs size in the DOM to compensate. + * + * Opened https://github.com/shutterstock/rickshaw/issues/141 + * + * @type Function + */ + _adjustSVGHeight: function () { + if (this._graph && this._graph.element + && this._graph.element.firstChild) { + var svgElement = this._graph.element.firstChild; + svgElement.setAttribute('height', $(this._graph.element).height() + + "px"); + svgElement.setAttribute('width', $(this._graph.element).width() + + "px"); + } + }, + + draw: function(seriesData) { + var isPopup = this.get('isPopup'); + var p = ''; + if (isPopup) { + p = this.get('popupSuffix'); + } var palette = new Rickshaw.Color.Palette({ scheme: this._paletteScheme }); @@ -216,19 +262,17 @@ App.ChartLinearTimeView = Ember.View.extend({ series.color = this.colorForSeries(series) || palette.color(); series.stroke = 'rgba(0,0,0,0.3)'; }.bind(this)); - - if (this._graph == null) { - var chartId = "#" + this.id + "-chart"; - var chartOverlayId = "#" + this.id + "-overlay"; - var xaxisElementId = "#" + this.id + "-xaxis"; - var yaxisElementId = "#" + this.id + "-yaxis"; - var legendElementId = "#" + this.id + "-legend"; + var chartId = "#" + this.id + "-chart" + p; + var chartOverlayId = "#" + this.id + "-overlay" + p; + var xaxisElementId = "#" + this.id + "-xaxis" + p; + var yaxisElementId = "#" + this.id + "-yaxis" + p; + var legendElementId = "#" + this.id + "-legend" + p; + var chartElement = document.querySelector(chartId); var overlayElement = document.querySelector(chartOverlayId); var xaxisElement = document.querySelector(xaxisElementId); var yaxisElement = document.querySelector(yaxisElementId); var legendElement = document.querySelector(legendElementId); - this._graph = new Rickshaw.Graph({ height: 150, element: chartElement, @@ -276,33 +320,44 @@ App.ChartLinearTimeView = Ember.View.extend({ // this._graph.onUpdate(jQuery.proxy(function () { // this._adjustSVGHeight(); // }, this)); - } - this._graph.render(); - }else{ - this._showMessage('info', 'No Data', 'There was no data available.'); - } + + this._graph.render(); + this._graph = null; + this.set('isPopup', false); }, - /** - * @private - * - * When a graph is given a particular width and height,the lines are drawn - * in a slightly bigger area thereby chopping off some of the UI. Hence - * after the rendering, we adjust the SVGs size in the DOM to compensate. - * - * Opened https://github.com/shutterstock/rickshaw/issues/141 - * - * @type Function - */ - _adjustSVGHeight: function () { - if (this._graph && this._graph.element - && this._graph.element.firstChild) { - var svgElement = this._graph.element.firstChild; - svgElement.setAttribute('height', $(this._graph.element).height() - + "px"); - svgElement.setAttribute('width', $(this._graph.element).width() - + "px"); - } + showGraphInPopup: function() { + this.set('isPopup', true); + App.ModalPopup.show({ + template: Ember.Handlebars.compile([ + '<div class="modal-backdrop"></div><div class="modal modal-graph-line" id="modal" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">', + '<div class="modal-header">', + '<a class="close" {{action onClose target="view"}}>x</a>', + '<h3 id="modal-label">', + '{{#if headerClass}}{{view headerClass}}', + '{{else}}{{header}}{{/if}}', + '</h3>', + '</div>', + '<div class="modal-body">', + '{{#if bodyClass}}{{view bodyClass}}', + '{{else}}<div id="'+this.get('id')+'-container'+this.get('popupSuffix')+'" class="chart-container"><div id="'+this.get('id')+'-yaxis'+this.get('popupSuffix')+'" class="'+this.get('id')+'-yaxis chart-y-axis"></div><div id="'+this.get('id')+'-xaxis'+this.get('popupSuffix')+'" class="'+this.get('id')+'-xaxis chart-x-axis"></div><div id="'+this.get('id')+'-legend'+this.get('popupSuffix')+'" class="'+this.get('id')+'-legend chart-legend"></div><div id="'+this.get('id')+'-overlay'+this.get('popupSuffix')+'" class="'+this.get('id')+'-overlay chart-overlay"></div><div id="'+this.get('id')+'-chart'+this.get('popupSuffix')+'" class="'+this.get('id')+'-chart chart"></div><div id="'+this.get('id')+'-title'+this.get('popupSuffix')+'" class="'+this.get('id')+'-title chart-title">{{view.title}}</div></div>{{/if}}', + '</div>', + '<div class="modal-footer">', + '{{#if view.primary}}<a class="btn btn-success" {{action onPrimary target="view"}}>{{view.primary}}</a>{{/if}}', + '</div>', + '</div>' + ].join('\n')), + + header: this.get('title'), + primary: 'OK', + onPrimary: function() { + this.hide(); + } + }); + var self = this; + Ember.run.next(function() { + self.loadData(); + }); } }); diff --git a/ambari-web/app/views/main/admin/user/edit.js b/ambari-web/app/views/main/admin/user/edit.js index b07c81bb26..bb33d97de2 100644 --- a/ambari-web/app/views/main/admin/user/edit.js +++ b/ambari-web/app/views/main/admin/user/edit.js @@ -58,6 +58,16 @@ App.MainAdminUserEditView = Em.View.extend({ userForm: App.EditUserForm.create({}), didInsertElement: function(){ - this.get('userForm').propertyDidChange('object'); + var form = this.get('userForm'); + if( form.getField("isLdap").get("value") ) + { + form.getField("old_password").set("disabled",true); + form.getField("new_password").set("disabled",true); + }else{ + //debugger; + form.getField("old_password").set("disabled",false); + form.getField("new_password").set("disabled",false); + } + form.propertyDidChange('object'); } });
\ No newline at end of file diff --git a/ambari-web/app/views/main/apps_view.js b/ambari-web/app/views/main/apps_view.js index 05f60703cd..87b4543fcc 100644 --- a/ambari-web/app/views/main/apps_view.js +++ b/ambari-web/app/views/main/apps_view.js @@ -823,13 +823,7 @@ App.MainAppsView = Em.View.extend({ } } }), - /** - * Object contain views of expanded row - */ - expandedRow:Ember.Object.create({ - rowView:null, - rowChildView:null - }), + /** * This Container View is used to render static table row(appTableRow) and additional dynamic content */ @@ -841,44 +835,23 @@ App.MainAppsView = Em.View.extend({ id: function() { return this.get('run.id'); }.property("run.id"), - /** - * Delete expanded row from table - * - * @param row - */ - deleteRow:function(row){ - row.get('rowChildView').destroy(); - row.get('rowView').set('expanded', false); - row.set('rowView', null); - row.set('rowChildView', null); - }, - viewCreate:function(){ - App.router.get('mainAppsItemController').set('content', this.get('run')); - var newView = App.MainAppsItemView.create({ - controllerBinding: 'App.router.mainAppsItemController' - }); - return newView; - }, - expanded : false, + /** * Show/hide additional content appropriated for this row */ expandToggle : function(){ - var newView; - var expandedView = this.get('parentView.expandedRow'); - if(expandedView.get('rowView')) { - if(this.get('expanded')){ - this.deleteRow(expandedView); - return; - } - this.deleteRow(expandedView); - } - - newView = this.viewCreate(); - this.set('expanded', true); - expandedView.set('rowView', this); - expandedView.set('rowChildView', newView); - this.get('childViews').pushObject(newView); + App.router.get('mainAppsItemController').set('content', this.get('run')); + App.ModalPopup.show({ + classNames: ['big-modal'], + header: Em.I18n.t('apps.dagCharts.popup'), + bodyClass: App.MainAppsItemView.extend({ + controllerBinding: 'App.router.mainAppsItemController' + }), + onPrimary: function() { + this.hide(); + }, + secondary : null + }); } }), /** @@ -900,4 +873,4 @@ App.MainAppsView = Em.View.extend({ }) -}); +});
\ No newline at end of file diff --git a/ambari-web/app/views/main/dashboard/service.js b/ambari-web/app/views/main/dashboard/service.js index 43dd47ea1c..2c28c91170 100644 --- a/ambari-web/app/views/main/dashboard/service.js +++ b/ambari-web/app/views/main/dashboard/service.js @@ -87,7 +87,7 @@ App.MainDashboardServiceView = Em.View.extend({ }.property('controller.data'), criticalAlertsCount: function () { - var alerts = this.get('controller.alerts'); + var alerts = App.router.get('clusterController.alerts'); return alerts.filterProperty('serviceType', this.get('service.id')).filterProperty('status', '1').length; }.property('service.alerts') diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js index 4e8e2694e4..cf9977aaf5 100644 --- a/ambari-web/app/views/main/host.js +++ b/ambari-web/app/views/main/host.js @@ -52,7 +52,7 @@ App.MainHostView = Em.View.extend({ { "sType":"num-html" }, { "sType":"ambari-bandwidth" }, { "sType":"string" }, - { "sType":"string" }, + { "sType":"num-html" }, { "sType":"string", "bSortable": false } ] }); @@ -160,6 +160,24 @@ App.MainHostView = Em.View.extend({ }.observes('value') }), /** + * Filter-field for load avg + */ + loadAvgFilterView: Em.TextField.extend({ + classNames:['input-mini'], + type:'text', + placeholder: 'Any ', + elementId:'load_avg_filter', + filtering:function(){ + if (this.get('value') == '') { + this.$().closest('th').addClass('notActive'); + } + else { + this.$().closest('th').removeClass('notActive'); + } + this.get('parentView').get('applyFilter')(this.get('parentView'), 2); + }.observes('value') + }), + /** * Filter-field for RAM */ ramFilterView: Em.TextField.extend({ diff --git a/ambari-web/app/views/main/service/info/menu.js b/ambari-web/app/views/main/service/info/menu.js index 935ac0bd59..94d1e59fe8 100644 --- a/ambari-web/app/views/main/service/info/menu.js +++ b/ambari-web/app/views/main/service/info/menu.js @@ -21,11 +21,14 @@ var App = require('app'); App.MainServiceInfoMenuView = Em.CollectionView.extend({ tagName: 'ul', classNames: ["nav", "nav-tabs"], - content:[ - { label:'Summary', routing:'summary', active:"active"}, - { label:'Configs', routing:'configs'}/*, - { label:'Audit', routing:'audit'}*/ - ], + content:function(){ + var menuItems = [ + { label:'Summary', routing:'summary', active:"active"} + //{ label:'Audit', routing:'audit'} + ]; + if(this.get('configTab')) menuItems.push({ label:'Configs', routing:'configs'}); + return menuItems; + }.property(), init: function(){ this._super(); this.activateView(); }, diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js index 882f065f39..73c5dc45e4 100644 --- a/ambari-web/app/views/main/service/info/summary.js +++ b/ambari-web/app/views/main/service/info/summary.js @@ -5,9 +5,9 @@ * licenses this file to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -18,28 +18,31 @@ var App = require('app'); App.MainServiceInfoSummaryView = Em.View.extend({ - templateName: require('templates/main/service/info/summary'), - attributes: null, - serviceStatus: { - hdfs: false, - mapreduce: false, - hbase: false, - zookeeper: false, - oozie: false, - hive: false + templateName:function () { + var service = this.get('controller.content'); + return require(service.get('isClients') ? 'templates/main/service/info/client_summary' : 'templates/main/service/info/summary'); + }.property('controller.content'), + attributes:null, + serviceStatus:{ + hdfs:false, + mapreduce:false, + hbase:false, + zookeeper:false, + oozie:false, + hive:false }, data:{ hive:{ - "database" : "PostgreSQL", - "databaseName" : "hive", - "user" : "hive" + "database":"PostgreSQL", + "databaseName":"hive", + "user":"hive" } }, - service: function () { + service:function () { var svc = this.get('controller.content'); var svcName = svc.get('serviceName'); - if(svcName){ + if (svcName) { switch (svcName.toLowerCase()) { case 'hdfs': svc = App.HDFSService.find().objectAt(0); @@ -57,60 +60,60 @@ App.MainServiceInfoSummaryView = Em.View.extend({ return svc; }.property('controller.content'), - isHide: true, - moreStatsView: Em.View.extend({ - tagName: "a", - template: Ember.Handlebars.compile('{{t services.service.summary.moreStats}}'), - attributeBindings: [ 'href' ], - classNames: [ 'more-stats' ], - click: function (event) { + isHide:true, + moreStatsView:Em.View.extend({ + tagName:"a", + template:Ember.Handlebars.compile('{{t services.service.summary.moreStats}}'), + attributeBindings:[ 'href' ], + classNames:[ 'more-stats' ], + click:function (event) { this._parentView._parentView.set('isHide', false); this.remove(); }, - href: 'javascript:void(null)' + href:'javascript:void(null)' }), - serviceName: function () { + serviceName:function () { return this.get('service.serviceName'); }.property('service'), - oldServiceName : '', - + oldServiceName:'', + /** * Contains graphs for this particular service */ - serviceMetricGraphs: function(){ + serviceMetricGraphs:function () { var svcName = this.get('service.serviceName'); var graphs = []; - if(svcName){ + if (svcName) { switch (svcName.toLowerCase()) { case 'hdfs': graphs = [ App.ChartServiceMetricsHDFS_SpaceUtilization.extend(), - App.ChartServiceMetricsHDFS_FileOperations.extend(), - App.ChartServiceMetricsHDFS_BlockStatus.extend(), - App.ChartServiceMetricsHDFS_IO.extend(), - App.ChartServiceMetricsHDFS_RPC.extend(), - App.ChartServiceMetricsHDFS_GC.extend(), - App.ChartServiceMetricsHDFS_JVMHeap.extend(), - App.ChartServiceMetricsHDFS_JVMThreads.extend()]; + App.ChartServiceMetricsHDFS_FileOperations.extend(), + App.ChartServiceMetricsHDFS_BlockStatus.extend(), + App.ChartServiceMetricsHDFS_IO.extend(), + App.ChartServiceMetricsHDFS_RPC.extend(), + App.ChartServiceMetricsHDFS_GC.extend(), + App.ChartServiceMetricsHDFS_JVMHeap.extend(), + App.ChartServiceMetricsHDFS_JVMThreads.extend()]; break; case 'mapreduce': - graphs = [ App.ChartServiceMetricsMapReduce_JobsStatus.extend(), - App.ChartServiceMetricsMapReduce_JobsRunningWaiting.extend(), - App.ChartServiceMetricsMapReduce_MapSlots.extend(), - App.ChartServiceMetricsMapReduce_ReduceSlots.extend(), - App.ChartServiceMetricsMapReduce_GC.extend(), - App.ChartServiceMetricsMapReduce_RPC.extend(), - App.ChartServiceMetricsMapReduce_JVMHeap.extend(), - App.ChartServiceMetricsMapReduce_JVMThreads.extend()]; + graphs = [ App.ChartServiceMetricsMapReduce_JobsStatus.extend(), + App.ChartServiceMetricsMapReduce_JobsRunningWaiting.extend(), + App.ChartServiceMetricsMapReduce_MapSlots.extend(), + App.ChartServiceMetricsMapReduce_ReduceSlots.extend(), + App.ChartServiceMetricsMapReduce_GC.extend(), + App.ChartServiceMetricsMapReduce_RPC.extend(), + App.ChartServiceMetricsMapReduce_JVMHeap.extend(), + App.ChartServiceMetricsMapReduce_JVMThreads.extend()]; break; case 'hbase': graphs = [ App.ChartServiceMetricsHBASE_ClusterRequests.extend(), - App.ChartServiceMetricsHBASE_RegionServerReadWriteRequests.extend(), - App.ChartServiceMetricsHBASE_RegionServerRegions.extend(), - App.ChartServiceMetricsHBASE_RegionServerQueueSize.extend(), - App.ChartServiceMetricsHBASE_HlogSplitTime.extend(), - App.ChartServiceMetricsHBASE_HlogSplitSize.extend()]; + App.ChartServiceMetricsHBASE_RegionServerReadWriteRequests.extend(), + App.ChartServiceMetricsHBASE_RegionServerRegions.extend(), + App.ChartServiceMetricsHBASE_RegionServerQueueSize.extend(), + App.ChartServiceMetricsHBASE_HlogSplitTime.extend(), + App.ChartServiceMetricsHBASE_HlogSplitSize.extend()]; break; default: break; @@ -119,14 +122,14 @@ App.MainServiceInfoSummaryView = Em.View.extend({ return graphs; }.property('service'), - loadServiceSummary: function (serviceName) { + loadServiceSummary:function (serviceName) { var serviceName = this.get('serviceName'); - if(!serviceName){ + if (!serviceName) { return; } - if(this.get('oldServiceName')){ + if (this.get('oldServiceName')) { // do not delete it! return; } @@ -145,8 +148,8 @@ App.MainServiceInfoSummaryView = Em.View.extend({ this.set('oldServiceName', serviceName); serviceName = serviceName.toLowerCase(); }.observes('serviceName'), - - didInsertElement: function () { + + didInsertElement:function () { // We have to make the height of the Alerts section // match the height of the Summary section. var summaryTable = document.getElementById('summary-info'); @@ -160,5 +163,28 @@ App.MainServiceInfoSummaryView = Em.View.extend({ $(summaryTable).attr('style', "height:" + alertsList.clientHeight + "px;"); } } - } + }, + + + clientHosts:App.Host.find(), + + clientHostsLength:function () { + var text = this.t('services.service.summary.clientCount'); + var self = this; + return text.format(self.get('clientHosts.length')); + }.property('clientHosts'), + + clientComponents:function () { + return App.HostComponent.find().filterProperty('isClient', true); + }.property(), + + clientComponentsString:function () { + var components = this.get('clientComponents'); + var names = []; + components.forEach(function (component) { + names.push(component.get('displayName')); + }); + + return names.length ? names.join(', ') : false; + }.property('clientComponents') });
\ No newline at end of file diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js index e66d52d61e..7659ebb879 100644 --- a/ambari-web/app/views/main/service/item.js +++ b/ambari-web/app/views/main/service/item.js @@ -24,16 +24,23 @@ App.MainServiceItemView = Em.View.extend({ var options = []; var service = this.get('controller.content'); switch(service.get('serviceName')) { - case 'hdfs': + case 'HDFS': options.push({action: 'runRebalancer', 'label': Em.I18n.t('services.service.actions.run.rebalancer')}); break; - case 'hbase': + case 'HBASE': options.push({action: 'runCompaction', 'label': Em.I18n.t('services.service.actions.run.compaction')}); break; + default: + options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke')}); } - options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke')}); return options; - }.property('controller.content') + }.property('controller.content'), + hasMaintenanceControl: function(){ + return this.get("controller.content.isMaintained"); + }.property('controller.content.isMaintained'), + hasConfigTab: function(){ + return this.get("controller.content.isConfigurable"); + }.property('controller.content.isConfigurable') }); App.MainServiceItemOperations = Em.View.extend({ diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js index dc5ac619cd..99e38a6f84 100644 --- a/ambari-web/app/views/main/service/menu.js +++ b/ambari-web/app/views/main/service/menu.js @@ -20,7 +20,18 @@ var App = require('app'); App.MainServiceMenuView = Em.CollectionView.extend({ content:function () { - return App.router.get('mainServiceController.content'); + var items = App.router.get('mainServiceController.content').toArray(); + + var itemsToRemove = ['PIG', 'SQOOP']; + + items.forEach(function (item) { + if (itemsToRemove.indexOf(item.get('serviceName')) != -1) { + items.removeObject(item); + } + }); + + items.push(App.router.get('mainServiceController.additionalMenuItem')); + return items; }.property('App.router.mainServiceController.content'), diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js index 3650f00005..8ded1e4d46 100644 --- a/ambari-web/app/views/wizard/controls_view.js +++ b/ambari-web/app/views/wizard/controls_view.js @@ -148,7 +148,6 @@ App.ServiceConfigCheckbox = Ember.Checkbox.extend(App.ServiceConfigPopoverSuppor }); -<!-- {{bindAttr name="view.name" value="option"}} '<input type="radio" {{bindAttr name = "view.name" value="view.obj"}}>',--> App.ServiceConfigRadioButtons = Ember.View.extend({ template: Ember.Handlebars.compile([ '{{#each option in view.options}}', @@ -303,7 +302,8 @@ App.ServiceConfigMasterHostsView = Ember.View.extend(App.ServiceConfigMultipleHo }), onPrimary:function(){ this.hide(); - } + }, + secondary: null }); } diff --git a/ambari-web/app/views/wizard/step9_view.js b/ambari-web/app/views/wizard/step9_view.js index 3c0ee94f56..cea9bba71d 100644 --- a/ambari-web/app/views/wizard/step9_view.js +++ b/ambari-web/app/views/wizard/step9_view.js @@ -125,6 +125,7 @@ App.HostStatusView = Em.View.extend({ onPrimary: function () { this.hide(); }, + secondary: null, controllerBinding: context, bodyClass: Ember.View.extend({ templateName: require('templates/wizard/step9HostTasksLogPopup'), diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index 2cd5957811..1cc6f0c2f4 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -58,6 +58,11 @@ <exec dir="${basedir}" executable="brunch" failonerror="false"> <arg value="build"/> </exec> + <exec dir="${basedir}" executable="gzip" failonerror="false"> + <arg value="public/javascripts/app.js"/> + <arg value="public/javascripts/vendor.js"/> + <arg value="public/stylesheets/app.css"/> + </exec> </target> </configuration> </execution> |