[ambari] branch branch-2.7 updated: AMBARI-25265. upgrade AngularJS to v1.7.5 in ambari-admin ui
This is an automated email from the ASF dual-hosted git repository.
alexantonenko pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new b9d5def AMBARI-25265. upgrade AngularJS to v1.7.5 in ambari-admin ui
new 28f5b7b Merge pull request #2948 from hiveww/AMBARI-25265-branch-2.7
b9d5def is described below
commit b9d5def4da7acbb25bafd2f74b568134eb9fd8ca
Author: Alex Antonenko
AuthorDate: Thu Apr 25 17:24:16 2019 +0300
AMBARI-25265. upgrade AngularJS to v1.7.5 in ambari-admin ui
---
.../main/resources/ui/admin-web/app/scripts/app.js | 4 +-
.../ambariViews/CreateViewInstanceCtrl.js | 4 +-
.../scripts/controllers/ambariViews/ViewUrlCtrl.js | 4 +-
.../controllers/ambariViews/ViewUrlEditCtrl.js | 4 +-
.../controllers/ambariViews/ViewsEditCtrl.js | 44 ++--
.../controllers/clusters/ClusterInformationCtrl.js | 2 +-
.../remoteClusters/RemoteClustersCreateCtrl.js | 4 +-
.../remoteClusters/RemoteClustersEditCtrl.js | 14 +-
.../remoteClusters/RemoteClustersListCtrl.js | 7 +-
.../stackVersions/StackVersionsCreateCtrl.js | 2 +-
.../stackVersions/StackVersionsEditCtrl.js | 4 +-
.../controllers/userManagement/GroupCreateCtrl.js | 4 +-
.../controllers/userManagement/GroupEditCtrl.js| 4 +-
.../admin-web/app/scripts/directives/linkToDir.js | 2 +-
.../ui/admin-web/app/scripts/services/Cluster.js | 167 ++
.../ui/admin-web/app/scripts/services/Group.js | 42 ++--
.../app/scripts/services/RemoteCluster.js | 95 ++--
.../ui/admin-web/app/scripts/services/Stack.js | 253 ++---
.../ui/admin-web/app/scripts/services/View.js | 160 ++---
.../ui/admin-web/app/views/ambariViews/edit.html | 10 +-
.../admin-web/app/views/ambariViews/viewsList.html | 2 +-
.../remoteClusters/editRemoteClusterPage.html | 2 +-
.../admin-web/app/views/remoteClusters/list.html | 4 +-
.../views/remoteClusters/remoteClusterPage.html| 2 +-
.../resources/ui/admin-web/app/views/sideNav.html | 6 +-
.../ui/admin-web/app/views/stackVersions/list.html | 4 +-
.../app/views/stackVersions/stackVersionPage.html | 2 +-
.../app/views/userManagement/groupEdit.html| 6 +-
.../admin-web/app/views/userManagement/main.html | 4 +-
.../app/views/userManagement/userEdit.html | 6 +-
.../app/views/userManagement/usersList.html| 2 +-
.../src/main/resources/ui/admin-web/bower.json | 13 +-
32 files changed, 377 insertions(+), 506 deletions(-)
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
index f68a1cf..94bf10e 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
@@ -113,7 +113,7 @@ angular.module('ambariAdminConsole', [
ngModel.controller = ['$scope', '$element', '$attrs', '$injector',
function(scope, element, attrs, $injector) {
var $interpolate = $injector.get('$interpolate');
attrs.$set('name', $interpolate(attrs.name || '')(scope));
- $injector.invoke(controller, this, {
+ $injector.invoke(controller, Object.setPrototypeOf(this,
controller.prototype), {
'$scope': scope,
'$element': element,
'$attrs': attrs
@@ -127,7 +127,7 @@ angular.module('ambariAdminConsole', [
form.controller = ['$scope', '$element', '$attrs', '$injector',
function(scope, element, attrs, $injector) {
var $interpolate = $injector.get('$interpolate');
attrs.$set('name', $interpolate(attrs.name || attrs.ngForm ||
'')(scope));
-$injector.invoke(controller, this, {
+$injector.invoke(controller, Object.setPrototypeOf(this,
controller.prototype), {
'$scope': scope,
'$element': element,
'$attrs': attrs
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
index 1199313..167ef43 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
@@ -123,8 +123,8 @@ function($scope, View, RemoteCluster, Alert, Cluster,
$routeParams, $location, U
'/versions/' +
$scope.form.instanceCreateForm.version.$viewValue.value +
'/instances/' + instanceName + '/edit');
})
-.catch(function (data) {
- var errorMessage = data.message;
+.catch(function (resp) {
+ var errorMessage = resp.data.message;
if (data.status >= 400) {
[ambari] branch trunk updated: AMBARI-25261. hdfs_to_onefs_convert.py script should have Ambari Server pre-req of >=2.7.1 (#2943)
This is an automated email from the ASF dual-hosted git repository. amagyar pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 4dbba02 AMBARI-25261. hdfs_to_onefs_convert.py script should have Ambari Server pre-req of >=2.7.1 (#2943) 4dbba02 is described below commit 4dbba02f9aa24e4e6459d97402cdc764ebe73d8c Author: Kait Johnson AuthorDate: Thu Apr 25 06:41:15 2019 -0700 AMBARI-25261. hdfs_to_onefs_convert.py script should have Ambari Server pre-req of >=2.7.1 (#2943) --- .../isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py b/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py index d772ce0..e07843d 100644 --- a/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py +++ b/contrib/management-packs/isilon-onefs-mpack/src/main/tools/hdfs_to_onefs_convert.py @@ -520,7 +520,7 @@ if __name__ == '__main__': print 'This script will replace the HDFS service to ONEFS' print 'The following prerequisites are required:' print ' * ONEFS management package must be installed' - print ' * Ambari must be upgraded to >=v2.7.0' + print ' * Ambari must be upgraded to >=v2.7.1' print ' * Stack must be upgraded to >=HDP-3.0' print ' * Is highly recommended to backup ambari database before you proceed.' conversion = Conversion(cluster, FsStorage())
[ambari] branch trunk updated: AMBARI-25262: Bump OneFS Management Pack version to 1.0.1.0 (#2946)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 23bd6a0 AMBARI-25262: Bump OneFS Management Pack version to 1.0.1.0
(#2946)
23bd6a0 is described below
commit 23bd6a0f99df2467889c206f059354ca5e79a60e
Author: Kait Johnson
AuthorDate: Thu Apr 25 06:41:46 2019 -0700
AMBARI-25262: Bump OneFS Management Pack version to 1.0.1.0 (#2946)
---
.../management-packs/isilon-onefs-mpack/src/main/resources/mpack.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/mpack.json
b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/mpack.json
index ad8389f..d3073d6 100644
--- a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/mpack.json
+++ b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/mpack.json
@@ -1,7 +1,7 @@
{
"type" : "full-release",
"name" : "onefs-ambari-mpack",
- "version": "0.1",
+ "version": "1.0.1.0",
"description" : "OneFS Ambari Management Pack",
"prerequisites": {
"min-ambari-version" : "3.0.0.0"
[ambari] branch trunk updated: AMBARI-25174. Add OneFS Mpack missing Spark2 configuration setting (#2944)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new b8a7605 AMBARI-25174. Add OneFS Mpack missing Spark2 configuration
setting (#2944)
b8a7605 is described below
commit b8a7605b2fb2f68fde7fc2c9d0262bb7dda119a9
Author: Kait Johnson
AuthorDate: Thu Apr 25 06:41:35 2019 -0700
AMBARI-25174. Add OneFS Mpack missing Spark2 configuration setting (#2944)
---
.../src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
index eae21f9..741e7ca 100644
---
a/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
+++
b/contrib/management-packs/isilon-onefs-mpack/src/main/resources/addon-services/ONEFS/1.0.0/kerberos.json
@@ -27,7 +27,8 @@
"hadoop.security.authentication": "kerberos",
"hadoop.security.authorization": "true",
"hadoop.proxyuser.HTTP.groups": "${hadoop-env/proxyuser_group}",
-"hadoop.security.token.service.use_ip" : "false"
+"hadoop.security.token.service.use_ip" : "false",
+"dfs.namenode.kerberos.principal":
"${hadoop-env/hdfs_user}${principal_suffix}/${onefs/onefs_host}@${realm}"
}
},
{
