You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/12/09 14:08:23 UTC
svn commit: r1418929 - in
/incubator/ambari/branches/AMBARI-666/ambari-web/app: ./ assets/data/users/
assets/data/wizard/stack/hdp/version01/ controllers/global/
controllers/main/admin/user/ controllers/wizard/ data/ mappers/ models/
templates/main/adm...
Author: yusaku
Date: Sun Dec 9 13:08:21 2012
New Revision: 1418929
URL: http://svn.apache.org/viewvc?rev=1418929&view=rev
Log:
AMBARI-1059. Refactor cluster management. (yusaku)
Added:
incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/users/
incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/users/users.json
incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js
Modified:
incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/admin/user/edit.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step2_controller.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_mapping.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user/edit.js
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/users/users.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/users/users.json?rev=1418929&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/users/users.json (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/users/users.json Sun Dec 9 13:08:21 2012
@@ -0,0 +1,25 @@
+{
+ "href": "http://ambari:8080/api/clusters/mycluster/users",
+ "items": [
+ {
+ "href" : "http://ambari:8080/api/users/admin",
+ "Users" :
+ { "user_name" : "admin", "roles" : "admin,user" }
+ },
+ {
+ "href" : "http://ambari:8080/api/users/user",
+ "Users" :
+ { "user_name" : "user", "roles" : "user" }
+ },
+ {
+ "href" : "http://ambari:8080/api/users/john",
+ "Users" :
+ { "user_name" : "john", "roles" : "admin,user" }
+ },
+ {
+ "href" : "http://ambari:8080/api/users/mike",
+ "Users" :
+ { "user_name" : "mike", "roles" : "user" }
+ }
+ ]
+}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/wizard/stack/hdp/version01/MAPREDUCE.json Sun Dec 9 13:08:21 2012
@@ -681,6 +681,18 @@
"value": "128",
"description": "Limit on the length of counter group names in jobs. Names\n exceeding this limit will be truncated.\n ",
"filename": "mapred-site.xml"
+ },
+ {
+ "name": "mapreduce.history.server.embedded",
+ "value": "false",
+ "description": "",
+ "filename": "mapred-site.xml"
+ },
+ {
+ "name": "mapreduce.history.server.http.address",
+ "value": "localhost:51111",
+ "description": "",
+ "filename": "mapred-site.xml"
}
],
"components": [
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js Sun Dec 9 13:08:21 2012
@@ -39,7 +39,8 @@ App.ClusterController = Em.Controller.ex
'services': false,
'cluster' : false,
'racks' : false,
- 'alerts' : false
+ 'alerts' : false,
+ 'users' : false
}),
/**
* load cluster name
@@ -72,8 +73,8 @@ App.ClusterController = Em.Controller.ex
/**
* Provides the URL to use for NAGIOS server. This URL
* is helpful in getting alerts data from server and also
- * in populating links in UI.
- *
+ * in populating links in UI.
+ *
* If null is returned, it means NAGIOS service is not installed.
*/
nagiosUrl: function () {
@@ -98,7 +99,7 @@ App.ClusterController = Em.Controller.ex
return null;
}
}.property('dataLoadList.services'),
-
+
isNagiosInstalled: function(){
if(App.testMode){
return true;
@@ -108,7 +109,7 @@ App.ClusterController = Em.Controller.ex
return nagiosSvc!=null;
}
}.property('dataLoadList.services'),
-
+
/**
* Sorted list of alerts.
* Changes whenever alerts are loaded.
@@ -129,9 +130,9 @@ App.ClusterController = Em.Controller.ex
});
return sortedArray;
}.property('dataLoadList.alerts'),
-
+
/**
- * This method automatically loads alerts when Nagios URL
+ * This method automatically loads alerts when Nagios URL
* changes. Once done it will trigger dataLoadList.alerts
* property, which will trigger the alerts property.
*/
@@ -163,7 +164,7 @@ App.ClusterController = Em.Controller.ex
console.log("No Nagios URL provided.")
}
}.observes('nagiosUrl'),
-
+
/**
*
* load all data and update load status
@@ -178,7 +179,7 @@ App.ClusterController = Em.Controller.ex
var hostsUrl = this.getUrl('/data/hosts/hosts.json', '/hosts?fields=*');
var servicesUrl1 = this.getUrl('/data/dashboard/services.json', '/services?ServiceInfo/service_name!=MISCELLANEOUS&ServiceInfo/service_name!=DASHBOARD&fields=components/host_components/*');
var servicesUrl2 = this.getUrl('/data/dashboard/services.json', '/services?ServiceInfo/service_name!=MISCELLANEOUS&ServiceInfo/service_name!=DASHBOARD&fields=components/ServiceComponentInfo');
-
+ var usersUrl = this.getUrl('/data/users/users.json', '/users/?fields=*');
var runsUrl = App.testMode ? "/data/apps/runs.json" : "/api/jobhistory/workflow";
var racksUrl = "/data/racks/racks.json";
@@ -205,7 +206,13 @@ App.ClusterController = Em.Controller.ex
self.updateLoadStatus('hosts');
}
});
-
+
+ App.HttpClient.get(usersUrl, App.usersMapper,{
+ complete:function(jqXHR, textStatus){
+ self.updateLoadStatus('users');
+ }
+ });
+
//////////////////////////////
// Hack for services START //
//////////////////////////////
@@ -245,7 +252,7 @@ App.ClusterController = Em.Controller.ex
}
});
nameNode1.ServiceComponentInfo = nameNode2.ServiceComponentInfo;
-
+
App.servicesMapper.map(metricsJson);
self.updateLoadStatus('services');
}
@@ -262,7 +269,7 @@ App.ClusterController = Em.Controller.ex
/////////////////////////////
// Hack for services END //
/////////////////////////////
-
+
}.observes('clusterName'),
clusterName: function(){
return (this.get('cluster')) ? this.get('cluster').Clusters.cluster_name : 'mycluster';
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/admin/user/edit.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/admin/user/edit.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/admin/user/edit.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/admin/user/edit.js Sun Dec 9 13:08:21 2012
@@ -20,5 +20,36 @@ var App = require('app');
App.MainAdminUserEditController = Em.Controller.extend({
name:'mainAdminUserEditController',
+ sendCommandToServer : function(url, postData, callback){
+ var url = (App.testMode) ?
+ '/data/wizard/deploy/poll_1.json' : //content is the same as ours
+ '/api/clusters/' + App.router.getClusterName() + url;
+
+ var method = App.testMode ? 'GET' : 'PUT';
+
+ $.ajax({
+ type: method,
+ url: url,
+ data: JSON.stringify(postData),
+ dataType: 'json',
+ timeout: 5000,
+ success: function(data){
+ if(data && data.Requests){
+ callback(data.Requests.id);
+ } else{
+ callback(null);
+ console.log('cannot get request id from ', data);
+ }
+ },
+
+ error: function (request, ajaxOptions, error) {
+ //do something
+ callback(null);
+ console.log('error on change component host status')
+ },
+
+ statusCode: require('data/statusCodes')
+ });
+ },
content:false
})
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step2_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step2_controller.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step2_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step2_controller.js Sun Dec 9 13:08:21 2012
@@ -138,7 +138,7 @@ App.WizardStep2Controller = Em.Controlle
return false;
}
- var bootStrapData = JSON.stringify({'sshKey': this.get('sshKey'), hosts: this.get('hostNameArr')});
+ var bootStrapData = JSON.stringify({'verbose': true, 'sshKey': this.get('sshKey'), hosts: this.get('hostNameArr')});
// TODO: skipping bootstrap for now
if (true) {
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js Sun Dec 9 13:08:21 2012
@@ -104,6 +104,9 @@ App.WizardStep8Controller = Em.Controlle
getGlobConfigValue: function (templateName, expression) {
var express = expression.match(/<(.*?)>/g);
var value = expression;
+ if (express == null) {
+ return expression;
+ }
express.forEach(function (_express) {
//console.log("The value of template is: " + _express);
var index = parseInt(_express.match(/\[([\d]*)(?=\])/)[1]);
@@ -907,7 +910,10 @@ App.WizardStep8Controller = Em.Controlle
var mrProperties = {};
configs.forEach(function (_configProperty) {
mrProperties[_configProperty.name] = _configProperty.value;
+ console.log("STEP*: name of the property is: " + _configProperty.name);
+ console.log("STEP8: value of the property is: " + _configProperty.value);
}, this);
+
return {type: 'mapred-site', tag: 'version1', properties: mrProperties};
},
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_mapping.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_mapping.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_mapping.js Sun Dec 9 13:08:21 2012
@@ -444,10 +444,10 @@ module.exports = [
"filename": "mapred-site.xml"
},
{
- "name": "mapred.job.tracker.http.addres",
+ "name": "mapred.job.tracker.http.address",
"templateName": ["jobtracker_host"],
"foreignKey": null,
- "value": "<templateName[0]>:50300",
+ "value": "<templateName[0]>:50030",
"filename": "mapred-site.xml"
},
{
@@ -500,6 +500,13 @@ module.exports = [
"filename": "mapred-site.xml"
},
{
+ "name": "mapreduce.history.server.embedded",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "false",
+ "filename": "mapred-site.xml"
+ },
+ {
"name": "mapreduce.history.server.http.address",
"templateName": ["jobtracker_host"],
"foreignKey": null,
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js Sun Dec 9 13:08:21 2012
@@ -1389,6 +1389,19 @@ module.exports =
"isVisible": true,
"serviceName": "MAPREDUCE"
},
+ /* TODO: Uncomment when RCA integration is ready
+ {
+ "id": "puppet var",
+ "name": "enable_rca",
+ "displayName": "Enable RCA",
+ "description": "Enable RCA",
+ "defaultValue": true,
+ "isReconfigurable": true,
+ "displayType": "checkbox",
+ "isVisible": true,
+ "serviceName": "MAPREDUCE"
+ },
+ */
/*{
"id": "puppet var",
"name": "mapred-site.xml",
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/initialize.js Sun Dec 9 13:08:21 2012
@@ -38,6 +38,7 @@ require('mappers/jobs_mapper');
require('mappers/runs_mapper');
require('mappers/racks_mapper');
require('mappers/alerts_mapper');
+require('mappers/users_mapper');
require('utils/http_client');
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js?rev=1418929&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js Sun Dec 9 13:08:21 2012
@@ -0,0 +1,27 @@
+/**
+ * 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.
+ */
+
+
+App.usersMapper = App.QuickDataMapper.create({
+ model : App.User,
+ config : {
+ user_name : 'Users.user_name',
+ roles : 'Users.roles'
+ }
+
+});
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js Sun Dec 9 13:08:21 2012
@@ -26,9 +26,12 @@ App.UserModel = Em.Object.extend({
App.User = DS.Model.extend({
userName:DS.attr('string'),
- admin:DS.attr('boolean'),
password:DS.attr('string'),
- auditItems:DS.hasMany('App.ServiceAudit')
+ roles:DS.attr('string'),
+ auditItems:DS.hasMany('App.ServiceAudit'),
+ admin: function () {
+ return !!(/^admin/.test(this.get('roles')))
+ }.property('userName')
});
App.UserForm = App.Form.extend({
@@ -88,7 +91,8 @@ App.UserForm = App.Form.extend({
return isValid;
}
});
-
+App.User.FIXTURES = [];
+/*
App.User.FIXTURES = [
{
id:1,
@@ -117,4 +121,4 @@ App.User.FIXTURES = [
password:'test',
admin:0
}
-];
\ No newline at end of file
+];*/
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs Sun Dec 9 13:08:21 2012
@@ -22,10 +22,9 @@
<table class="table table-bordered table-striped span6">
<thead>
<tr>
- <th style="width:10%">ID (test)</th>
<th style="width:50%">{{t admin.users.username}}</th>
- <th style="width:20%">{{t admin.users.privileges}}<i class="icon-question-sign"></i></th>
- <th style="width:20%">Action</th>
+ <th style="width:15%">{{t admin.users.privileges}}<i class="icon-question-sign"></i></th>
+ <th style="width:15%">Action</th>
</tr>
</thead>
<tbody>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs Sun Dec 9 13:08:21 2012
@@ -17,7 +17,6 @@
}}
<tr>
- <td>{{user.id}}</td>
<td>{{user.userName}}</td>
<td>{{view Ember.Checkbox disabledBinding="view.disableCheckBoxes" checkedBinding="user.admin"}}</td>
<td>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin.js Sun Dec 9 13:08:21 2012
@@ -19,5 +19,5 @@
var App = require('app');
App.MainAdminView = Em.View.extend({
- templateName: require('templates/main/admin'),
+ templateName: require('templates/main/admin')
});
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user.js Sun Dec 9 13:08:21 2012
@@ -21,9 +21,6 @@ var App = require('app');
App.MainAdminUserView = Em.View.extend({
templateName: require('templates/main/admin/user'),
users: App.User.find(),
-// users: function(){
-// return App.router.get('mainAdminUserController.content');
-// }.property('mainAdminUserController.content'),
delete: function(event, context){
console.log("EVENT:");
console.log(event);
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user/edit.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user/edit.js?rev=1418929&r1=1418928&r2=1418929&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user/edit.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user/edit.js Sun Dec 9 13:08:21 2012
@@ -23,8 +23,27 @@ App.MainAdminUserEditView = Em.View.exte
userId: false,
create: function(event){
var form = this.get("userForm");
- if(form.isValid() && form.save()) {
- App.router.transitionTo("allUsers");
+ if(form.isValid()) {
+ var controller = this.get('controller');
+ var roles="user";
+ if(form.getValues().admin=="") roles="admin";
+ controller.sendCommandToServer('/users/' + form.getValues().userName, {
+ Users: {
+ password: form.getValues().password,
+ roles: roles
+ }
+ }, function (requestId) {
+
+ if (!requestId) {
+ return;
+ }
+
+ if(App.testMode) form.save();
+
+ App.router.transitionTo("allUsers");
+ })
+
+
}
},