AMBARI-793. Make MapReduce, Nagios, and Ganglia optional during cluster install. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1393286 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -12,6 +12,9 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
+  AMBARI-793. Make MapReduce, Nagios, and Ganglia optional during cluster
+  install. (yusaku)
+
   AMBARI-794. Add log4j properties for logging at the server. (mahadev)
 
   AMBARI-790. OK in registration response. (jitendra)

ambari-web/app/controllers.js

@@ -26,6 +26,7 @@ require('controllers/installer/step1_controller');
 require('controllers/installer/step2_controller');
 require('controllers/installer/step3_controller');
 require('controllers/installer/step4_controller');
+require('controllers/installer/step6_controller');
 require('controllers/installer/step5_controller');
 require('controllers/installer/step6_controller');
 require('controllers/installer/step7_controller');

ambari-web/app/controllers/installer/step4_controller.js

@@ -31,19 +31,19 @@ App.InstallerStep4Controller = Em.ArrayController.extend({
     {
       serviceName: 'MAPREDUCE',
       displayName: 'MapReduce',
-      isDisabled: true,
+      isDisabled: false,
       description: Em.I18n.t('services.mapreduce.description')
     },
     {
       serviceName: 'NAGIOS',
       displayName: 'Nagios',
-      isDisabled: true,
+      isDisabled: false,
       description: Em.I18n.t('services.nagios.description')
     },
     {
       serviceName: 'GANGLIA',
       displayName: 'Ganglia',
-      isDisabled: true,
+      isDisabled: false,
       description: Em.I18n.t('services.ganglia.description')
     },
     {
@@ -136,7 +136,61 @@ App.InstallerStep4Controller = Em.ArrayController.extend({
     db.setSelectedServiceNames(serviceNames);
   },
 
-  submit: function() {
+  needToAddMapReduce: function () {
+    if (this.findProperty('serviceName', 'MAPREDUCE').get('isSelected') === false) {
+      var mapreduceDependentServices = this.filter(function (item) {
+        return ['PIG', 'OOZIE', 'HIVE'].contains(item.get('serviceName')) && item.get('isSelected', true);
+      });
+      return (mapreduceDependentServices.get('length') > 0);
+    } else {
+      return false;
+    }
+  },
+
+  gangliaOrNagiosNotSelected: function () {
+    return (this.findProperty('serviceName', 'GANGLIA').get('isSelected') === false || this.findProperty('serviceName', 'NAGIOS').get('isSelected') === false);
+  },
+
+  submit: function () {
+    var self = this;
+    if (this.needToAddMapReduce()) {
+      App.ModalPopup.show({
+        header: Em.I18n.t('installer.step4.mapreduceCheck.popup.header'),
+        body: Em.I18n.t('installer.step4.mapreduceCheck.popup.body'),
+        onPrimary: function () {
+          self.findProperty('serviceName', 'MAPREDUCE').set('isSelected', true);
+          this.hide();
+          self.validateMonitoring();
+        },
+        onSecondary: function () {
+          this.hide();
+        }
+      });
+    } else {
+      self.validateMonitoring();
+    }
+  },
+
+  validateMonitoring: function () {
+    var self = this;
+    if (this.gangliaOrNagiosNotSelected()) {
+      App.ModalPopup.show({
+        header: Em.I18n.t('installer.step4.monitoringCheck.popup.header'),
+        body: Em.I18n.t('installer.step4.monitoringCheck.popup.body'),
+        onPrimary: function () {
+          this.hide();
+          self.proceed();
+        },
+        onSecondary: function () {
+          this.hide();
+        }
+      });
+    } else {
+      self.proceed();
+    }
+  },
+
+  proceed: function () {
     this.saveSelectedServiceNamesToDB();
     App.router.send('next');
   }

ambari-web/app/controllers/login_controller.js

@@ -20,29 +20,40 @@ var App = require('app');
 
 App.LoginController = Em.Object.extend({
 
-  name: 'loginController',
-  loginName: '',
-  password: '',
-  errorMessage: '',
+  name:'loginController',
+  loginName:'',
+  password:'',
+  errorMessage:'',
 
-  submit: function (e) {
+  submit:function (e) {
     console.log('Login: ' + this.get('loginName') + ' Password: ' + this.get('password'));
 
     this.set('errorMessage', '');
 
-    if (this.validateCredentials()) {
-      console.log('Logging in as: ' + this.get('loginName'));
-      App.get('router').login(this.get('loginName'));
+    var userId = this.validateCredentials();
+    if (userId) {
+      App.get('router').login(this.get('loginName'), App.User.find(userId));
     } else {
       console.log('Failed to login as: ' + this.get('loginName'));
       this.set('errorMessage', Em.I18n.t('login.error'));
     }
-
   },
 
-  validateCredentials: function () {
+  /**
+   *
+   * @return {number} user by credentials || {undefined}
+   */
+  validateCredentials:function () {
     //TODO: REST api that validates the login
-    return (this.get('loginName').trim() !== '' && this.get('loginName') === this.get('password'));
+    var thisController = this;
+
+    var user = App.store.filter(App.User, function (data) {
+      return data.get('user_name') == thisController.get('loginName') && data.get('password') == thisController.get('password')
+    });
+
+    console.log(user, user.content[0]);
+
+    return user.content[0];
   }
 
 });

ambari-web/app/controllers/main/admin/user.js

@@ -19,6 +19,12 @@
 App.MainAdminUserController = Em.Controller.extend({
   name:'mainAdminUserController',
   deleteRecord:function (event) {
+
+    if(event.context.get('userName') == App.get('router').getLoginName()) {
+      alert(Em.I18n.t('admin.users.deleteYourselfMessage'));
+      return ;
+    }
+
     if (Em.I18n.t('question.sure')) {
       event.context.deleteRecord();
       App.store.commit();

ambari-web/app/controllers/main/host.js

@@ -31,6 +31,10 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
   allChecked: false,
   selectedHostsIds: [],
   sortingAsc: true,
+  isSort: false,
+  sortClass: function(){
+    return this.get('sortingAsc')? 'icon-arrow-down' : 'icon-arrow-up';
+  }.property('sortingAsc'),
 
   isDisabled:true,
 
@@ -187,6 +191,7 @@ App.MainHostController = Em.ArrayController.extend(App.Pagination, {
       return 0;
     });
     this.set('fullContent', objects);
+    this.set('isSort', true);
     this.set('sortingAsc', !this.get('sortingAsc'));
     this.changeContent();
   }

ambari-web/app/controllers/main/host/details.js

@@ -19,22 +19,41 @@
 App.MainHostDetailsController = Em.Controller.extend({
   name: 'mainHostDetailsController',
   content: null,
-  startComponents: function(){
+
+  isFromHosts: false,
+
+  isStarting: function(){
     return this.get('content.workStatus');
   }.property('content.workStatus'),
-  stopComponents: function(){
-    return !this.get('startComponents');
-  }.property('startComponents'),
-  changeWorkStatus: function(){
-    if (this.get('startComponents')) {
-      this.set('iconClass', 'play');
-    } else {
-      this.set('iconClass', 'stop');
-    }
-  }.observes('startComponents'),
-  iconClass: '',
+  isStopping: function(){
+    return !this.get('isStarting');
+  }.property('isStarting'),
 
-  startConfirmPopup: function (event) {
+  setBack: function(isFromHosts){
+    this.set('isFromHosts', isFromHosts);
+  },
+
+  startComponent: function(event){
+    var self = this;
+    App.ModalPopup.show({
+      header: Em.I18n.t('hosts.host.start.popup.header'),
+      body: Em.I18n.t('hosts.host.start.popup.body'),
+      primary: 'Yes',
+      secondary: 'No',
+      onPrimary: function() {
+        var component = event.context;
+        component.set('workStatus', true);
+        var stopped = self.get('content.components').filterProperty('workStatus', false);
+        if (stopped.length == 0)
+          self.set('content.workStatus', true);
+        this.hide();
+      },
+      onSecondary: function() {
+        this.hide();
+      }
+    });
+  },
+  stopComponent: function(event){
     var self = this;
     App.ModalPopup.show({
       header: Em.I18n.t('hosts.host.start.popup.header'),
@@ -42,11 +61,30 @@ App.MainHostDetailsController = Em.Controller.extend({
       primary: 'Yes',
       secondary: 'No',
       onPrimary: function() {
-        console.log(self.get('content.components').getEach('workStatus'));
-        self.get('content.components').setEach('workStatus', self.get('content.workStatus'));
+        var component = event.context;
+        component.set('workStatus', false);
+        var started = self.get('content.components').filterProperty('workStatus', true);
+        if (started.length == 0)
+          self.set('content.workStatus', false);
+        this.hide();
+      },
+      onSecondary: function() {
+        this.hide();
+      }
+    });
 
-        self.set('content.workStatus', !self.get('content.workStatus'));
+  },
 
+  startConfirmPopup: function (event) {
+    var self = this;
+    App.ModalPopup.show({
+      header: Em.I18n.t('hosts.host.start.popup.header'),
+      body: Em.I18n.t('hosts.host.start.popup.body'),
+      primary: 'Yes',
+      secondary: 'No',
+      onPrimary: function() {
+        self.get('content.components').setEach('workStatus', true);
+        self.set('content.workStatus', !self.get('content.workStatus'));
         this.hide();
       },
       onSecondary: function() {
@@ -62,8 +100,7 @@ App.MainHostDetailsController = Em.Controller.extend({
       primary: 'Yes',
       secondary: 'No',
       onPrimary: function() {
-        console.log(self.get('content.components').getEach('workStatus'));
-        self.get('content.components').setEach('workStatus', self.get('content.workStatus'));
+        self.get('content.components').setEach('workStatus', false);
         self.set('content.workStatus', !self.get('content.workStatus'));
         this.hide();
       },

ambari-web/app/messages.js

@@ -42,8 +42,7 @@ Em.I18n.translations = {
   'installer.header': 'Cluster Install Wizard',
   'installer.step1.header': 'Welcome',
   'installer.step1.body.header': 'Welcome to Apache Ambari!',
-  'installer.step1.body':
-    'Ambari makes it easy to install, manage, and monitor Hadoop clusters.<br>' +
+  'installer.step1.body': 'Ambari makes it easy to install, manage, and monitor Hadoop clusters.<br>' +
     'We will walk you through the cluster installation process with this step-by-step wizard.',
   'installer.step1.clusterName': 'Name your cluster',
   'installer.step1.clusterName.tooltip.title': 'Cluster Name',
@@ -89,6 +88,10 @@ Em.I18n.translations = {
 
   'installer.step4.header': 'Choose Services',
   'installer.step4.body': 'Choose which services you want to install on your cluster.<br>Note that some services have dependencies (e.g., HBase requires ZooKeeper.)',
+  'installer.step4.mapreduceCheck.popup.header': 'MapReduce Needed',
+  'installer.step4.mapreduceCheck.popup.body': 'You did not select MapReduce, but it is needed by other services you selected.  We will automatically add MapReduce.  Is this OK?',
+  'installer.step4.monitoringCheck.popup.header': 'Limited Functionality Warning',
+  'installer.step4.monitoringCheck.popup.body': 'You did not select Nagios and/or Ganglia.  If both are not selected, monitoring and alerts will not function properly.  Is this OK?',
 
   'installer.step5.header': 'Assign Masters',
   'installer.step5.attention': 'more hosts without master service',
@@ -111,54 +114,57 @@ Em.I18n.translations = {
   'installer.step9.host.status.success': 'success',
   'installer.step9.host.status.warning': 'tolerable failures encountered',
   'installer.step9.host.status.failed': 'failures encountered',
+
   'installer.step10.header': 'Summary',
 
   'form.create': 'Create',
   'form.save': 'Save',
   'form.cancel': 'Cancel',
-  'form.password':'Password',
-  'form.passwordRetype':'Retype Password',
-  'form.saveSuccess':'Successfully saved.',
-  'form.saveError':'Sorry, errors occured.',
+  'form.password': 'Password',
+  'form.passwordRetype': 'Retype Password',
+  'form.saveSuccess': 'Successfully saved.',
+  'form.saveError': 'Sorry, errors occured.',
 
-  'form.validator.invalidIp':'Please enter valid ip address',
+  'form.validator.invalidIp': 'Please enter valid ip address',
 
-  'admin.advanced.title':'Advanced',
-  'admin.advanced.caution':'This section is for advanced user only.<br/>Proceed with caution.',
-  'admin.advanced.button.uninstallIncludingData':'Uninstall cluster including all data.',
-  'admin.advanced.button.uninstallKeepData':'Uninstall cluster but keep data.',
+  'admin.advanced.title': 'Advanced',
+  'admin.advanced.caution': 'This section is for advanced user only.<br/>Proceed with caution.',
+  'admin.advanced.button.uninstallIncludingData': 'Uninstall cluster including all data.',
+  'admin.advanced.button.uninstallKeepData': 'Uninstall cluster but keep data.',
 
-  'admin.advanced.popup.header':'Uninstall Cluster',
+  'admin.advanced.popup.header': 'Uninstall Cluster',
   /*'admin.advanced.popup.text':'Uninstall Cluster',*/
 
-  'admin.audit.grid.date':"Date/Time",
-  'admin.audit.grid.category':"Category",
-  'admin.audit.grid.operationName':"Operation",
-  'admin.audit.grid.performedBy':"Performed By",
-
-  'admin.authentication.form.method.database':'Use Ambari Database to authenticate users',
-  'admin.authentication.form.method.ldap':'Use LDAP/Active Directory to authenticate',
-  'admin.authentication.form.primaryServer':'Primary Server',
-  'admin.authentication.form.secondaryServer':'Secondary Server',
-  'admin.authentication.form.useSsl':'Use SSL',
-  'admin.authentication.form.bind.anonymously':"Bind Anonymously",
-  'admin.authentication.form.bind.useCrenedtials':"Use Credentials To Bind",
-  'admin.authentication.form.bindUserDN':'Bind User DN',
-  'admin.authentication.form.searchBaseDN':'Search Base DN',
-  'admin.authentication.form.usernameAttribute':'Username Attribute',
-
-  'admin.authentication.form.userDN':'User DN',
-  'admin.authentication.form.password':'Password',
-  'admin.authentication.form.configurationTest':'Configuration Test',
-  'admin.authentication.form.testConfiguration':'Test Configuration',
-
-  'admin.authentication.form.test.success':'The configuration passes the test',
-  'admin.authentication.form.test.fail':'The configuration fails the test',
-
-  'admin.security.title':'Kerberos Security has not been enabled on this cluster.',
-  'admin.security.button.enable':'Kerberos Security has not been enabled on this cluster.',
-
-  'admin.users.ldapAuthentionUsed':'LDAP Authentication is being used to authenticate users',
+  'admin.audit.grid.date': "Date/Time",
+  'admin.audit.grid.category': "Category",
+  'admin.audit.grid.operationName': "Operation",
+  'admin.audit.grid.performedBy': "Performed By",
+  'admin.audit.grid.service': "Category",
+
+  'admin.authentication.form.method.database': 'Use Ambari Database to authenticate users',
+  'admin.authentication.form.method.ldap': 'Use LDAP/Active Directory to authenticate',
+  'admin.authentication.form.primaryServer': 'Primary Server',
+  'admin.authentication.form.secondaryServer': 'Secondary Server',
+  'admin.authentication.form.useSsl': 'Use SSL',
+  'admin.authentication.form.bind.anonymously': "Bind Anonymously",
+  'admin.authentication.form.bind.useCrenedtials': "Use Credentials To Bind",
+  'admin.authentication.form.bindUserDN': 'Bind User DN',
+  'admin.authentication.form.searchBaseDN': 'Search Base DN',
+  'admin.authentication.form.usernameAttribute': 'Username Attribute',
+
+  'admin.authentication.form.userDN': 'User DN',
+  'admin.authentication.form.password': 'Password',
+  'admin.authentication.form.configurationTest': 'Configuration Test',
+  'admin.authentication.form.testConfiguration': 'Test Configuration',
+
+  'admin.authentication.form.test.success': 'The configuration passes the test',
+  'admin.authentication.form.test.fail': 'The configuration fails the test',
+
+  'admin.security.title': 'Kerberos Security has not been enabled on this cluster.',
+  'admin.security.button.enable': 'Kerberos Security has not been enabled on this cluster.',
+
+  'admin.users.ldapAuthentionUsed': 'LDAP Authentication is being used to authenticate users',
+  'admin.users.deleteYourselfMessage': 'You can\'t delete yourself',
   'admin.users.addButton': 'Add User',
   'admin.users.delete': 'delete',
   'admin.users.edit': 'edit',

ambari-web/app/models/cluster.js

@@ -70,7 +70,7 @@ App.Host.FIXTURES = [
     id: 1,
     host_name: 'z_host1',
     cluster_id: 1,
-    components:[1, 2, 3, 4],
+    components:[1, 2, 4],
     cpu: '2x2.5GHz',
     memory: '8GB',
     disk_usage: '40',
@@ -104,6 +104,7 @@ App.Host.FIXTURES = [
     id: 4,
     host_name: 'b_host4',
     cluster_id: 2,
+    components:[1, 2, 4, 5],
     health_status: 'DEAD',
     work_status: false
   },
@@ -138,7 +139,7 @@ App.Host.FIXTURES = [
     id: 7,
     host_name: 'host7',
     cluster_id: 1,
-    components:[4, 5],
+    components:[4, 7],
     cpu: '2x2.5GHz',
     memory: '8GB',
     disk_usage: '20',

ambari-web/app/models/service.js

@@ -60,7 +60,7 @@ App.Component = DS.Model.extend({
   type:DS.attr('boolean'),
   service:DS.belongsTo('App.Service'),
   host:DS.belongsTo('App.Host'),
-  workStatus:DS.attr('string')
+  workStatus: DS.attr('boolean')
 });
 
 App.Component.FIXTURES = [
@@ -71,7 +71,7 @@ App.Component.FIXTURES = [
     type: true,
     service_id:1,
     host_id:1,
-    work_status:true
+    work_status:false
   },
   {
     id:2,
@@ -80,7 +80,7 @@ App.Component.FIXTURES = [
     type: true,
     service_id:1,
     host_id:2,
-    work_status:false
+    work_status:true
   },
   {
     id:3,
@@ -88,7 +88,8 @@ App.Component.FIXTURES = [
     label: 'DN',
     service_id:1,
     type: false,
-    host_id:2
+    host_id:2,
+    work_status:true
   },
   {
     id:4,
@@ -105,7 +106,8 @@ App.Component.FIXTURES = [
     label: 'JT',
     type: false,
     service_id:2,
-    host_id:4
+    host_id:4,
+    work_status:true
   },
   {
     id:6,
@@ -113,7 +115,8 @@ App.Component.FIXTURES = [
     label: 'HBM',
     type: true,
     service_id:3,
-    host_id:4
+    host_id:4,
+    work_status:true
   },
   {
     id:7,
@@ -121,7 +124,8 @@ App.Component.FIXTURES = [
     label: 'RS',
     type: false,
     service_id:3,
-    host_id:2
+    host_id:2,
+    work_status:true
   }
 ];
 

ambari-web/app/models/service_audit.js

@@ -30,36 +30,42 @@ App.ServiceAudit.FIXTURES = [
     id: 1,
     date: 'September 12, 2012 17:00',
     operation_name: 'Reconfigure',
-    user_id: 2
+    user_id: 2,
+    service_id: 1
   },
   {
     id: 2,
     date: 'September 13, 2012 17:00',
     operation_name: 'Start',
-    user_id: 1
+    user_id: 1,
+    service_id: 1
   },
   {
     id: 3,
     date: 'September 14, 2012 17:00',
     operation_name: 'Install',
-    user_id: 1
+    user_id: 1,
+    service_id: 1
   },
   {
     id: 4,
     date: 'September 12, 2012 17:00',
     operation_name: 'Reconfigure',
-    user_id: 2
+    user_id: 2,
+    service_id: 2
   },
   {
     id: 5,
     date: 'September 13, 2012 17:00',
     operation_name: 'Start',
-    user_id: 1
+    user_id: 1,
+    service_id: 2
   },
   {
     id: 6,
     date: 'September 14, 2012 17:00',
     operation_name: 'Install',
-    user_id: 1
+    user_id: 1,
+    service_id: 2
   }
 ];

ambari-web/app/models/user.js

@@ -42,6 +42,15 @@ App.UserForm = App.Form.extend({
   disableUsername:function () {
     var field = this.getField("userName");
     if (field) field.set("disabled", this.get('isObjectNew') ? false : "disabled");
+
+  }.observes('isObjectNew'),
+  disableAdminCheckbox:function () {
+    var object = this.get('object');
+    var field = this.getField("admin");
+    if (field) {
+      field.set("disabled", object.get('userName') == App.get('router').getLoginName() ? "disabled" : false);
+    }
+
   }.observes('isObjectNew')
 });
 
@@ -49,7 +58,7 @@ App.User.FIXTURES = [
   {
     id:1,
     user_name:'admin',
-    password: 'admin',
+    password:'admin',
     admin:1
   },
   {

ambari-web/app/router.js

@@ -66,11 +66,20 @@ App.Router = Em.Router.extend({
     //localStorage.setItem('Ambari' + 'loginName', loginName);
   },
 
-  login: function (loginName) {
+  // that works incorrectly
+  setUser: function(user){ App.db.setUser(user); },
+  // that works incorrectly
+  getUser: function(){ return App.db.getUser(); },
+
+  login: function (loginName, user) {
     // TODO: this needs to be hooked up with server authentication
     console.log("In login function");
     this.setAuthenticated(true);
     this.setLoginName(loginName);
+
+//    refactor to get user attributes
+//    this.setUser(user);
+
     this.transitionTo(this.getSection());
 
   },

ambari-web/app/routes/main.js

@@ -56,7 +56,10 @@ module.exports = Em.Route.extend({
       router.get('mainController').connectOutlet('mainHost');
     },
 
-    showDetails:Em.Router.transitionTo('hostDetails.index')
+    showDetails: function(router, event){
+      router.get('mainHostDetailsController').setBack(true);
+      router.transitionTo('hostDetails.index', event.context)
+    }
 
   }),
 
@@ -213,12 +216,6 @@ module.exports = Em.Route.extend({
     route:'/dashboard',
     connectOutlets:function (router, context) {
       router.get('mainController').connectOutlet('mainDashboard');
-    },
-    selectService: Em.Route.transitionTo('services.service'),
-    selectHost: Em.Router.transitionTo('hostDetails.index'),
-    filterHosts: function(router, component) {
-      router.get('mainHostController').set('filters.components', [component.context.get('id')]);
-      router.transitionTo('hosts');
     }
   }),
 
@@ -279,12 +276,6 @@ module.exports = Em.Route.extend({
           router.get('mainServiceItemController').connectOutlet('mainServiceInfoAudit', item);
         }
       }),
-      selectService: Em.Route.transitionTo('services.service'),
-      selectHost: Em.Router.transitionTo('hostDetails.index'),
-      filterHosts: function(router, component) {
-        router.get('mainHostController').set('filters.components', [component.context.get('id')]);
-        router.transitionTo('hosts');
-      },
       showInfo:function (router, event) {
         var parent = event.view._parentView;
         parent.deactivateChildViews();
@@ -298,19 +289,18 @@ module.exports = Em.Route.extend({
     showService:Em.Router.transitionTo('service')
   }),
 
+  selectService: Em.Route.transitionTo('services.service'),
+  selectHost: function(router, event) {
+    router.get('mainHostDetailsController').setBack(true);
+    router.transitionTo('hostDetails.index');
+  },
+  filterHosts: function(router, component) {
+    router.get('mainHostController').filterByComponentId(component.context.get('id'));
+    router.transitionTo('hosts');
+  },
   navigate:function (router, event) {
     var parent = event.view._parentView;
     parent.deactivateChildViews(event.context);
     router.transitionTo(event.context.routing);
   }
-
-  // TODO: create new routes here
-  // dashboard
-  // charts
-  // hosts
-  // hosts/:hostname
-  // admin
-  // etc...
-
-
 });

ambari-web/app/styles/app.css

@@ -16,55 +16,6 @@
  * limitations under the License.
  */
 
-/*Box styles*/
-.box {
-    border: 1px solid #5fa3c3;
-    margin-bottom: 20px;
-}
-.box-header,
-.box-footer {
-    padding: 10px;
-    background: #dedede;
-}
-.box-footer hr {
-    margin: 0px;
-}
-.box-header:after,
-.box-footer:after {
-    content: "";
-    display: table;
-    clear: both;
-}
-.box-header .btn-group {
-    float: right;
-}
-.box-header h4 {
-    float: left;
-}
-
-.alerts {
-    margin: 0px;
-}
-.alerts li {
-    border-bottom: 1px solid #b7b9bb;
-    list-style: none;
-    padding: 5px 10px 5px 43px;
-}
-.alerts li.status-ok {
-    background: url("../img/status-ok.jpg") no-repeat 14px 9px;
-}
-.alerts li.status-corrupt {
-    background: url("../img/status-corrupt.jpg") no-repeat 14px 9px;
-}
-.alerts li .date-time {
-    float: right;
-}
-.go-to {
-    float: right;
-    background: url("../img/arrow-right.png") no-repeat right center;
-    padding-right: 40px;
-    margin-top: 20px;
-}
 /*Services*/
 .service-summary {
     background: #F6FAFD;
@@ -143,10 +94,11 @@
 #hosts .table td.first label{
     padding-top: 3px;
 }
-#hosts .table td.first label span{
+#hosts .table td.name span{
     display: block;
+    float: left;
     height: 13px;
-    margin: 3px 0 0 3px;
+    margin: 4px 5px 0 0;
     width: 13px;
 }
 #hosts .table ul.filter-components li{
@@ -232,7 +184,7 @@
     border: 1px solid #DEDEDE;
     background: #fff;
 }
-#host-details .host-components .btn{
+#host-details .host-components .btn-group{
     margin:0 5px 10px 0;
 }
 /*End Hosts*/

ambari-web/app/styles/application.less

@@ -227,8 +227,36 @@ a:focus {
 @status-live-marker: url("../img/health-status-live.png");
 @status-dead-marker: url("../img/health-status-dead.png");
 
-/*Dashboard*/
+/*****start styles for boxes*****/
+.box {
+  border: 1px solid #5fa3c3;
+  margin-bottom: 20px;
+}
+.box-header,
+.box-footer {
+  padding: 10px;
+  background: #dedede;
+}
+.box-footer hr {
+  margin: 0px;
+}
+.box-header:after,
+.box-footer:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+.box-header .btn-group {
+  float: right;
+}
+.box-header h4 {
+  float: left;
+}
+/*****end styles for boxes*****/
+
+/*****start styles for dashboard page*****/
 
+/*start services summary*/
 .services {
   margin-left: 5px;
   .tab-marker-position {
@@ -245,7 +273,43 @@ a:focus {
     .tab-marker-position;
     background-image: @status-dead-marker;
   }
+  dt {
+    text-align: left;
+    width: 120px;
+  }
+  dd{
+    margin-left: 145px;
+  }
 }
+/*end services summary*/
+
+/*start alerts summary*/
+.alerts {
+  margin: 0px;
+}
+.alerts li {
+  border-bottom: 1px solid #b7b9bb;
+  list-style: none;
+  padding: 5px 10px 5px 43px;
+}
+.alerts li.status-ok {
+  background: url("../img/status-ok.jpg") no-repeat 14px 9px;
+}
+.alerts li.status-corrupt {
+  background: url("../img/status-corrupt.jpg") no-repeat 14px 9px;
+}
+.alerts li .date-time {
+  float: right;
+}
+.go-to {
+  float: right;
+  background: url("../img/arrow-right.png") no-repeat right center;
+  padding-right: 40px;
+  margin-top: 20px;
+}
+/*end alerts summary*/
+
+/*****end styles for dashboard page*****/
 
 /*Services*/
 .nav-tabs {

ambari-web/app/templates/main/admin/audit.hbs

@@ -24,6 +24,11 @@
     {{/each}}
   </tr>
   </thead>
+  <tbody>
+  {{#each row in view.rows}}
+    {{view row}}
+  {{/each}}
+  </tbody>
 </table>
 <div class="pagination">
   <ul>

ambari-web/app/templates/main/dashboard.hbs

@@ -49,20 +49,22 @@
           <div class="box-header">
             <h4>Services</h4>
           </div>
-          <ul class="services">
+          <dl class="dl-horizontal services">
             {{#each service in controller.services}}
-              <li class="health-status-{{unbound service.healthStatus}}">
-                <a {{action selectService service href=true}} href="javascript:void(null)">{{service.label}}</a> -
+              <dt class="health-status-{{unbound service.healthStatus}}">
+                <a {{action selectService service href=true}}>{{service.label}}</a> -
+              </dt>
+              <dd>
                 {{#each component in service.components}}
                   {{#if component.type}}
-                    <a {{action selectHost component.host href=true}} href="javascript:void(null)">{{component.componentName}}</a>,
+                    <a {{action selectHost component.host href=true}}>{{component.componentName}}</a>,
                   {{else}}
-                    <a {{action filterHosts component}} href="javascript:void(null)">{{component.componentName}}</a>
+                    <a {{action filterHosts component}}>{{component.componentName}}</a>
                   {{/if}}
                 {{/each}}
-              </li>
+              </dd>
             {{/each}}
-          </ul>
+          </dl>
         </div>
       </div>
     </div>

ambari-web/app/templates/main/host.hbs

@@ -55,6 +55,9 @@
             </th>
             <th>
               <a href="#" {{action sortByName target="controller" }}>Name</a>
+              {{#if controller.isSort}}
+                <i class="icon-arrow-up"{{bindAttr class="controller.sortClass"}}></i>
+              {{/if}}
             </th>
             <th>Rack</th>
             <th>CPU</th>
@@ -86,10 +89,12 @@
             <td class="first">
                 <label class="checkbox">
                   {{view view.HostCheckboxView checkedBinding="host.isChecked" contentBinding="host"}}
-                  <span class="health-status-{{unbound host.healthStatus}}"></span>
                 </label>
             </td>
-            <td><a href="#" {{action showDetails host}}>{{unbound host.hostName}}</a></td>
+            <td class="name">
+              <span class="health-status-{{unbound host.healthStatus}}"></span>
+              <a href="#" {{action "showDetails" host}}>{{unbound host.hostName}}</a>
+            </td>
             <td>{{host.cluster.clusterName}}</td>
             <td>{{host.cpu}}</td>
             <td>{{host.memory}}</td>

ambari-web/app/templates/main/host/details.hbs

@@ -16,16 +16,18 @@
 * limitations under the License.
 -->
 <div id="host-details" class="row">
-    <a class="btn back" {{action backToHostsList}}>← Back to Hosts</a>
+    {{#if controller.isFromHosts}}
+      <a class="btn back" {{action backToHostsList}}>← Back to Hosts</a>
+    {{/if}}
     <div class="box ">
         <div class="box-header">
             <div class="span1 host-title health-status-{{unbound view.content.healthStatus}}">{{unbound view.content.hostName}}</div>
             <div class="button-section pull-right clearfix">
-              <button {{bindAttr disabled="controller.startComponents"}} class="btn btn-success" data-toggle="modal" {{action "startConfirmPopup" target="controller"}}>
+              <button {{bindAttr disabled="controller.isStarting"}} class="btn btn-success" data-toggle="modal" {{action "startConfirmPopup" target="controller"}}>
                 <i class="icon-play"></i>
                 Start
               </button>
-              <button {{bindAttr disabled="controller.stopComponents"}} class="btn btn-danger" data-toggle="modal" {{action "stopConfirmPopup" target="controller"}}>
+              <button {{bindAttr disabled="controller.isStopping"}} class="btn btn-danger" data-toggle="modal" {{action "stopConfirmPopup" target="controller"}}>
                 <i class="icon-stop"></i>
                 Stop
               </button>

ambari-web/app/templates/main/host/summary.hbs

@@ -30,10 +30,26 @@
     {{#if view.content.components.length}}
     <div class="span3 host-components pull-right">
         {{#each component in view.content.components}}
-          <button class="btn btn-{{bind view.buttonClass}}">
-            {{component.componentName}}
-            <i class="icon-{{unbound view.content.iconClass}}"></i>
-          </button>
+          {{#view view.ComponentButtonView contentBinding="component"}}
+            <div class="btn-group">
+              <button {{bindAttr class="view.buttonClass"}} data-toggle="dropdown">
+                {{unbound view.content.componentName}}
+                <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu">
+                <li>
+                  <a href="javascript:void(null)" data-toggle="modal" {{action "startComponent" view.content target="controller"}}>
+                    Start
+                  </a>
+                </li>
+                <li>
+                  <a href="javascript:void(null)" data-toggle="modal" {{action "stopComponent" view.content target="controller"}}>
+                    Stop
+                  </a>
+                </li>
+              </ul>
+            </div>
+          {{/view}}
         {{/each}}
     </div>
     {{/if}}

ambari-web/app/templates/main/service/info/summary.hbs

@@ -31,17 +31,11 @@
 		<div class="service-content">
 			{{#each component in controller.content.components}}
         {{#if component.type}}
-          <div class="service-links">{{component.componentName}}:<a {{action selectHost component.host href=true}} href="javascript:void(null)">{{component.host.hostName}}</a></div>
+          <div class="service-links">{{component.componentName}}: <a {{action selectHost component.host href=true}} href="javascript:void(null)">{{component.host.hostName}}</a></div>
         {{else}}
-          <div class="service-links">{{component.componentName}}:<a {{action filterHosts component}} href="javascript:void(null)">{{component.componentName}}</a></div>
+          <div class="service-links">{{component.componentName}}: <a {{action filterHosts component}} href="javascript:void(null)">{{component.componentName}}</a></div>
         {{/if}}
 			{{/each}}
-			Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the
-			industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and
-			scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into
-			electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of
-			Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like
-			Aldus PageMaker including versions of Lorem Ipsum.
 		</div>
 	</div>
 	<div class="span6">

ambari-web/app/utils/db.js

@@ -74,6 +74,14 @@ App.db.setLoginName = function(name) {
   localStorage.setObject('ambari',App.db.data);
 }
 
+// that works incorrectly
+App.db.setUser = function(user) {
+  console.log('TRACE: Entering db:setUser function');
+  App.db.data = localStorage.getObject('ambari');
+  App.db.data.app.user = user;
+  localStorage.setObject('ambari',App.db.data);
+}
+
 App.db.setAuthenticated = function(authenticated) {
   console.log('TRACE: Entering db:setAuthenticated function');
 
@@ -201,6 +209,13 @@ App.db.setSlaveComponentHosts = function(slaveComponentHosts) {
  *  getter methods
  */
 
+// that works incorrectly
+App.db.getUser = function() {
+  console.log('TRACE: Entering db:getUser function');
+  App.db.data = localStorage.getObject('ambari');
+  return App.db.data.app.user;
+}
+
 App.db.getLoginName = function() {
   console.log('Trace: Entering db:getLoginName function');
   App.db.data = localStorage.getObject('ambari');

ambari-web/app/utils/helper.js

@@ -24,4 +24,15 @@ Em.CoreObject.reopen({
   t: function(key, attrs){
     return Em.I18n.t(key, attrs)
   }
-});
+});
+
+Em.Object.getMixinProperties = function(){
+  var properties = {};
+  this.PrototypeMixin.mixins.forEach(function(i,mix){
+    if(mix.properties) {
+      properties = mix.properties;
+    }
+  });
+
+  return properties;
+}

ambari-web/app/views/main/admin/audit.js

@@ -35,9 +35,31 @@ App.GridHeader = Em.View.extend({
   }
 });
 
+App.GridRow = Em.View.extend({
+  tagName:'tr',
+  init:function (options) {
+    console.warn("gridrow init");
+    var object = this.get('object');
+    var grid = this.get('grid');
+    var fieldNames = grid.get('fieldNames');
+    var template = '';
+//    console.warn("FIELD NAMES:", +fieldNames);
+
+    if (fieldNames) {
+      $.each(grid.get('fieldNames'), function (i, field) {
+        template += "<td>"+ object.get(field) +"</td>";
+      });
+
+      this.set('template', Em.Handlebars.compile(template));
+    }
+    return this._super();
+  }
+});
+
 App.MainAdminAuditView = Em.View.extend({
   _columns:{},
   columns:[],
+  rows:[],
   initComleted:false,
   collection:[],
   templateName:require('templates/main/admin/audit'),
@@ -47,6 +69,7 @@ App.MainAdminAuditView = Em.View.extend({
     if (!this.columns.length) { // init completed on this
       this.prepareColumns();
       this.prepareFilters();
+      this.prepareRows();
       this.prepareCollection();
     }
   },
@@ -67,7 +90,6 @@ App.MainAdminAuditView = Em.View.extend({
     var field = App.GridHeader.extend(options);
     this.columns.push(field);
 
-//    console.log("FI:", field.filterable);
     if (field.filterable || 1) { // .filterable - field not working :(
       this.fieldNames.push(options.name);
     }
@@ -77,10 +99,18 @@ App.MainAdminAuditView = Em.View.extend({
       name:"date",
       label:Em.I18n.t("admin.audit.grid.date")
     });
+    this.addColumn({
+      name:"service.label",
+      label:Em.I18n.t("admin.audit.grid.service")
+    });
     this.addColumn({
       name:"operationName",
       label:Em.I18n.t("admin.audit.grid.operationName")
     });
+    this.addColumn({
+      name:"user.userName",
+      label:Em.I18n.t("admin.audit.grid.performedBy")
+    });
   },
   prepareFilters:function () {
     var collection = this.get('collection');
@@ -89,8 +119,8 @@ App.MainAdminAuditView = Em.View.extend({
 
     if (collection && collection.content && collection.content.length) {
       collection.forEach(function (i, object) {
-        console.warn("INTO");
-        console.warn(object, object.content);
+//        console.warn("INTO");
+//        console.warn(object, object.content);
         $.each(fieldNames, function (j, field) {
           if (!options[field]) {
             options[field] = [];
@@ -100,8 +130,8 @@ App.MainAdminAuditView = Em.View.extend({
         });
       })
 
-      console.warn("SORT OPTIONS:", options);
-      this.set('fieldNames', false);
+//      console.warn("SORT OPTIONS:", options);
+//      this.set('fieldNames', false);
 //      indexOf
 
 //      console.warn("LENGTH:" + collection.content.length);
@@ -111,5 +141,18 @@ App.MainAdminAuditView = Em.View.extend({
 
 //    $.each(this.get('collection'), function(){})
 
+  }.observes('collection'),
+  prepareRows:function () {
+    var collection = this.get('collection');
+    var thisGrid = this;
+    console.warn("PREPARE ROWS");
+    if (collection && collection.content && collection.content.length) {
+      collection.forEach(function (object) {
+        console.warn("FOREACH COLLECTION");
+        var row = App.GridRow.extend({grid:thisGrid, object:object});
+        thisGrid.rows.push(row);
+      });
+    }
+
   }.observes('collection')
 });

ambari-web/app/views/main/host/summary.js

@@ -23,7 +23,11 @@ App.MainHostSummaryView = Em.View.extend({
   content:function(){
     return App.router.get('mainHostDetailsController.content');
   }.property('App.router.mainHostDetailsController.content'),
-  buttonClass: function(){
-    return this.get('startComponents') ? 'success' : 'danger';
-  }.property('startComponents')
+  ComponentButtonView: Em.View.extend({
+    content: null,
+    buttonClass: function(){
+      return this.get('content.workStatus') ? 'btn btn-success dropdown-toggle' : 'btn btn-danger dropdown-toggle';
+    }.property('content.workStatus')
+  })
+
 });

ambari-web/test/installer/step4_test.js

@@ -21,8 +21,8 @@ require('controllers/installer/step4_controller');
 
 describe('App.InstallerStep4Controller', function () {
 
-  var DEFAULT_SERVICES = ['HDFS', 'MAPREDUCE', 'NAGIOS', 'GANGLIA'];
-  var OPTIONAL_SERVICES = ['OOZIE', 'HIVE', 'HBASE', 'PIG', 'SQOOP', 'ZOOKEEPER', 'HCATALOG'];
+  var DEFAULT_SERVICES = ['HDFS'];
+  var OPTIONAL_SERVICES = ['MAPREDUCE', 'NAGIOS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SQOOP', 'ZOOKEEPER', 'HCATALOG'];
 
   var controller = App.InstallerStep4Controller.create();
 
@@ -93,6 +93,48 @@ describe('App.InstallerStep4Controller', function () {
 
   })
 
+  describe('#needToAddMapReduce', function() {
+
+    describe('mapreduce not selected', function() {
+      beforeEach(function() {
+        controller.findProperty('serviceName', 'MAPREDUCE').set('isSelected', false);
+      })
+
+      it('should return true if Hive is selected and MapReduce is not selected', function() {
+        controller.findProperty('serviceName', 'HIVE').set('isSelected', true);
+        expect(controller.needToAddMapReduce()).to.equal(true);
+      })
+      it('should return true if Pig is selected and MapReduce is not selected', function() {
+        controller.findProperty('serviceName', 'PIG').set('isSelected', true);
+        expect(controller.needToAddMapReduce()).to.equal(true);
+      })
+      it('should return true if Oozie is selected and MapReduce is not selected', function() {
+        controller.findProperty('serviceName', 'OOZIE').set('isSelected', true);
+        expect(controller.needToAddMapReduce()).to.equal(true);
+      })
+    })
+
+    describe('mapreduce not selected', function() {
+      beforeEach(function() {
+        controller.findProperty('serviceName', 'MAPREDUCE').set('isSelected', true);
+      })
+
+      it('should return false if Hive is selected and MapReduce is selected', function() {
+        controller.findProperty('serviceName', 'HIVE').set('isSelected', true);
+        expect(controller.needToAddMapReduce()).to.equal(false);
+      })
+      it('should return false if Pig is selected and MapReduce is not selected', function() {
+        controller.findProperty('serviceName', 'PIG').set('isSelected', true);
+        expect(controller.needToAddMapReduce()).to.equal(false);
+      })
+      it('should return false if Oozie is selected and MapReduce is not selected', function() {
+        controller.findProperty('serviceName', 'OOZIE').set('isSelected', true);
+        expect(controller.needToAddMapReduce()).to.equal(false);
+      })
+    })
+
+  })
+
   describe('#saveSelectedServiceNamesToDB', function() {
 
     beforeEach(function() {
@@ -108,9 +150,9 @@ describe('App.InstallerStep4Controller', function () {
       App.db.setLoginName('tester');
       App.db.setClusterName('test');
       controller.saveSelectedServiceNamesToDB();
-      console.log('controller length=' + controller.get('length'));
+      // console.log('controller length=' + controller.get('length'));
       var selectedServiceNames = App.db.getSelectedServiceNames();
-      console.log('service length=' + selectedServiceNames.get('length'));
+      // console.log('service length=' + selectedServiceNames.get('length'));
       expect(selectedServiceNames.length === DEFAULT_SERVICES.length + OPTIONAL_SERVICES.length).to.equal(true);
     })