ambari git commit: AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 5c874ccb4 -> f4fb1742b
AMBARI-21360: Ability to delete a view instance from view instance list
(sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4fb1742
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4fb1742
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4fb1742
Branch: refs/heads/trunk
Commit: f4fb1742b1ba29247da897f4ca1dd67a82a34c1b
Parents: 5c874cc
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Jun 28 10:49:31 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Jun 28 10:49:31 2017 -0700
--
AMBARI-21360.patch | 45 -
1 file changed, 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fb1742/AMBARI-21360.patch
--
diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch
deleted file mode 100644
index c26f3a0..000
--- a/AMBARI-21360.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-index c41e5d4..4e7bae3 100644
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
- }
- };
-
-+ $scope.deleteInstance = function(instance) {
-+ ConfirmationModal.show(
-+$t('common.delete', {
-+ term: $t('views.viewInstance')
-+}),
-+$t('common.deleteConfirmation', {
-+ instanceType: $t('views.viewInstance'),
-+ instanceName: instance.ViewInstanceInfo.label
-+})
-+ ).then(function() {
-+View.deleteInstance(instance.ViewInstanceInfo.view_name,
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
-+ .then(function() {
-+loadViews();
-+ })
-+ .catch(function(data) {
-+Alert.error($t('views.alerts.cannotDeleteInstance'),
data.data.message);
-+ });
-+ });
-+};
-+
- $scope.reloadViews = function () {
- loadViews();
- };
-diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-index 59c322f..91b9a93 100644
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-+++
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-@@ -81,6 +81,9 @@
-
-
-
-+
-+
-+
-
-
-
ambari git commit: AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 344628314 -> a3681c019
AMBARI-21360: Ability to delete a view instance from view instance list
(sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a3681c01
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3681c01
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3681c01
Branch: refs/heads/trunk
Commit: a3681c0199f31511170770d454697206cbeeeda3
Parents: 3446283
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Jun 28 09:29:57 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Jun 28 09:29:57 2017 -0700
--
AMBARI-21360.patch | 45
.../controllers/ambariViews/ViewsListCtrl.js| 20 +
.../app/views/ambariViews/listTable.html| 3 ++
3 files changed, 68 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/AMBARI-21360.patch
--
diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch
new file mode 100644
index 000..c26f3a0
--- /dev/null
+++ b/AMBARI-21360.patch
@@ -0,0 +1,45 @@
+diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+index c41e5d4..4e7bae3 100644
+---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
+ }
+ };
+
++ $scope.deleteInstance = function(instance) {
++ ConfirmationModal.show(
++$t('common.delete', {
++ term: $t('views.viewInstance')
++}),
++$t('common.deleteConfirmation', {
++ instanceType: $t('views.viewInstance'),
++ instanceName: instance.ViewInstanceInfo.label
++})
++ ).then(function() {
++View.deleteInstance(instance.ViewInstanceInfo.view_name,
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
++ .then(function() {
++loadViews();
++ })
++ .catch(function(data) {
++Alert.error($t('views.alerts.cannotDeleteInstance'),
data.data.message);
++ });
++ });
++};
++
+ $scope.reloadViews = function () {
+ loadViews();
+ };
+diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
+index 59c322f..91b9a93 100644
+---
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
+@@ -81,6 +81,9 @@
+
+
+
++
++
++
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
index c41e5d4..4e7bae3 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
}
};
+ $scope.deleteInstance = function(instance) {
+ ConfirmationModal.show(
+$t('common.delete', {
+ term: $t('views.viewInstance')
+}),
+$t('common.deleteConfirmation', {
+ instanceType: $t('views.viewInstance'),
+ instanceName: instance.ViewInstanceInfo.label
+})
+ ).then(function() {
+View.deleteInstance(instance.ViewInstanceInfo.view_name,
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
+ .then(function() {
+loadViews();
+ })
+ .catch(function(data) {
+Alert.error($t('views.alerts.cannotDeleteInstance'),
data.data.message);
+ });
+ });
+};
+
$scope.reloadViews = function () {
loadViews();
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/ambari-admin/src/main/res
ambari git commit: AMBARI-21274: Typo in stack advisor error message for yarn and mr queue config issues (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk aac9fe6e2 -> 344628314
AMBARI-21274: Typo in stack advisor error message for yarn and mr queue config
issues (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34462831
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34462831
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34462831
Branch: refs/heads/trunk
Commit: 34462831450c3f592b3343940c2c623f9bb7489b
Parents: aac9fe6
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Jun 28 09:16:48 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Jun 28 09:16:48 2017 -0700
--
ambari-server/src/main/resources/stacks/stack_advisor.py | 2 +-
.../src/test/python/stacks/2.0.6/common/test_stack_advisor.py | 2 +-
.../src/test/python/stacks/2.5/common/test_stack_advisor.py| 2 +-
.../src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 3a39a34..8e08d82 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -2752,7 +2752,7 @@ class DefaultStackAdvisor(StackAdvisor):
if len(leaf_queue_names) == 0:
return None
elif queue_name not in leaf_queue_names:
- return self.getErrorItem("Queue is not exist or not corresponds to
existing YARN leaf queue")
+ return self.getErrorItem("Queue does not exist or correspond to an
existing YARN leaf queue")
return None
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index b6f1965..0c4996b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -534,7 +534,7 @@ class TestHDP206StackAdvisor(TestCase):
hosts = self.prepareHosts([])
result = self.stackAdvisor.validateConfigurations(services, hosts)
expectedItems = [
- {'message': 'Queue is not exist or not corresponds to existing YARN leaf
queue', 'level': 'ERROR'}
+ {'message': 'Queue does not exist or correspond to an existing YARN leaf
queue', 'level': 'ERROR'}
]
self.assertValidationResult(expectedItems, result)
services["configurations"]["yarn-env"]["properties"]["service_check.queue.name"]
= "ndfqueue"
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index e62e00c..50f527d 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -5334,7 +5334,7 @@ class TestHDP25StackAdvisor(TestCase):
hosts = self.prepareHosts([])
result = self.stackAdvisor.validateConfigurations(services, hosts)
expectedItems = [
- {'message': 'Queue is not exist or not corresponds to existing YARN leaf
queue', 'level': 'ERROR'}
+ {'message': 'Queue does not exist or correspond to an existing YARN leaf
queue', 'level': 'ERROR'}
]
self.assertValidationResult(expectedItems, result)
services["configurations"]["yarn-env"]["properties"]["service_check.queue.name"]
= "ndfqueue2"
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
--
diff --git
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
index 5a95fe3..5f70db2 100755
---
a/contrib/management-packs/odpi-ambari-mpack/src/main/r
ambari git commit: AMBARI-21172 - Delete view privileges from the Groups page (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 3529d053d -> 86347182a
AMBARI-21172 - Delete view privileges from the Groups page (Anita Jebaraj via
sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86347182
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86347182
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86347182
Branch: refs/heads/trunk
Commit: 86347182a99209dcd767240ae475a03549acd989
Parents: 3529d05
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue Jun 27 10:49:43 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue Jun 27 10:49:43 2017 -0700
--
.../scripts/controllers/groups/GroupsEditCtrl.js | 19 +--
.../ui/admin-web/app/views/groups/edit.html | 3 +++
2 files changed, 20 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/86347182/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
index 92406e9..21d0fd6 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
@@ -129,6 +129,20 @@ angular.module('ambariAdminConsole')
});
};
+
+ $scope.removePrivilege = function(name, privilege) {
+var privilegeObject = {
+id: privilege.privilege_id,
+view_name: privilege.view_name,
+version: privilege.version,
+instance_name: name
+};
+View.deletePrivilege(privilegeObject).then(function() {
+ loadPrivileges();
+});
+ };
+
+function loadPrivileges() {
// Load privileges
Group.getPrivileges($routeParams.id).then(function(data) {
var privileges = {
@@ -145,6 +159,7 @@ angular.module('ambariAdminConsole')
privileges.views[privilege.instance_name] =
privileges.views[privilege.instance_name] || { privileges:[]};
privileges.views[privilege.instance_name].version = privilege.version;
privileges.views[privilege.instance_name].view_name =
privilege.view_name;
+privileges.views[privilege.instance_name].privilege_id =
privilege.privilege_id;
privileges.views[privilege.instance_name].privileges.push(privilege.permission_label);
}
});
@@ -157,6 +172,6 @@ angular.module('ambariAdminConsole')
}).catch(function(data) {
Alert.error($t('common.alerts.cannotLoadPrivileges'), data.data.message);
});
-
-
+}
+loadPrivileges();
}]);
http://git-wip-us.apache.org/repos/asf/ambari/blob/86347182/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
index e472ede..1aafd03 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
@@ -83,6 +83,9 @@
{{item | translate}}{{$last ? '' : ', '}}
+
+
+
{{'common.alerts.noPrivileges' |
translate: '{term: constants.view}'}}
ambari git commit: AMBARI-21132 - Export cluster_name in the cluster template file (Amruta Borkar via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 7a0eda7ec -> dfb5d3920
AMBARI-21132 - Export cluster_name in the cluster template file (Amruta Borkar
via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dfb5d392
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dfb5d392
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dfb5d392
Branch: refs/heads/trunk
Commit: dfb5d392067a581df27b59c0f5077729f483e1db
Parents: 7a0eda7
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Jun 1 11:17:31 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Jun 1 11:17:31 2017 -0700
--
ambari-web/app/controllers/wizard/step8_controller.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfb5d392/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js
b/ambari-web/app/controllers/wizard/step8_controller.js
index 6f65953..fa44a24 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -2028,7 +2028,8 @@ App.WizardStep8Controller =
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
"config_recommendation_strategy" : "NEVER_APPLY",
"provision_action" : "INSTALL_AND_START",
"configurations": [],
- "host_groups": cluster_template_host_groups.filter(function (item) {
return item.hosts.length > 0; })
+ "host_groups": cluster_template_host_groups.filter(function (item) {
return item.hosts.length > 0; }),
+ "Clusters": {'cluster_name': App.clusterStatus.clusterName}
};
fileUtils.downloadTextFile(JSON.stringify(cluster_template), 'json',
'clustertemplate.json')
},
ambari git commit: AMBARI-21120: Roles below Cluster Administrator should not be allowed to edit repositories and install stack versions (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 851c85718 -> 7a0eda7ec
AMBARI-21120: Roles below Cluster Administrator should not be allowed to edit
repositories and install stack versions (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a0eda7e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a0eda7e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a0eda7e
Branch: refs/heads/trunk
Commit: 7a0eda7ec99882fd40bdd6b036e2301f6e0486da
Parents: 851c857
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Jun 1 10:47:29 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Jun 1 10:47:29 2017 -0700
--
.../views/main/admin/stack_upgrade/upgrade_version_box_view.js | 4 ++--
.../main/admin/stack_upgrade/upgrade_version_box_view_test.js| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7a0eda7e/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index f102402..bb0cc81 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -61,7 +61,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
}.property('App.upgradeState', 'content.displayName',
'controller.upgradeVersion'),
isRepoUrlsEditDisabled: function () {
-return ['INSTALLING', 'UPGRADING'].contains(this.get('content.status')) ||
this.get('isUpgrading') || (!App.isAuthorized('AMBARI.MANAGE_STACK_VERSIONS')
&& this.get('content.status') === 'CURRENT');
+return ['INSTALLING', 'UPGRADING'].contains(this.get('content.status')) ||
this.get('isUpgrading') || (!App.isAuthorized('AMBARI.MANAGE_STACK_VERSIONS'));
}.property('content.status', 'isUpgrading'),
/**
@@ -231,7 +231,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
element.set('isDisabled', this.get('controller.requestInProgress'));
}
//For restricted upgrade wizard should be disabled in any state
-if (this.get('controller.isWizardRestricted')) {
+if (this.get('controller.isWizardRestricted') ||
(!App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK'))) {
element.set('isDisabled', true);
}
return element;
http://git-wip-us.apache.org/repos/asf/ambari/blob/7a0eda7e/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
--
diff --git
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index 153b66f..31aa796 100644
---
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -465,7 +465,7 @@ describe('App.UpgradeVersionBoxView', function () {
status: 'INIT',
isButton: true,
buttons: [],
- isDisabled: false
+ isDisabled: true
},
title: 'INIT state, no admin access, no requests in progress'
},
@@ -962,7 +962,7 @@ describe('App.UpgradeVersionBoxView', function () {
isButton: true,
action: 'resumeUpgrade',
text: Em.I18n.t('admin.stackUpgrade.dialog.resume'),
- isDisabled: false
+ isDisabled: true
},
title: 'upgrade suspended'
},
ambari git commit: AMBARI-21094 - Customize services shows inconsistent config-groups after clicking on Back (Amruta Borkar via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 145a80294 -> 9ff0a7852
AMBARI-21094 - Customize services shows inconsistent config-groups after
clicking on Back (Amruta Borkar via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ff0a785
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ff0a785
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ff0a785
Branch: refs/heads/trunk
Commit: 9ff0a785235ce9c70ca265d3d02edce2dea7f6ea
Parents: 145a802
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Fri May 26 11:37:47 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Fri May 26 11:37:47 2017 -0700
--
ambari-web/app/controllers/wizard/step7_controller.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ff0a785/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 6685c01..9a897d0 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -307,6 +307,9 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
isRecommendedLoaded: false,
initialRecommendations: []
});
+App.ServiceConfigGroup.find().filterProperty('isDefault',
false).forEach(function (record) {
+ App.configGroupsMapper.deleteRecord(record);
+});
this.get('stepConfigs').clear();
this.set('filter', '');
this.get('filterColumns').setEach('selected', false);
ambari git commit: AMBARI-21104 - Add Confirmation pop up for 'Generate Blueprint' button (Amruta Borkar via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk ad6a78eee -> a4482bba2
AMBARI-21104 - Add Confirmation pop up for 'Generate Blueprint' button (Amruta
Borkar via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4482bba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4482bba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4482bba
Branch: refs/heads/trunk
Commit: a4482bba2c7f0d1bb3dfb79df45cd01909dd35ee
Parents: ad6a78e
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu May 25 14:04:09 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu May 25 14:04:09 2017 -0700
--
ambari-web/app/controllers/wizard/step8_controller.js | 11 +++
ambari-web/app/messages.js| 1 +
ambari-web/app/templates/wizard/step8.hbs | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4482bba/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js
b/ambari-web/app/controllers/wizard/step8_controller.js
index f2b4ca7..5fbd45d 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1851,6 +1851,17 @@ App.WizardStep8Controller =
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
});
},
+ /**
+ * Confirmation popup before generate blueprint
+ */
+ generateBlueprintConfirmation: function () {
+var self = this;
+return App.showConfirmationPopup(function () {
+ self.generateBlueprint();
+ },
Em.I18n.t('installer.step8.generateBlueprint.popup.msg').format(App.clusterStatus.clusterName)
+);
+ },
+
generateBlueprint: function () {
console.log("Prepare blueprint for download...");
var blueprint = {};
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4482bba/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0c15a19..09a2c0e 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -971,6 +971,7 @@ Em.I18n.translations = {
'installer.step8.header': 'Review',
'installer.step8.body': 'Please review the configuration before
installation',
'installer.step8.kerberors.warning': 'Because Kerberos has been
manually installed on the cluster, you will have to create/distribute
principals and keytabs when this operation is finished.',
+ 'installer.step8.generateBlueprint.popup.msg': 'You will be
downloading blueprint.json and clustertemplate.json to your local
machine. You can use them to deploy a cluster via AMBARI REST API.
Update clustertemplate.json with a custom cluster name if you do not want
to use name {0}. If you want to use custom repo URLs, make
sure to update them via Ambari REST API before deploying the cluster.',
'installer.step8.deployPopup.message':'Preparing to Deploy: {0} of {1} tasks
completed.',
'installer.step8.hosts':' hosts',
'installer.step8.host':' host',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4482bba/ambari-web/app/templates/wizard/step8.hbs
--
diff --git a/ambari-web/app/templates/wizard/step8.hbs
b/ambari-web/app/templates/wizard/step8.hbs
index 907b3d4..e210896 100644
--- a/ambari-web/app/templates/wizard/step8.hbs
+++ b/ambari-web/app/templates/wizard/step8.hbs
@@ -100,7 +100,7 @@
{{t common.print}}
{{t admin.kerberos.wizard.step5.downloadCSV}}
{{#unless App.router.clusterInstallCompleted}}
-
+
{{t common.generate.blueprint}}
{{/unless}}
ambari git commit: AMBARI-21095 - Enable opening views in a new tab (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 56f019081 -> 42be8ce79
AMBARI-21095 - Enable opening views in a new tab (Anita Jebaraj via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/42be8ce7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/42be8ce7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/42be8ce7
Branch: refs/heads/trunk
Commit: 42be8ce798172757b8b0967b309baf73fe0a5212
Parents: 56f0190
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed May 24 15:51:55 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed May 24 15:51:55 2017 -0700
--
.../src/main/resources/ui/admin-web/app/index.html| 2 +-
.../ui/admin-web/app/views/ambariViews/edit.html | 2 +-
ambari-web/app/controllers/main/views_controller.js | 4 ++--
ambari-web/app/models/view_instance.js| 6 +++---
.../test/controllers/main/views_controller_test.js| 14 ++
ambari-web/test/models/view_instance_test.js | 6 +++---
6 files changed, 20 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/42be8ce7/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index 32f9ba7..52e41f6 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -55,7 +55,7 @@
-{{instance.label}}
+{{instance.label}}
{{'common.noViews' | translate}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/42be8ce7/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index b6ec61d..f91862d 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -20,7 +20,7 @@
{{'common.views' | translate}}
{{instance.ViewInstanceInfo.label}}
+ href="{{fromSiteRoot('/#/main/views/' + viewUrl)}}" target="_blank">
{{'views.goToInstance' | translate}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/42be8ce7/ambari-web/app/controllers/main/views_controller.js
--
diff --git a/ambari-web/app/controllers/main/views_controller.js
b/ambari-web/app/controllers/main/views_controller.js
index 398cdd8..b746cf1 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -109,7 +109,7 @@ App.MainViewsController = Em.Controller.extend({
setView: function (event) {
if (event.context) {
- App.router.route(event.context.get('internalAmbariUrl'));
+ window.open(event.context.get('internalAmbariUrl'));
}
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/42be8ce7/ambari-web/app/models/view_instance.js
--
diff --git a/ambari-web/app/models/view_instance.js
b/ambari-web/app/models/view_instance.js
index d438640..2ee3005 100644
--- a/ambari-web/app/models/view_instance.js
+++ b/ambari-web/app/models/view_instance.js
@@ -74,8 +74,8 @@ App.ViewInstance = Em.Object.extend({
var version = this.get('version');
var instanceName = this.get('instanceName');
if(shortUrl) {
- return 'main/view/' + viewName + '/' + shortUrl;
+ return '#/main/view/' + viewName + '/' + shortUrl;
}
-return 'main/views/' + viewName + '/' + version + '/' + instanceName;
+return '#/main/views/' + viewName + '/' + version + '/' + instanceName;
}.property('shortUrl', 'viewName', 'version', 'instanceName')
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/42be8ce7/ambari-web/test/controllers/main/views_controller_test.js
--
diff --git a/ambari-web/test/controllers/main/views_controller_test.js
b/ambari-web/test/controllers/main/views_controller_test.js
index 0ab7654..af5c61b 100644
--- a/ambari-web/test/controllers/main/views_controller_test.js
+++ b/ambari-web/test/controllers/ma
ambari git commit: AMBARI-21052: Regex pattern for version number in Register Version UI should depend on stack's version dir (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk cd769e2e7 -> b5fdb57c5
AMBARI-21052: Regex pattern for version number in Register Version UI should
depend on stack's version dir (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5fdb57c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5fdb57c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5fdb57c
Branch: refs/heads/trunk
Commit: b5fdb57c5173cbf241782e9daa6dee4f4dc63c3c
Parents: cd769e2
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue May 23 14:02:10 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue May 23 14:02:10 2017 -0700
--
.../stackVersions/StackVersionsCreateCtrl.js| 1 -
.../ui/admin-web/app/scripts/i18n.config.js | 2 +-
.../ui/admin-web/app/scripts/services/Stack.js | 32 +++-
.../views/stackVersions/stackVersionPage.html | 4 +--
.../StackVersionsCreateCtrl_test.js | 6 ++--
5 files changed, 37 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5fdb57c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
index 69c35c0..70f6658 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
@@ -34,7 +34,6 @@ angular.module('ambariAdminConsole')
$scope.useRedhatSatellite = false;
$scope.clusterName = $routeParams.clusterName;
- $scope.subversionPattern = /^\d+\.\d+(-\d+)?$/;
$scope.upgradeStack = {
stack_name: '',
stack_version: '',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5fdb57c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index fd2c6e5..43b32da 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -374,7 +374,7 @@ angular.module('ambariAdminConsole')
'versions.deregister': 'Deregister Version',
'versions.deregisterConfirmation': 'Are you sure you want to deregister
version {{versionName}} ?',
-'versions.placeholder': 'Version Number (0.0)',
+'versions.placeholder': 'Version Number {{pattern}}',
'versions.repos': 'Repositories',
'versions.os': 'OS',
'versions.baseURL': 'Base URL',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5fdb57c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
index b496987..a203b5c 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
@@ -88,6 +88,7 @@ angular.module('ambariAdminConsole')
},
allPublicStackVersions: function() {
+ var self = this;
var url =
'/version_definitions?fields=VersionDefinition/stack_default,VersionDefinition/stack_repo_update_link_exists,operating_systems/repositories/Repositories/*,VersionDefinition/stack_services,VersionDefinition/repository_version'
+
'/show_available=true';
var deferred = $q.defer();
@@ -104,7 +105,6 @@ angular.module('ambariAdminConsole')
stackNameVersion: version.VersionDefinition.stack_name + '-' +
version.VersionDefinition.stack_version,
displayName: version.VersionDefinition.stack_name + '-' +
version.VersionDefinition.repository_version.split('-')[0], //HDP-2.3.4.0
displayNameFull: version.VersionDefinition.stack_name + '-' +
version.VersionDefinition.repository_version, //HDP-2.3.4.0-23
- editableDisplayName:
version.VersionDefinition.repository_version.substring(4),
isNonXMLdata: true,
repositoryVersion: version.VersionDefinition.repository_version,
stackNameRe
ambari git commit: AMBARI-21001: Hive 1.5.0 view does not load in Internet Explorer 11 (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 292db86f0 -> dad74757d
AMBARI-21001: Hive 1.5.0 view does not load in Internet Explorer 11 (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dad74757
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dad74757
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dad74757
Branch: refs/heads/trunk
Commit: dad74757d7ab067d5ecfb00665a496332da4ece5
Parents: 292db86
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed May 17 22:46:00 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed May 17 22:46:00 2017 -0700
--
.../hive-next/src/main/resources/ui/hive-web/app/routes/splash.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dad74757/contrib/views/hive-next/src/main/resources/ui/hive-web/app/routes/splash.js
--
diff --git
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/routes/splash.js
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/routes/splash.js
index 087bab3..34379d2 100644
---
a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/routes/splash.js
+++
b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/routes/splash.js
@@ -98,7 +98,7 @@ export default Ember.Route.extend({
}
this.fetchServiceCheckPolicy()
- .then((data) => {
+ .then (function(data) {
var numberOfChecks = 0;
var serviceCheckPolicy = data.serviceCheckPolicy;
for (var serviceCheck in serviceCheckPolicy) {
ambari git commit: AMBARI-20925: Service Auto-Start behavior is incorrect for Service Administrator and Service Operator Roles (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 f740a9fdd -> d8f7d3ae3
AMBARI-20925: Service Auto-Start behavior is incorrect for Service
Administrator and Service Operator Roles (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8f7d3ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8f7d3ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8f7d3ae
Branch: refs/heads/branch-2.5
Commit: d8f7d3ae34233378e6eb52db6b0d316d4d906db2
Parents: f740a9f
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Fri May 5 12:06:12 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Fri May 5 12:06:12 2017 -0700
--
ambari-web/app/routes/main.js | 2 +-
ambari-web/app/views/main/admin.js | 2 +-
ambari-web/app/views/main/menu.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f7d3ae/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 35f637c..02b561d 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -564,7 +564,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
adminServiceAutoStart: Em.Route.extend({
route: '/serviceAutoStart',
enter: function(router, transition) {
-if (router.get('loggedIn') &&
!App.isAuthorized('CLUSTER.MANAGE_AUTO_START') &&
!App.isAuthorized('CLUSTER.MANAGE_AUTO_START')) {
+if (router.get('loggedIn') &&
!App.isAuthorized('CLUSTER.MANAGE_AUTO_START') &&
!App.isAuthorized('SERVICE.MANAGE_AUTO_START')) {
router.transitionTo('main.dashboard.index');
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f7d3ae/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js
b/ambari-web/app/views/main/admin.js
index 0fa84e8..509f380 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -46,7 +46,7 @@ App.MainAdminView = Em.View.extend({
disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
});
}
-if (App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') ||
(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
+if ((App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') &&
App.isAuthorized('SERVICE.MANAGE_AUTO_START, CLUSTER.MANAGE_AUTO_START')) ||
(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
if (App.supports.serviceAutoStart) {
items.push({
name: 'serviceAutoStart',
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f7d3ae/ambari-web/app/views/main/menu.js
--
diff --git a/ambari-web/app/views/main/menu.js
b/ambari-web/app/views/main/menu.js
index f60ae8a..00b1c38 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -128,7 +128,7 @@ App.MainMenuView = Em.CollectionView.extend({
disabled: App.get('upgradeInProgress') || App.get('upgradeHolding')
});
}
-if (App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') ||
(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
+if ((App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') &&
App.isAuthorized('SERVICE.MANAGE_AUTO_START, CLUSTER.MANAGE_AUTO_START')) ||
(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
if (App.supports.serviceAutoStart) {
categories.push({
name: 'serviceAutoStart',
ambari git commit: AMBARI-20354: Files View: In non-HA environment, Files view executes with error when List of NameNodes property is cleared (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 5a9ee9e27 -> 00ecfc028
AMBARI-20354: Files View: In non-HA environment, Files view executes with error
when List of NameNodes property is cleared (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00ecfc02
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00ecfc02
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00ecfc02
Branch: refs/heads/branch-2.5
Commit: 00ecfc028640ce912430f88c5be2ed05ff50f177
Parents: 5a9ee9e
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Apr 27 11:17:55 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Apr 27 11:18:11 2017 -0700
--
.../org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/00ecfc02/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
--
diff --git
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
index 7e174a7..0d8dd35 100644
---
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
+++
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
@@ -266,7 +266,8 @@ public class ConfigurationBuilder {
String nameservice = uri.getHost();
String namenodeIDs = getProperty(HDFS_SITE,
String.format(HA_NAMENODES_CLUSTER_PROPERTY, nameservice),
HA_NAMENODES_INSTANCE_PROPERTY);
-return namenodeIDs != null;
+LOG.debug("namenodeIDs " + namenodeIDs);
+return !StringUtils.isEmpty(namenodeIDs);
}
private static boolean hasPort(String url) throws URISyntaxException {
ambari git commit: AMBARI-20354: Files View: In non-HA environment, Files view executes with error when List of NameNodes property is cleared (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 30eb73a76 -> 59f9ab216
AMBARI-20354: Files View: In non-HA environment, Files view executes with error
when List of NameNodes property is cleared (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59f9ab21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59f9ab21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59f9ab21
Branch: refs/heads/trunk
Commit: 59f9ab216591983cc4dc1054e5a073cb9ccf91c9
Parents: 30eb73a
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Apr 27 10:18:38 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Apr 27 10:18:38 2017 -0700
--
.../org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/59f9ab21/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
--
diff --git
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
index 714e229..df0fd96 100644
---
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
+++
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
@@ -280,7 +280,8 @@ public class ConfigurationBuilder {
String nameservice = uri.getHost();
String namenodeIDs = getProperty(HDFS_SITE,
String.format(HA_NAMENODES_CLUSTER_PROPERTY, nameservice),
HA_NAMENODES_INSTANCE_PROPERTY);
-return namenodeIDs != null;
+LOG.debug("namenodeIDs " + namenodeIDs);
+return !StringUtils.isEmpty(namenodeIDs);
}
private static boolean hasPort(String url) throws URISyntaxException {
ambari git commit: AMBARI-20616: Provide an optional attribute for custom commands to specify title used in operations window title (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk ec51e1663 -> 35d7220af
AMBARI-20616: Provide an optional attribute for custom commands to specify
title used in operations window title (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/35d7220a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/35d7220a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/35d7220a
Branch: refs/heads/trunk
Commit: 35d7220afb894565134dd1503d8f2dc08d7be59c
Parents: ec51e16
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue Apr 25 12:19:03 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue Apr 25 12:58:22 2017 -0700
--
.../server/actionmanager/HostRoleCommand.java | 10
.../AmbariCustomCommandExecutionHelper.java | 3 ++
.../internal/TaskResourceProvider.java | 3 ++
.../orm/entities/HostRoleCommandEntity.java | 15 ++
.../server/state/CustomCommandDefinition.java | 5 ++
.../server/upgrade/UpgradeCatalog300.java | 15 ++
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 +
.../resources/Ambari-DDL-Postgres-CREATE.sql| 1 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 +
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 1 +
.../src/main/resources/properties.json | 1 +
.../internal/TaskResourceProviderTest.java | 8
.../orm/entities/HostRoleCommandEntityTest.java | 49
.../server/upgrade/UpgradeCatalog300Test.java | 8
.../app/controllers/wizard/step9_controller.js | 2 +-
ambari-web/app/utils/ajax/ajax.js | 8 ++--
ambari-web/app/utils/helper.js | 7 ++-
ambari-web/app/utils/host_progress_popup.js | 2 +-
.../views/wizard/step9/hostLogPopupBody_view.js | 2 +-
ambari-web/test/utils/helper_test.js| 5 ++
22 files changed, 141 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/35d7220a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
index 87a6edf..bd354d9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
@@ -69,6 +69,7 @@ public class HostRoleCommand {
private String customCommandName;
private ExecutionCommandWrapper executionCommandWrapper;
private boolean isBackgroundCommand = false;
+ private String opsDisplayName;
@Inject
private ExecutionCommandDAO executionCommandDAO;
@@ -179,6 +180,7 @@ public class HostRoleCommand {
roleCommand = hostRoleCommandEntity.getRoleCommand();
event = new
ServiceComponentHostEventWrapper(hostRoleCommandEntity.getEvent());
commandDetail = hostRoleCommandEntity.getCommandDetail();
+opsDisplayName = hostRoleCommandEntity.getOpsDisplayName();
customCommandName = hostRoleCommandEntity.getCustomCommandName();
isBackgroundCommand = hostRoleCommandEntity.isBackgroundCommand();
}
@@ -202,6 +204,7 @@ public class HostRoleCommand {
hostRoleCommandEntity.setAutoSkipOnFailure(autoSkipFailure);
hostRoleCommandEntity.setRoleCommand(roleCommand);
hostRoleCommandEntity.setCommandDetail(commandDetail);
+hostRoleCommandEntity.setOpsDisplayName(opsDisplayName);
hostRoleCommandEntity.setCustomCommandName(customCommandName);
hostRoleCommandEntity.setBackgroundCommand(isBackgroundCommand);
@@ -294,6 +297,13 @@ public class HostRoleCommand {
this.commandDetail = commandDetail;
}
+ public String getOpsDisplayName() {
+return opsDisplayName;
+ }
+
+ public void setOpsDisplayName(String opsDisplayName) {
+this.opsDisplayName = opsDisplayName;
+ }
public String getCustomCommandName() {
return customCommandName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/35d7220a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 17bc718..ab8b659 100644
---
a/ambari-server/src/main/java/org/apache/ambari/se
ambari git commit: AMBARI-20334 - Yarn Queue manager capacity field allows entering invalid values. (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk d5e444fbb -> 346df9260
AMBARI-20334 - Yarn Queue manager capacity field allows entering invalid
values. (Anita Jebaraj via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/346df926
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/346df926
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/346df926
Branch: refs/heads/trunk
Commit: 346df9260b61bf7e2528289767693211fa4a8f92
Parents: d5e444f
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Apr 20 12:28:30 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Apr 20 12:28:30 2017 -0700
--
.../src/main/resources/ui/app/components/capacityInput.js | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/346df926/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
index b6c419a..0646b79 100644
---
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
+++
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
@@ -257,6 +257,8 @@ App.DecimalCapacityInputComponent = Ember.TextField.extend({
} else {
this.set('value', (parseFloat(val) > maxVal)? parseFloat(maxVal) :
parseFloat(val));
}
+} else {
+ this.set('value', (!Em.isBlank(this.get('value')) &&
!isNaN(parseFloat(this.get('value' ? parseFloat(val) : null);
}
}.observes('value').on('change')
});
ambari git commit: AMBARI-20650: Remove Server attribute from the HTTP response headers (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk cfde36c07 -> f894e486a
AMBARI-20650: Remove Server attribute from the HTTP response headers (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f894e486
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f894e486
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f894e486
Branch: refs/heads/trunk
Commit: f894e486a6f8eab31aec5add517a35ec9a11b655
Parents: cfde36c
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Apr 13 15:08:47 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Apr 13 15:08:47 2017 -0700
--
.../main/java/org/apache/ambari/server/controller/AmbariServer.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f894e486/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 4e7af0c..f80d2dc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -310,6 +310,7 @@ public class AmbariServer {
initDB();
server = new Server();
server.setSessionIdManager(sessionIdManager);
+server.setSendServerVersion(false);
Server serverForAgent = new Server();
setSystemProperties(configs);
ambari git commit: AMBARI-20650: Remove Server attribute from the HTTP response headers (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 842ae81c6 -> 6cf930b11
AMBARI-20650: Remove Server attribute from the HTTP response headers (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6cf930b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6cf930b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6cf930b1
Branch: refs/heads/branch-2.5
Commit: 6cf930b111ffdf14428f4d2480a2ec2387e3e347
Parents: 842ae81
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Apr 13 12:20:26 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Apr 13 12:20:26 2017 -0700
--
.../main/java/org/apache/ambari/server/controller/AmbariServer.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6cf930b1/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 7874365..e266dd5 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -305,6 +305,7 @@ public class AmbariServer {
initDB();
server = new Server();
server.setSessionIdManager(sessionIdManager);
+server.setSendServerVersion(false);
Server serverForAgent = new Server();
setSystemProperties(configs);
ambari git commit: AMBARI-20352: WFM: Page numbers on workflow dashboard are not calculated correctly (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 566db4afd -> 55e2af586
AMBARI-20352: WFM: Page numbers on workflow dashboard are not calculated
correctly (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55e2af58
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55e2af58
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55e2af58
Branch: refs/heads/trunk
Commit: 55e2af58678dd83162a1d63a6d22211ae48f2356
Parents: 566db4a
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Fri Mar 17 17:17:58 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Fri Mar 17 17:17:58 2017 -0700
--
.../wfmanager/src/main/resources/ui/app/components/search-table.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/55e2af58/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
index 5f92d6f..01eb4ea 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
@@ -25,7 +25,7 @@ export default Ember.Component.extend({
if(Ember.isBlank(this.get('jobs.start'))){
return 1;
}
-var roundedStart = this.get('jobs.start') - this.get('jobs.start') % 10;
+var roundedStart = this.get('jobs.start') - this.get('jobs.start') %
this.get('jobs.pageSize');
return (roundedStart / this.get('jobs.pageSize'))+1;
}),
userName : Ember.computed.alias('userInfo.userName'),
ambari git commit: AMBARI-20352: WFM: Page numbers on workflow dashboard are not calculated correctly (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 0fedb802e -> e246780f9
AMBARI-20352: WFM: Page numbers on workflow dashboard are not calculated
correctly (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e246780f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e246780f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e246780f
Branch: refs/heads/branch-2.5
Commit: e246780f97fce494ae6e6aa6568f9bf6c7736d75
Parents: 0fedb80
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Fri Mar 17 15:56:34 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Fri Mar 17 15:56:34 2017 -0700
--
.../wfmanager/src/main/resources/ui/app/components/search-table.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e246780f/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
index 5f92d6f..01eb4ea 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/components/search-table.js
@@ -25,7 +25,7 @@ export default Ember.Component.extend({
if(Ember.isBlank(this.get('jobs.start'))){
return 1;
}
-var roundedStart = this.get('jobs.start') - this.get('jobs.start') % 10;
+var roundedStart = this.get('jobs.start') - this.get('jobs.start') %
this.get('jobs.pageSize');
return (roundedStart / this.get('jobs.pageSize'))+1;
}),
userName : Ember.computed.alias('userInfo.userName'),
ambari git commit: AMBARI-20402: Assign Slaves and Clients page displays incorrect configuration unless a change is made in Assign Masters page (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 63ab0ab91 -> 55dc8ac92
AMBARI-20402: Assign Slaves and Clients page displays incorrect configuration
unless a change is made in Assign Masters page (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55dc8ac9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55dc8ac9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55dc8ac9
Branch: refs/heads/trunk
Commit: 55dc8ac9224366c0fd08d03da42176652a146ce0
Parents: 63ab0ab
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Mar 15 16:50:11 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Mar 15 16:50:11 2017 -0700
--
.../app/mixins/wizard/assign_master_components.js| 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dc8ac9/ambari-web/app/mixins/wizard/assign_master_components.js
--
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js
b/ambari-web/app/mixins/wizard/assign_master_components.js
index 91a740c..9813da1 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -256,6 +256,12 @@ App.AssignMasterComponents =
Em.Mixin.create(App.HostComponentValidationMixin, A
isLoaded: false,
/**
+ * Is back from the next step
+ * @type {bool}
+ */
+ backFromNextStep: false,
+
+ /**
* Validation error messages which don't related with any master
*/
generalErrorMessages: [],
@@ -479,6 +485,7 @@ App.AssignMasterComponents =
Em.Mixin.create(App.HostComponentValidationMixin, A
this.setProperties({
hosts: [],
isLoaded: false,
+ backFromNextStep: false,
selectedServicesMasters: [],
servicesMasters: []
});
@@ -498,6 +505,11 @@ App.AssignMasterComponents =
Em.Mixin.create(App.HostComponentValidationMixin, A
this._additionalClearSteps();
}
this.renderHostInfo();
+//when returning from step Assign Slaves and Clients, recommendations are
already available
+//set the flag so that recommendations AJAX call is not made unnecessarily
+if (this.get('recommendations')) {
+ this.set('backFromNextStep',true);
+}
this.getRecommendedHosts({
hosts: this.get('hosts').mapProperty('host_name')
}).then(function() {
@@ -613,7 +625,8 @@ App.AssignMasterComponents =
Em.Mixin.create(App.HostComponentValidationMixin, A
loadComponentsRecommendationsFromServer: function(recommendationBlueprint) {
var self = this;
-if (this.get('recommendations')) {
+//when returning from step Assign Slaves and Clients, backFromNextStep
will be true
+if (this.get('recommendations') && this.get('backFromNextStep')) {
// Don't do AJAX call if recommendations has been already received
// But if user returns to previous step (selecting services), stored
recommendations will be cleared in routers' next handler and AJAX call will be
made again
return $.Deferred().resolve().promise();
ambari git commit: AMBARI-20333 - Value for User Limit Factor should be float instead of integer in YARN Queue Manager. (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk f6e88e087 -> df4c44a04
AMBARI-20333 - Value for User Limit Factor should be float instead of integer
in YARN Queue Manager. (Anita Jebaraj via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df4c44a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df4c44a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df4c44a0
Branch: refs/heads/trunk
Commit: df4c44a04dece13565927f34e14766876826accf
Parents: f6e88e0
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Mar 15 15:36:51 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Mar 15 15:36:51 2017 -0700
--
.../ui/app/components/capacityInput.js | 62
.../main/resources/ui/app/templates/queue.hbs | 2 +-
2 files changed, 63 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/df4c44a0/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
index 8eb06c2..b6c419a 100644
---
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
+++
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/capacityInput.js
@@ -65,6 +65,68 @@ App.IntInputComponent = Ember.TextField.extend({
}.observes('value')
});
+App.DecimalInputComponent = Ember.TextField.extend({
+ classNames:['form-control'],
+
+ initVal: function() {
+this.set('value', (!Em.isBlank(this.get('value')) &&
!isNaN(parseFloat(this.get('value' ? parseFloat(this.get('value')): null);
+ }.on('init'),
+
+ keyDown: function(evt) {
+var newChar, val = this.get('value') || 0;
+val = val.toString();
+if ((evt.keyCode > 64 && evt.keyCode < 91) ||
+ (evt.keyCode > 185 && evt.keyCode < 190) ||
+ (evt.keyCode > 190 && evt.keyCode < 193) ||
+ (evt.keyCode > 218 && evt.keyCode < 223)) {
+ return false;
+}
+if (evt.keyCode === 190 || evt.keyCode === 9) {
+ return true;
+}
+if (evt.keyCode > 95 && evt.keyCode < 106) {
+ newChar = (evt.keyCode - 96).toString();
+} else {
+ newChar = String.fromCharCode(evt.keyCode);
+}
+if (newChar.match(/[0-9]/)) {
+ val = val.substring(0, evt.target.selectionStart) + newChar +
val.substring(evt.target.selectionEnd);
+}
+if (/^\d+\.\d{3}$/.test(val)) {
+ return false;
+}
+return parseFloat(val);
+ },
+
+ debounceId: null,
+
+ cancelDebounceCallback: function() {
+Ember.run.cancel(this.get('debounceId'));
+this.set('debounceId', null);
+ },
+
+ initDebounceCallback: function(val) {
+var debounce = Ember.run.debounce(this, function() {
+ this.set('value', parseFloat(val));
+}, 8000);
+this.set('debounceId', debounce);
+ },
+
+ valueDidChange: function() {
+var val = this.get('value');
+this.cancelDebounceCallback();
+if (/^\d+(\.(\d{1,2})?)?$/.test(val)) {
+ if (/^\d+\.[0]$/.test(val) || /^\d+\.$/.test(val)) {
+this.initDebounceCallback(val);
+ } else {
+this.set('value', parseFloat(val));
+ }
+}
+else
+ this.set('value', (!Em.isBlank(this.get('value')) &&
!isNaN(parseFloat(this.get('value' ? parseFloat(val) : null);
+ }.observes('value').on('change')
+});
+
App.CapacityInputComponent = App.IntInputComponent.extend({
totalCapacity:null,
http://git-wip-us.apache.org/repos/asf/ambari/blob/df4c44a0/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs
index 69f5b3b..dcfb84f 100644
---
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs
+++
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/queue.hbs
@@ -265,7 +265,7 @@
}}
{{#if isOperator}}
- {{int-input value=content.user_limit_factor maxlength=10
class="input-sm input-int" defaultVal=1 placeholder=1}}
+ {{decimal-input value=content.user_limit_factor maxlength=10
class="input-sm input-int" defaultVal=1 placeholder=1}}
{{#if queueDirtyFilelds.user_limit_factor}}
ambari git commit: AMBARI-20363 - After clearing the content of Users in Yarn Queue Manager, it still shows the user in effective administrators (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk dca46a9a5 -> f6e88e087
AMBARI-20363 - After clearing the content of Users in Yarn Queue Manager, it
still shows the user in effective administrators (Anita Jebaraj via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f6e88e08
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6e88e08
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6e88e08
Branch: refs/heads/trunk
Commit: f6e88e0871d429b5e5b8530d545578ee96025a99
Parents: dca46a9
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Mar 15 13:58:24 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Mar 15 13:58:24 2017 -0700
--
.../src/main/resources/ui/app/components/userGroupInput.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f6e88e08/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/userGroupInput.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/userGroupInput.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/userGroupInput.js
index 513031c..17dd05b 100644
---
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/userGroupInput.js
+++
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/components/userGroupInput.js
@@ -24,7 +24,7 @@ App.UserGroupInputComponent = Em.Component.extend({
ug:'',
users:function (key, value, previousValue) {
-if (value) {
+if (value || value === "") {
this.set('ug',[value,this.get('groups')].join(' '));
}
var ug = this.get('ug');
@@ -32,7 +32,7 @@ App.UserGroupInputComponent = Em.Component.extend({
}.property('ug'),
groups:function (key, value, previousValue) {
-if (value) {
+if (value || value === "") {
this.set('ug',[this.get('users'),value].join(' '));
}
var ug = this.get('ug');
ambari git commit: AMBARI-20402: Assign Slaves and Clients page displays incorrect configuration unless a change is made in Assign Masters page (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 f6d1816a5 -> 819d4f253
AMBARI-20402: Assign Slaves and Clients page displays incorrect configuration
unless a change is made in Assign Masters page (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/819d4f25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/819d4f25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/819d4f25
Branch: refs/heads/branch-2.5
Commit: 819d4f25339476622ffe73dd64acb85e24b52969
Parents: f6d1816
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Mar 13 11:56:04 2017 -0700
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Mar 13 11:56:04 2017 -0700
--
.../app/mixins/wizard/assign_master_components.js| 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/819d4f25/ambari-web/app/mixins/wizard/assign_master_components.js
--
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js
b/ambari-web/app/mixins/wizard/assign_master_components.js
index 60c6eeb..cd0f877 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -269,6 +269,12 @@ App.AssignMasterComponents = Em.Mixin.create({
isInitialLayout: true,
/**
+ * Is back from the next step
+ * @type {bool}
+ */
+ backFromNextStep: false,
+
+ /**
* true if any error exists
*/
anyError: function() {
@@ -513,6 +519,7 @@ App.AssignMasterComponents = Em.Mixin.create({
this.setProperties({
hosts: [],
isLoaded: false,
+ backFromNextStep: false,
selectedServicesMasters: [],
servicesMasters: []
});
@@ -532,6 +539,11 @@ App.AssignMasterComponents = Em.Mixin.create({
this._additionalClearSteps();
}
this.renderHostInfo();
+//when returning from step Assign Slaves and Clients, recommendations are
already available
+//set the flag so that recommendations AJAX call is not made unnecessarily
+if (this.get('recommendations')) {
+ this.set('backFromNextStep',true);
+}
this.loadComponentsRecommendationsFromServer(this.loadStepCallback);
},
@@ -643,7 +655,8 @@ App.AssignMasterComponents = Em.Mixin.create({
loadComponentsRecommendationsFromServer: function(callback, includeMasters) {
var self = this;
-if (this.get('recommendations')) {
+//when returning from step Assign Slaves and Clients, backFromNextStep
will be true
+if (this.get('recommendations') && this.get('backFromNextStep')) {
// Don't do AJAX call if recommendations has been already received
// But if user returns to previous step (selecting services), stored
recommendations will be cleared in routers' next handler and AJAX call will be
made again
callback(self.createComponentInstallationObjects(), self);
ambari git commit: AMBARI-19763: Workflow Manager View : Separate log file into its own directory similar to other views (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk a8b8b4155 -> cc42c95db
AMBARI-19763: Workflow Manager View : Separate log file into its own directory
similar to other views (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc42c95d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc42c95d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc42c95d
Branch: refs/heads/trunk
Commit: cc42c95db84ecb115393a0dec5390245f377d7d6
Parents: a8b8b41
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue Jan 31 15:33:07 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue Jan 31 15:33:07 2017 -0800
--
contrib/views/wfmanager/pom.xml | 1 +
.../src/main/resources/view.log4j.properties| 29
2 files changed, 30 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc42c95d/contrib/views/wfmanager/pom.xml
--
diff --git a/contrib/views/wfmanager/pom.xml b/contrib/views/wfmanager/pom.xml
index fff793c..2585e13 100644
--- a/contrib/views/wfmanager/pom.xml
+++ b/contrib/views/wfmanager/pom.xml
@@ -276,6 +276,7 @@
META-INF/**/*
view.xml
+ view.log4j.properties
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc42c95d/contrib/views/wfmanager/src/main/resources/view.log4j.properties
--
diff --git a/contrib/views/wfmanager/src/main/resources/view.log4j.properties
b/contrib/views/wfmanager/src/main/resources/view.log4j.properties
new file mode 100644
index 000..83612a1
--- /dev/null
+++ b/contrib/views/wfmanager/src/main/resources/view.log4j.properties
@@ -0,0 +1,29 @@
+# Copyright 2011 The Apache Software Foundation
+#
+# 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.
+
+log4j.appender.wfmanagerview=org.apache.log4j.RollingFileAppender
+log4j.appender.wfmanagerview.File=${ambari.log.dir}/wfmanager-view/wfmanager-view.log
+log4j.appender.wfmanagerview.MaxFileSize=80MB
+log4j.appender.wfmanagerview.MaxBackupIndex=60
+log4j.appender.wfmanagerview.layout=org.apache.log4j.PatternLayout
+log4j.appender.wfmanagerview.layout.ConversionPattern=%d{DATE} %5p [%t]
[%X{viewName} %X{viewVersion} %X{viewInstanceName}] %c{1}:%L - %m%n
+
+log4j.logger.org.apache.oozie.ambari.view=INFO,wfmanagerview
+log4j.logger.org.apache.ambari.view.workflowmanager=INFO,wfmanagerview
+log4j.additivity.org.apache.ambari.view.workflowmanager= false
+log4j.additivity.org.apache.oozie.ambari.view= false
\ No newline at end of file
ambari git commit: AMBARI-19763: Workflow Manager View : Separate log file into its own directory similar to other views (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 7ee253841 -> 3bb3fdff7
AMBARI-19763: Workflow Manager View : Separate log file into its own directory
similar to other views (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3bb3fdff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3bb3fdff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3bb3fdff
Branch: refs/heads/branch-2.5
Commit: 3bb3fdff77c083c5f2dec8b76c7356c717eb2b7b
Parents: 7ee2538
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue Jan 31 15:24:04 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue Jan 31 15:24:04 2017 -0800
--
contrib/views/wfmanager/pom.xml | 1 +
.../src/main/resources/view.log4j.properties| 29
2 files changed, 30 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3bb3fdff/contrib/views/wfmanager/pom.xml
--
diff --git a/contrib/views/wfmanager/pom.xml b/contrib/views/wfmanager/pom.xml
index 8016d7b..06fbfeb 100644
--- a/contrib/views/wfmanager/pom.xml
+++ b/contrib/views/wfmanager/pom.xml
@@ -294,6 +294,7 @@
META-INF/**/*
view.xml
+ view.log4j.properties
http://git-wip-us.apache.org/repos/asf/ambari/blob/3bb3fdff/contrib/views/wfmanager/src/main/resources/view.log4j.properties
--
diff --git a/contrib/views/wfmanager/src/main/resources/view.log4j.properties
b/contrib/views/wfmanager/src/main/resources/view.log4j.properties
new file mode 100644
index 000..f784cb4
--- /dev/null
+++ b/contrib/views/wfmanager/src/main/resources/view.log4j.properties
@@ -0,0 +1,29 @@
+# Copyright 2011 The Apache Software Foundation
+#
+# 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.
+
+log4j.appender.wfmanagerview=org.apache.log4j.RollingFileAppender
+log4j.appender.wfmanagerview.File=${ambari.log.dir}/wfmanager-view/wfmanager-view.log
+log4j.appender.wfmanagerview.MaxFileSize=80MB
+log4j.appender.wfmanagerview.MaxBackupIndex=60
+log4j.appender.wfmanagerview.layout=org.apache.log4j.PatternLayout
+log4j.appender.wfmanagerview.layout.ConversionPattern=%d{DATE} %5p [%t]
[%X{viewName} %X{viewVersion} %X{viewInstanceName}] %c{1}:%L - %m%n
+
+log4j.logger.org.apache.oozie.ambari.view=INFO,wfmanagerview
+log4j.logger.org.apache.ambari.view.workflowmanager=INFO,wfmanagerview
+log4j.additivity.org.apache.oozie.ambari.view= false
+log4j.additivity.org.apache.ambari.view.workflowmanager= false
ambari git commit: AMBARI-19680: On Capacity Scheduler view, click * button for Node label Access the 2nd time should de-select all node labels, but it doesn't. (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 50403914c -> c2907860e
AMBARI-19680: On Capacity Scheduler view, click * button for Node label Access
the 2nd time should de-select all node labels, but it doesn't. (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2907860
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2907860
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2907860
Branch: refs/heads/trunk
Commit: c2907860e4fea65d272a680509ce656ac6e1f4f0
Parents: 5040391
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Sat Jan 28 00:23:56 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Sat Jan 28 00:23:56 2017 -0800
--
.../capacity-scheduler/src/main/resources/ui/app/models/queue.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2907860/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
index df0c684..9198aa5 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
@@ -106,6 +106,9 @@ App.Queue = DS.Model.extend({
}.bind(this));
this.notifyPropertyChange('labels');
}
+ else {
+this.get('labels').clear();
+ }
}
return this.get('_accessAllLabels');
ambari git commit: AMBARI-19680: On Capacity Scheduler view, click * button for Node label Access the 2nd time should de-select all node labels, but it doesn't. (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 e273668b7 -> 72438dc6b
AMBARI-19680: On Capacity Scheduler view, click * button for Node label Access
the 2nd time should de-select all node labels, but it doesn't. (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72438dc6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72438dc6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72438dc6
Branch: refs/heads/branch-2.5
Commit: 72438dc6b3a1adead373e761294a192a8b64398c
Parents: e273668
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Sat Jan 28 00:11:46 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Sat Jan 28 00:11:46 2017 -0800
--
.../capacity-scheduler/src/main/resources/ui/app/models/queue.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/72438dc6/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
index df0c684..9198aa5 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
@@ -106,6 +106,9 @@ App.Queue = DS.Model.extend({
}.bind(this));
this.notifyPropertyChange('labels');
}
+ else {
+this.get('labels').clear();
+ }
}
return this.get('_accessAllLabels');
ambari git commit: AMBARI-19729: Workflow Manager: Path does not get set to selected directory when creating FS action node. (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk e8dc698dc -> 828e24f06
AMBARI-19729: Workflow Manager: Path does not get set to selected directory
when creating FS action node. (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/828e24f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/828e24f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/828e24f0
Branch: refs/heads/trunk
Commit: 828e24f063820b6366651410071701067338bc7d
Parents: e8dc698
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Jan 26 13:40:53 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Jan 26 13:40:53 2017 -0800
--
.../src/main/resources/ui/app/components/prepare-config-fs.js| 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/828e24f0/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
index ba9b91e..15592a4 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
@@ -32,9 +32,7 @@ export default Ember.Component.extend({
var filePathModel = this.get('filePathModel');
if(filePathModel && filePathModel.hasOwnProperty("index") &&
filePathModel.hasOwnProperty("property")){
var fileOperation = this.get('fsOps').objectAt(filePathModel.index);
-var settings = fileOperation.settings;
-Ember.set(settings, filePathModel.property, fileName);
-Ember.set(fileOperation, "settings", settings);
+Ember.set(fileOperation, filePathModel.property, fileName);
}else{
this.set(this.get('filePathModel'), fileName);
}
ambari git commit: AMBARI-19729: Workflow Manager: Path does not get set to selected directory when creating FS action node. (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 7dae895f2 -> 613876528
AMBARI-19729: Workflow Manager: Path does not get set to selected directory
when creating FS action node. (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61387652
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61387652
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61387652
Branch: refs/heads/branch-2.5
Commit: 613876528bdc315bfc563ea7344910d54302bd44
Parents: 7dae895
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Jan 26 13:20:11 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Jan 26 13:20:11 2017 -0800
--
.../src/main/resources/ui/app/components/prepare-config-fs.js| 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/61387652/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
index ba9b91e..15592a4 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/components/prepare-config-fs.js
@@ -32,9 +32,7 @@ export default Ember.Component.extend({
var filePathModel = this.get('filePathModel');
if(filePathModel && filePathModel.hasOwnProperty("index") &&
filePathModel.hasOwnProperty("property")){
var fileOperation = this.get('fsOps').objectAt(filePathModel.index);
-var settings = fileOperation.settings;
-Ember.set(settings, filePathModel.property, fileName);
-Ember.set(fileOperation, "settings", settings);
+Ember.set(fileOperation, filePathModel.property, fileName);
}else{
this.set(this.get('filePathModel'), fileName);
}
ambari git commit: AMBARI-19542: Cannot change group/user privileges in list view if the user has VIEW.USER privilege (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 6a8115572 -> 5ddbb58ec
AMBARI-19542: Cannot change group/user privileges in list view if the user has
VIEW.USER privilege (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ddbb58e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ddbb58e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ddbb58e
Branch: refs/heads/trunk
Commit: 5ddbb58ec44795314d3a0e539daf11ace87ae6f9
Parents: 6a81155
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Jan 25 10:37:21 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Jan 25 10:37:21 2017 -0800
--
.../controllers/clusters/UserAccessListCtrl.js | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ddbb58e/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
index 9869d0b..3737414 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
@@ -148,10 +148,12 @@ function($scope, $location, Cluster, $modal, $rootScope,
$routeParams, Permissio
var privilegesOfTypeUser = [];
var privilegesOfTypeGroup = [];
for (var i = 0; i < arrayOfPrivileges.length; i++) {
- if(arrayOfPrivileges[i].PrivilegeInfo.principal_type === "GROUP"){
-privilegesOfTypeGroup.push(arrayOfPrivileges[i]);
- } else {
-privilegesOfTypeUser.push(arrayOfPrivileges[i].PrivilegeInfo);
+ if(arrayOfPrivileges[i].PrivilegeInfo.permission_name !=
"VIEW.USER") {
+if(arrayOfPrivileges[i].PrivilegeInfo.principal_type === "GROUP"){
+ privilegesOfTypeGroup.push(arrayOfPrivileges[i]);
+} else {
+ privilegesOfTypeUser.push(arrayOfPrivileges[i].PrivilegeInfo);
+}
}
}
@@ -204,8 +206,10 @@ function($scope, $location, Cluster, $modal, $rootScope,
$routeParams, Permissio
user.editable =
(Cluster.ineditableRoles.indexOf(privilege.permission_name) === -1);
arrayOfPrivileges.forEach(function(privilegeOfTypeGroup) {
- if (privilegeOfTypeGroup.PrivilegeInfo.principal_type === "GROUP") {
-privilegesOfTypeGroup.push(privilegeOfTypeGroup.PrivilegeInfo);
+ if(privilegeOfTypeGroup.PrivilegeInfo.permission_name !=
"VIEW.USER") {
+if (privilegeOfTypeGroup.PrivilegeInfo.principal_type === "GROUP")
{
+ privilegesOfTypeGroup.push(privilegeOfTypeGroup.PrivilegeInfo);
+}
}
});
ambari git commit: AMBARI-19542: Cannot change group/user privileges in list view if the user has VIEW.USER privilege (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 b84a32b37 -> 8a4439e55
AMBARI-19542: Cannot change group/user privileges in list view if the user has
VIEW.USER privilege (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a4439e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a4439e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a4439e5
Branch: refs/heads/branch-2.5
Commit: 8a4439e55453a86ec6f256499ca4bf398100efbd
Parents: b84a32b
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Jan 25 10:22:51 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Jan 25 10:23:09 2017 -0800
--
.../controllers/clusters/UserAccessListCtrl.js | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a4439e5/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
index 9869d0b..3737414 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
@@ -148,10 +148,12 @@ function($scope, $location, Cluster, $modal, $rootScope,
$routeParams, Permissio
var privilegesOfTypeUser = [];
var privilegesOfTypeGroup = [];
for (var i = 0; i < arrayOfPrivileges.length; i++) {
- if(arrayOfPrivileges[i].PrivilegeInfo.principal_type === "GROUP"){
-privilegesOfTypeGroup.push(arrayOfPrivileges[i]);
- } else {
-privilegesOfTypeUser.push(arrayOfPrivileges[i].PrivilegeInfo);
+ if(arrayOfPrivileges[i].PrivilegeInfo.permission_name !=
"VIEW.USER") {
+if(arrayOfPrivileges[i].PrivilegeInfo.principal_type === "GROUP"){
+ privilegesOfTypeGroup.push(arrayOfPrivileges[i]);
+} else {
+ privilegesOfTypeUser.push(arrayOfPrivileges[i].PrivilegeInfo);
+}
}
}
@@ -204,8 +206,10 @@ function($scope, $location, Cluster, $modal, $rootScope,
$routeParams, Permissio
user.editable =
(Cluster.ineditableRoles.indexOf(privilege.permission_name) === -1);
arrayOfPrivileges.forEach(function(privilegeOfTypeGroup) {
- if (privilegeOfTypeGroup.PrivilegeInfo.principal_type === "GROUP") {
-privilegesOfTypeGroup.push(privilegeOfTypeGroup.PrivilegeInfo);
+ if(privilegeOfTypeGroup.PrivilegeInfo.permission_name !=
"VIEW.USER") {
+if (privilegeOfTypeGroup.PrivilegeInfo.principal_type === "GROUP")
{
+ privilegesOfTypeGroup.push(privilegeOfTypeGroup.PrivilegeInfo);
+}
}
});
ambari git commit: AMBARI-19475: Workflow Manager View: Start record set to 1 even when there are no records (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 2200dda43 -> 4531f7337
AMBARI-19475: Workflow Manager View: Start record set to 1 even when there are
no records (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4531f733
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4531f733
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4531f733
Branch: refs/heads/trunk
Commit: 4531f733742d933b85d9437b68cc2dc7b24befce
Parents: 2200dda
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Jan 19 14:55:53 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Jan 19 14:55:53 2017 -0800
--
.../src/main/resources/ui/app/routes/design/dashboardtab.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4531f733/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
b/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
index 78bc1c9..95d06fc 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
@@ -137,7 +137,7 @@ export default Ember.Route.extend({
res.pageSize = len;
res.totalValue = res.total;
res.page = page;
- res.start = start;
+ res.start = res.total > 0 ? start : 0;
res.end = (start + res.jobs.length - 1);
res.time = new Date().getTime();
this.controllerFor('design.dashboardtab').set('model', res);
ambari git commit: AMBARI-19475: Workflow Manager View: Start record set to 1 even when there are no records (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 99bb98840 -> 4179186a0
AMBARI-19475: Workflow Manager View: Start record set to 1 even when there are
no records (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4179186a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4179186a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4179186a
Branch: refs/heads/branch-2.5
Commit: 4179186a0bdf9694b6c9bd9da75ac13af288fad9
Parents: 99bb988
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Jan 19 14:20:07 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Jan 19 14:20:07 2017 -0800
--
.../src/main/resources/ui/app/routes/design/dashboardtab.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4179186a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
b/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
index 78bc1c9..95d06fc 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/dashboardtab.js
@@ -137,7 +137,7 @@ export default Ember.Route.extend({
res.pageSize = len;
res.totalValue = res.total;
res.page = page;
- res.start = start;
+ res.start = res.total > 0 ? start : 0;
res.end = (start + res.jobs.length - 1);
res.time = new Date().getTime();
this.controllerFor('design.dashboardtab').set('model', res);
ambari git commit: AMBARI-19451: When defining yarn.scheduler.capacity..accessible-node-labels with space, Yarn Queue Manager shows error for the queue (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 54db4072e -> e0552d62e
AMBARI-19451: When defining
yarn.scheduler.capacity..accessible-node-labels with space, Yarn
Queue Manager shows error for the queue (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e0552d62
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e0552d62
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e0552d62
Branch: refs/heads/trunk
Commit: e0552d62e8229ee2cbbca216c491e3234b624d4d
Parents: 54db407
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Jan 16 14:12:06 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Jan 16 14:12:06 2017 -0800
--
.../capacity-scheduler/src/main/resources/ui/app/serializers.js| 2 +-
.../main/resources/ui/app/templates/components/queueContainer.hbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e0552d62/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
index de19cc9..940d0f8 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
@@ -113,7 +113,7 @@ App.SerializerMixin = Em.Mixin.create({
q.capacity = (props[base_path + ".capacity"])? +parseFloat(props[base_path
+ ".capacity"]).toFixed(2) : null;
q.maximum_capacity = (props[base_path + ".maximum-capacity"])?
+parseFloat(props[base_path + ".maximum-capacity"]).toFixed(2) : null;
-switch ((props.hasOwnProperty(labelsPath))?props[labelsPath]:'') {
+switch ((props.hasOwnProperty(labelsPath))?props[labelsPath].trim():'') {
case '*':
q.labels = this.get('store.nodeLabels.content').map(function(item) {
return [q.id,item.name].join('.');
http://git-wip-us.apache.org/repos/asf/ambari/blob/e0552d62/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
index 453bbbc..25ac2a1 100644
---
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
+++
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
@@ -68,7 +68,7 @@
{{#if label.store.isRmOffline}}
Unable to obtain information about node label from the
resource manager
{{else}}
-Label is not exist on cluster
+Label does not exist on cluster
{{/if}}
{{else}}
{{label.name}}
ambari git commit: AMBARI-19451: When defining yarn.scheduler.capacity..accessible-node-labels with space, Yarn Queue Manager shows error for the queue (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 43f8f73ee -> f90599ad3
AMBARI-19451: When defining
yarn.scheduler.capacity..accessible-node-labels with space, Yarn
Queue Manager shows error for the queue (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f90599ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f90599ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f90599ad
Branch: refs/heads/branch-2.5
Commit: f90599ad3f43a835bbb8114d339ab8a6af4a7f1f
Parents: 43f8f73
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Jan 16 13:10:41 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Jan 16 13:10:41 2017 -0800
--
.../capacity-scheduler/src/main/resources/ui/app/serializers.js| 2 +-
.../main/resources/ui/app/templates/components/queueContainer.hbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f90599ad/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
index de19cc9..940d0f8 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/serializers.js
@@ -113,7 +113,7 @@ App.SerializerMixin = Em.Mixin.create({
q.capacity = (props[base_path + ".capacity"])? +parseFloat(props[base_path
+ ".capacity"]).toFixed(2) : null;
q.maximum_capacity = (props[base_path + ".maximum-capacity"])?
+parseFloat(props[base_path + ".maximum-capacity"]).toFixed(2) : null;
-switch ((props.hasOwnProperty(labelsPath))?props[labelsPath]:'') {
+switch ((props.hasOwnProperty(labelsPath))?props[labelsPath].trim():'') {
case '*':
q.labels = this.get('store.nodeLabels.content').map(function(item) {
return [q.id,item.name].join('.');
http://git-wip-us.apache.org/repos/asf/ambari/blob/f90599ad/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
index 453bbbc..25ac2a1 100644
---
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
+++
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/templates/components/queueContainer.hbs
@@ -68,7 +68,7 @@
{{#if label.store.isRmOffline}}
Unable to obtain information about node label from the
resource manager
{{else}}
-Label is not exist on cluster
+Label does not exist on cluster
{{/if}}
{{else}}
{{label.name}}
ambari git commit: AMBARI-19535: When viewing details of a group, the group type is sometimes empty (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 7301a8031 -> 54db4072e
AMBARI-19535: When viewing details of a group, the group type is sometimes
empty (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54db4072
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54db4072
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54db4072
Branch: refs/heads/trunk
Commit: 54db4072e87e4efc09d68d9b4c53b6f562983d9f
Parents: 7301a80
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Jan 16 12:58:14 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Jan 16 12:58:26 2017 -0800
--
.../admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/54db4072/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
index aa6af2a..c61e71c 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
@@ -68,7 +68,6 @@ angular.module('ambariAdminConsole')
function loadMembers(){
$scope.group.getMembers().then(function(members) {
- $scope.group.groupTypeName =
$t(GroupConstants.TYPES[$scope.group.group_type].LABEL_KEY);
$scope.groupMembers = members;
$scope.group.editingUsers = angular.copy($scope.groupMembers);
});
@@ -76,11 +75,12 @@ angular.module('ambariAdminConsole')
$scope.group.isLDAP().then(function(isLDAP) {
$scope.group.ldap_group = isLDAP;
+$scope.group.getGroupType().then(function() {
+ $scope.group.groupTypeName =
$t(GroupConstants.TYPES[$scope.group.group_type].LABEL_KEY);
+});
loadMembers();
});
- $scope.group.getGroupType();
-
$scope.deleteGroup = function(group) {
ConfirmationModal.show(
$t('common.delete', {
ambari git commit: AMBARI-19535: When viewing details of a group, the group type is sometimes empty (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 fa6a4aa81 -> 38e0b578b
AMBARI-19535: When viewing details of a group, the group type is sometimes
empty (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/38e0b578
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/38e0b578
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/38e0b578
Branch: refs/heads/branch-2.5
Commit: 38e0b578b59aa662c6a41f67948aa25bc9679934
Parents: fa6a4aa
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Jan 16 10:20:10 2017 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Jan 16 10:20:10 2017 -0800
--
.../admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/38e0b578/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
index aa6af2a..c61e71c 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
@@ -68,7 +68,6 @@ angular.module('ambariAdminConsole')
function loadMembers(){
$scope.group.getMembers().then(function(members) {
- $scope.group.groupTypeName =
$t(GroupConstants.TYPES[$scope.group.group_type].LABEL_KEY);
$scope.groupMembers = members;
$scope.group.editingUsers = angular.copy($scope.groupMembers);
});
@@ -76,11 +75,12 @@ angular.module('ambariAdminConsole')
$scope.group.isLDAP().then(function(isLDAP) {
$scope.group.ldap_group = isLDAP;
+$scope.group.getGroupType().then(function() {
+ $scope.group.groupTypeName =
$t(GroupConstants.TYPES[$scope.group.group_type].LABEL_KEY);
+});
loadMembers();
});
- $scope.group.getGroupType();
-
$scope.deleteGroup = function(group) {
ConfirmationModal.show(
$t('common.delete', {
ambari git commit: AMBARI-19206: When Namenode HA is enabled, hbase.rootdir property for ambari-metrics (distributed) does not get updated (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 69e973c41 -> 540f4ee9a
AMBARI-19206: When Namenode HA is enabled, hbase.rootdir property for
ambari-metrics (distributed) does not get updated (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/540f4ee9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/540f4ee9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/540f4ee9
Branch: refs/heads/trunk
Commit: 540f4ee9ac15d1d1794e8a57db043114dd441dc5
Parents: 69e973c
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Dec 28 11:51:06 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Dec 28 11:51:06 2016 -0800
--
.../nameNode/rollback_controller.js | 1 +
.../nameNode/step9_controller.js | 19 ++-
ambari-web/app/messages.js | 11 ++-
.../nameNode/step3_controller_test.js| 4 ++--
4 files changed, 27 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/540f4ee9/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
index fc44724..262a3e6 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
@@ -75,6 +75,7 @@ App.HighAvailabilityRollbackController =
App.HighAvailabilityProgressPageControl
'deleteSNameNode',
'startAllServices',
'reconfigureHBase',
+ 'reconfigureAMS',
'reconfigureAccumulo',
'reconfigureHawq',
'installPXF',
http://git-wip-us.apache.org/repos/asf/ambari/blob/540f4ee9/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
index 713e1c3..b98c2df 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
@@ -22,7 +22,7 @@ App.HighAvailabilityWizardStep9Controller =
App.HighAvailabilityProgressPageCont
name:"highAvailabilityWizardStep9Controller",
- commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'installPXF',
'reconfigureRanger', 'reconfigureHBase', 'reconfigureAccumulo',
'reconfigureHawq', 'deleteSNameNode', 'stopHDFS', 'startAllServices'],
+ commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'installPXF',
'reconfigureRanger', 'reconfigureHBase', 'reconfigureAMS',
'reconfigureAccumulo', 'reconfigureHawq', 'deleteSNameNode', 'stopHDFS',
'startAllServices'],
hbaseSiteTag: "",
accumuloSiteTag: "",
@@ -45,6 +45,9 @@ App.HighAvailabilityWizardStep9Controller =
App.HighAvailabilityProgressPageCont
if (!App.Service.find().someProperty('serviceName', 'HBASE')) {
tasksToRemove.push('reconfigureHBase');
}
+if (!App.Service.find().someProperty('serviceName', 'AMBARI_METRICS')) {
+ tasksToRemove.push('reconfigureAMS');
+}
if (!App.Service.find().someProperty('serviceName', 'ACCUMULO')) {
tasksToRemove.push('reconfigureAccumulo');
}
@@ -261,6 +264,20 @@ App.HighAvailabilityWizardStep9Controller =
App.HighAvailabilityProgressPageCont
});
},
+ reconfigureAMS: function () {
+var data = this.get('content.serviceConfigProperties');
+var configData = this.reconfigureSites(['ams-hbase-site'], data,
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
false)));
+App.ajax.send({
+ name: 'common.service.configurations',
+ sender: this,
+ data: {
+desired_config: configData
+ },
+ success: 'saveConfigTag',
+ error: 'onTaskError'
+});
+ },
+
reconfigureAccumulo: function () {
var data = this.get('content.serviceConfigProperties');
var configData = this.reconfigureSites(['accumulo-site'], data,
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
false)));
http://git-wip-us.apache.org/repos/asf/ambari/blob/540f4ee9/ambari-web/app/messages.js
--
diff --git
ambari git commit: AMBARI-19206: When Namenode HA is enabled, hbase.rootdir property for ambari-metrics (distributed) does not get updated (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 a76c5c8b2 -> eae2a4c5e
AMBARI-19206: When Namenode HA is enabled, hbase.rootdir property for
ambari-metrics (distributed) does not get updated (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eae2a4c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eae2a4c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eae2a4c5
Branch: refs/heads/branch-2.5
Commit: eae2a4c5e4b4b5dc279d9553d025fb00eb337849
Parents: a76c5c8
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Dec 28 11:25:14 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Dec 28 11:25:14 2016 -0800
--
.../nameNode/rollback_controller.js | 1 +
.../nameNode/step9_controller.js | 19 ++-
ambari-web/app/messages.js | 11 ++-
.../nameNode/step3_controller_test.js| 4 ++--
4 files changed, 27 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
index fc44724..262a3e6 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
@@ -75,6 +75,7 @@ App.HighAvailabilityRollbackController =
App.HighAvailabilityProgressPageControl
'deleteSNameNode',
'startAllServices',
'reconfigureHBase',
+ 'reconfigureAMS',
'reconfigureAccumulo',
'reconfigureHawq',
'installPXF',
http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
index 713e1c3..b98c2df 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
@@ -22,7 +22,7 @@ App.HighAvailabilityWizardStep9Controller =
App.HighAvailabilityProgressPageCont
name:"highAvailabilityWizardStep9Controller",
- commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'installPXF',
'reconfigureRanger', 'reconfigureHBase', 'reconfigureAccumulo',
'reconfigureHawq', 'deleteSNameNode', 'stopHDFS', 'startAllServices'],
+ commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'installPXF',
'reconfigureRanger', 'reconfigureHBase', 'reconfigureAMS',
'reconfigureAccumulo', 'reconfigureHawq', 'deleteSNameNode', 'stopHDFS',
'startAllServices'],
hbaseSiteTag: "",
accumuloSiteTag: "",
@@ -45,6 +45,9 @@ App.HighAvailabilityWizardStep9Controller =
App.HighAvailabilityProgressPageCont
if (!App.Service.find().someProperty('serviceName', 'HBASE')) {
tasksToRemove.push('reconfigureHBase');
}
+if (!App.Service.find().someProperty('serviceName', 'AMBARI_METRICS')) {
+ tasksToRemove.push('reconfigureAMS');
+}
if (!App.Service.find().someProperty('serviceName', 'ACCUMULO')) {
tasksToRemove.push('reconfigureAccumulo');
}
@@ -261,6 +264,20 @@ App.HighAvailabilityWizardStep9Controller =
App.HighAvailabilityProgressPageCont
});
},
+ reconfigureAMS: function () {
+var data = this.get('content.serviceConfigProperties');
+var configData = this.reconfigureSites(['ams-hbase-site'], data,
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
false)));
+App.ajax.send({
+ name: 'common.service.configurations',
+ sender: this,
+ data: {
+desired_config: configData
+ },
+ success: 'saveConfigTag',
+ error: 'onTaskError'
+});
+ },
+
reconfigureAccumulo: function () {
var data = this.get('content.serviceConfigProperties');
var configData = this.reconfigureSites(['accumulo-site'], data,
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
false)));
http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/ambari-web/app/messages.js
--
diff --git
ambari git commit: AMBARI-19218: Exception when running Slider view - java.lang.NoClassDefFoundError: org/apache/hadoop/yarn/api/protocolrecords/GetLabelsToNodesResponse (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 72e9d4a4f -> 8a125c57a
AMBARI-19218: Exception when running Slider view -
java.lang.NoClassDefFoundError:
org/apache/hadoop/yarn/api/protocolrecords/GetLabelsToNodesResponse (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a125c57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a125c57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a125c57
Branch: refs/heads/trunk
Commit: 8a125c57a383c926f4ae9961b8b1ef7941bad6f1
Parents: 72e9d4a
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Dec 19 10:32:42 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Dec 19 10:33:00 2016 -0800
--
contrib/views/slider/pom.xml | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a125c57/contrib/views/slider/pom.xml
--
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index e907ece..21afd3d 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -27,6 +27,12 @@
org.apache.slider
slider-core
${slider.version}
+
+
+ org.apache.hadoop
+ hadoop-yarn-api
+
+
org.apache.slider
ambari git commit: AMBARI-19218: Exception when running Slider view - java.lang.NoClassDefFoundError: org/apache/hadoop/yarn/api/protocolrecords/GetLabelsToNodesResponse (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 435006d4b -> 21934340e
AMBARI-19218: Exception when running Slider view -
java.lang.NoClassDefFoundError:
org/apache/hadoop/yarn/api/protocolrecords/GetLabelsToNodesResponse (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21934340
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21934340
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21934340
Branch: refs/heads/branch-2.5
Commit: 21934340edd7d1fddd895258f0a7c174e0624919
Parents: 435006d
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Mon Dec 19 10:21:49 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Mon Dec 19 10:21:49 2016 -0800
--
contrib/views/slider/pom.xml | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/21934340/contrib/views/slider/pom.xml
--
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index bb1b150..a43ccb9 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -27,6 +27,12 @@
org.apache.slider
slider-core
${slider.version}
+
+
+ org.apache.hadoop
+ hadoop-yarn-api
+
+
org.apache.slider
ambari git commit: AMBARI-18926 - Kerberos Wizard UI creates duplicate radio buttons for FreeIPA (Jesus Alvarez via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 647c6f27e -> da2228fb3
AMBARI-18926 - Kerberos Wizard UI creates duplicate radio buttons for FreeIPA
(Jesus Alvarez via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da2228fb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da2228fb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da2228fb
Branch: refs/heads/trunk
Commit: da2228fb3fe10c485ba374030eef85151cf8565d
Parents: 647c6f2
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Thu Dec 8 15:32:26 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Thu Dec 8 15:32:40 2016 -0800
--
.../app/controllers/main/admin/kerberos/step1_controller.js | 5 +++--
.../controllers/main/admin/kerberos/step1_controller_test.js| 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/da2228fb/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
index 2feeb7f..c0decfc 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js
@@ -138,8 +138,9 @@ App.KerberosWizardStep1Controller = Em.Controller.extend({
if (App.get('supports.enableIpa')) {
var ipaOption = this.get('ipaOption');
var options = this.get('options');
-
- options.pushObject(ipaOption);
+ if (options.indexOf(ipaOption) === -1){
+options.pushObject(ipaOption);
+ }
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/da2228fb/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
index 9280367f..f3f05a4 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
@@ -51,6 +51,9 @@ describe('App.KerberosWizardStep1Controller', function() {
controller.loadStep();
expect(controller.get('selectedItem')).to.be.equal(Em.I18n.t('admin.kerberos.wizard.step1.option.kdc'));
expect(controller.get('options')).to.not.be.empty;
+ controller.loadStep();
+ var options = controller.get('options');
+ expect(options.length == 1).to.be.true;
});
it("enableIpa is false", function() {
ambari git commit: AMBARI-18668: Workflow Designer View: Tooltip for Edit button shows Back (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 c346320e8 -> 9c5d34b00
AMBARI-18668: Workflow Designer View: Tooltip for Edit button shows Back
(sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c5d34b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c5d34b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c5d34b0
Branch: refs/heads/branch-2.5
Commit: 9c5d34b007bd233160133c3f7e38b34d35589ac6
Parents: c346320
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Dec 7 10:54:54 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Dec 7 10:55:06 2016 -0800
--
.../src/main/resources/ui/app/templates/components/job-details.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5d34b0/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
index 0a04d25..f17f89e 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
@@ -52,7 +52,7 @@
Flow Graph
{{#link-to 'design' (query-params appPath=model.appPath)
class="backto-designer" }}
-
+
Edit Workflow
{{/link-to}}
ambari git commit: AMBARI-18668: Workflow Designer View: Tooltip for Edit button shows Back (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 99afb8bf6 -> d56576d78
AMBARI-18668: Workflow Designer View: Tooltip for Edit button shows Back
(sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d56576d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d56576d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d56576d7
Branch: refs/heads/trunk
Commit: d56576d78a3e83f7ee5550e81531d4b13d8fceeb
Parents: 99afb8b
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Dec 7 10:28:27 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Dec 7 10:28:27 2016 -0800
--
.../src/main/resources/ui/app/templates/components/job-details.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d56576d7/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
index 0a04d25..f17f89e 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
@@ -52,7 +52,7 @@
Flow Graph
{{#link-to 'design' (query-params appPath=model.appPath)
class="backto-designer" }}
-
+
Edit Workflow
{{/link-to}}
ambari git commit: AMBARI-18600: Workflow Designer View: When logs are empty, you see the spinner, instead of a message (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 037ed6326 -> 47d2f7074
AMBARI-18600: Workflow Designer View: When logs are empty, you see the spinner,
instead of a message (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47d2f707
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47d2f707
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47d2f707
Branch: refs/heads/branch-2.5
Commit: 47d2f707499275a35269f7335182e5c8715d7f8b
Parents: 037ed63
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Nov 30 13:09:19 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Nov 30 13:09:35 2016 -0800
--
.../wfmanager/src/main/resources/ui/app/components/job-details.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/47d2f707/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
index e403dc4..0e5fd36 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
@@ -349,6 +349,7 @@ export default Ember.Component.extend({
url = url + '=action='+ params.logActionList;
}
Ember.$.get(url,function(response){
+ response = response.trim().length > 0 ? response : "No messages
present";
this.set('model.jobLog', response);
}.bind(this)).fail(function(error){
this.set('error', error);
@@ -356,6 +357,7 @@ export default Ember.Component.extend({
},
getErrorLog : function (){
Ember.$.get(Ember.ENV.API_URL+'/v2/job/'+this.get('id')+'?show=errorlog',function(response){
+ response = response.trim().length > 0 ? response : "No messages
present";
this.set('model.errorLog', response);
}.bind(this)).fail(function(error){
this.set('error', error);
@@ -363,6 +365,7 @@ export default Ember.Component.extend({
},
getAuditLog : function (){
Ember.$.get(Ember.ENV.API_URL+'/v2/job/'+this.get('id')+'?show=auditlog',function(response){
+ response = response.trim().length > 0 ? response : "No messages
present";
this.set('model.auditLog', response);
}.bind(this)).fail(function(error){
this.set('error', error);
ambari git commit: AMBARI-18600: Workflow Designer View: When logs are empty, you see the spinner, instead of a message (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 3a14b4afc -> 0afdf6512
AMBARI-18600: Workflow Designer View: When logs are empty, you see the spinner,
instead of a message (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0afdf651
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0afdf651
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0afdf651
Branch: refs/heads/trunk
Commit: 0afdf6512b914b01417d0fecd2fba334e8dc0195
Parents: 3a14b4a
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Wed Nov 30 11:16:31 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Wed Nov 30 11:16:31 2016 -0800
--
.../wfmanager/src/main/resources/ui/app/components/job-details.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0afdf651/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
--
diff --git
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
index e403dc4..0e5fd36 100644
---
a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
+++
b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js
@@ -349,6 +349,7 @@ export default Ember.Component.extend({
url = url + '=action='+ params.logActionList;
}
Ember.$.get(url,function(response){
+ response = response.trim().length > 0 ? response : "No messages
present";
this.set('model.jobLog', response);
}.bind(this)).fail(function(error){
this.set('error', error);
@@ -356,6 +357,7 @@ export default Ember.Component.extend({
},
getErrorLog : function (){
Ember.$.get(Ember.ENV.API_URL+'/v2/job/'+this.get('id')+'?show=errorlog',function(response){
+ response = response.trim().length > 0 ? response : "No messages
present";
this.set('model.errorLog', response);
}.bind(this)).fail(function(error){
this.set('error', error);
@@ -363,6 +365,7 @@ export default Ember.Component.extend({
},
getAuditLog : function (){
Ember.$.get(Ember.ENV.API_URL+'/v2/job/'+this.get('id')+'?show=auditlog',function(response){
+ response = response.trim().length > 0 ? response : "No messages
present";
this.set('model.auditLog', response);
}.bind(this)).fail(function(error){
this.set('error', error);
ambari git commit: AMBARI-18871 HTTP responses needs to have the character encoding specified in the content type header (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 85c9104ec -> 2cc4c9ed7
AMBARI-18871 HTTP responses needs to have the character encoding specified in
the content type header (Anita Jebaraj via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2cc4c9ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2cc4c9ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2cc4c9ed
Branch: refs/heads/trunk
Commit: 2cc4c9ed7009be2e894fec7d24c3cb4f0dd9f24c
Parents: 85c9104
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue Nov 29 13:57:50 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue Nov 29 13:57:50 2016 -0800
--
ambari-server/conf/unix/ambari.properties | 4 +-
ambari-server/conf/windows/ambari.properties| 2 +
.../server/configuration/Configuration.java | 46
.../security/AbstractSecurityHeaderFilter.java | 14 ++
.../AmbariServerSecurityHeaderFilter.java | 1 +
.../AmbariViewsSecurityHeaderFilter.java| 1 +
.../AbstractSecurityHeaderFilterTest.java | 29
7 files changed, 87 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4c9ed/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties
b/ambari-server/conf/unix/ambari.properties
index 371653f..30a22d1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -116,6 +116,7 @@ http.x-frame-options=DENY
http.x-content-type-options=nosniff
http.cache-control=no-store
http.pragma=no-cache
+http.charset=utf-8
# HTTP Header settings for Ambari Views
views.http.strict-transport-security=max-age=31536000
@@ -124,6 +125,7 @@ views.http.x-frame-options=SAMEORIGIN
views.http.x-content-type-options=nosniff
views.http.cache-control=no-store
views.http.pragma=no-cache
+views.http.charset=utf-8
mpacks.staging.path=$ROOT/var/lib/ambari-server/resources/mpacks
@@ -132,4 +134,4 @@
security.server.disabled.ciphers=TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384|TLS_ECD
server.python.log.name=ambari-server-command.log
# server.pyton.log.level=(INFO/DEBUG)
-server.python.log.level=INFO
\ No newline at end of file
+server.python.log.level=INFO
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4c9ed/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties
b/ambari-server/conf/windows/ambari.properties
index e47319e..d84cf4b 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -97,6 +97,7 @@ http.x-frame-options=DENY
http.x-content-type-options=nosniff
http.cache-control=no-store
http.pragma=no-cache
+http.charset=utf-8
# HTTP Header settings for Ambari Views
views.http.strict-transport-security=max-age=31536000
@@ -105,5 +106,6 @@ views.http.x-frame-options=SAMEORIGIN
views.http.x-content-type-options=nosniff
views.http.cache-control=no-store
views.http.pragma=no-cache
+views.http.charset=utf-8
mpacks.staging.path=resources\\mpacks
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4c9ed/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 5676091..9be8751 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -2290,6 +2290,14 @@ public class Configuration {
public static final ConfigurationProperty HTTP_PRAGMA_HEADER_VALUE =
new ConfigurationProperty<>(
"http.pragma", "no-cache");
+ /**
+ * The value that will be used to set the {@code Charset} HTTP response
header.
+ */
+ @Markdown(description = "The value that will be used to set the Character
encoding to HTTP response header.")
+ public static final ConfigurationProperty HTTP_CHARSET = new
ConfigurationProperty<>(
+ "http.charset", "utf-8");
+
+
/**
* The value that will be used to set the {@code Strict-Transport-Security}
* HTTP response header for Ambari View requests.
@@ -2339,6 +2347,14 @@ public class Configuration {
public static final ConfigurationProperty
VIEWS_HTTP_PRAGMA_HEADER_VALUE = new ConfigurationP
ambari git commit: AMBARI-18871 HTTP responses needs to have the character encoding specified in the content type header (Anita Jebaraj via sangeetar)
Repository: ambari
Updated Branches:
refs/heads/AMBARI-18871 [created] 51aab93f3
refs/remotes/origin/trunk [created] 85c9104ec
AMBARI-18871 HTTP responses needs to have the character encoding specified in
the content type header (Anita Jebaraj via sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/51aab93f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51aab93f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51aab93f
Branch: refs/heads/AMBARI-18871
Commit: 51aab93f31376fcdd155983bacc69491ff278671
Parents: 1a8a538
Author: Sangeeta Ravindran <sangee...@apache.org>
Authored: Tue Nov 29 12:44:26 2016 -0800
Committer: Sangeeta Ravindran <sangee...@apache.org>
Committed: Tue Nov 29 12:44:26 2016 -0800
--
ambari-server/conf/unix/ambari.properties | 4 +-
ambari-server/conf/windows/ambari.properties| 2 +
.../server/configuration/Configuration.java | 46
.../security/AbstractSecurityHeaderFilter.java | 14 ++
.../AmbariServerSecurityHeaderFilter.java | 1 +
.../AmbariViewsSecurityHeaderFilter.java| 1 +
.../AbstractSecurityHeaderFilterTest.java | 29
7 files changed, 87 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/51aab93f/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties
b/ambari-server/conf/unix/ambari.properties
index 371653f..30a22d1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -116,6 +116,7 @@ http.x-frame-options=DENY
http.x-content-type-options=nosniff
http.cache-control=no-store
http.pragma=no-cache
+http.charset=utf-8
# HTTP Header settings for Ambari Views
views.http.strict-transport-security=max-age=31536000
@@ -124,6 +125,7 @@ views.http.x-frame-options=SAMEORIGIN
views.http.x-content-type-options=nosniff
views.http.cache-control=no-store
views.http.pragma=no-cache
+views.http.charset=utf-8
mpacks.staging.path=$ROOT/var/lib/ambari-server/resources/mpacks
@@ -132,4 +134,4 @@
security.server.disabled.ciphers=TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384|TLS_ECD
server.python.log.name=ambari-server-command.log
# server.pyton.log.level=(INFO/DEBUG)
-server.python.log.level=INFO
\ No newline at end of file
+server.python.log.level=INFO
http://git-wip-us.apache.org/repos/asf/ambari/blob/51aab93f/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties
b/ambari-server/conf/windows/ambari.properties
index e47319e..d84cf4b 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -97,6 +97,7 @@ http.x-frame-options=DENY
http.x-content-type-options=nosniff
http.cache-control=no-store
http.pragma=no-cache
+http.charset=utf-8
# HTTP Header settings for Ambari Views
views.http.strict-transport-security=max-age=31536000
@@ -105,5 +106,6 @@ views.http.x-frame-options=SAMEORIGIN
views.http.x-content-type-options=nosniff
views.http.cache-control=no-store
views.http.pragma=no-cache
+views.http.charset=utf-8
mpacks.staging.path=resources\\mpacks
http://git-wip-us.apache.org/repos/asf/ambari/blob/51aab93f/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 5676091..9be8751 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -2290,6 +2290,14 @@ public class Configuration {
public static final ConfigurationProperty HTTP_PRAGMA_HEADER_VALUE =
new ConfigurationProperty<>(
"http.pragma", "no-cache");
+ /**
+ * The value that will be used to set the {@code Charset} HTTP response
header.
+ */
+ @Markdown(description = "The value that will be used to set the Character
encoding to HTTP response header.")
+ public static final ConfigurationProperty HTTP_CHARSET = new
ConfigurationProperty<>(
+ "http.charset", "utf-8");
+
+
/**
* The value that will be used to set the {@code Strict-Transport-Security}
* HTTP response header for Ambari View requests.
@@ -2339,6 +2347,14 @@ public class Configuration {
public static final Configu
