[ambari] branch branch-2.7 updated: AMBARI-25331 [HA] RESOURCEMANAGER is not starting after adding and removing journal nodes. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8c2015b AMBARI-25331 [HA] RESOURCEMANAGER is not starting after
adding and removing journal nodes. (ababiichuk)
8c2015b is described below
commit 8c2015b34dcdf0755b4f181873bcef636c06c55c
Author: aBabiichuk
AuthorDate: Tue Jul 9 16:15:52 2019 +0300
AMBARI-25331 [HA] RESOURCEMANAGER is not starting after adding and removing
journal nodes. (ababiichuk)
---
.../main/admin/federation/step3_controller.js | 16 +++-
.../journalNode/step2_controller.js| 45 ++
.../journalNode/wizard_controller.js | 16
ambari-web/app/controllers/wizard.js | 13 +++
.../wizards/move_journal_node_properties.js| 18 -
ambari-web/app/routes/manage_journalnode_routes.js | 2 +-
.../journalNode/step2_controller_test.js | 36 +
.../journalNode/wizard_controller_test.js | 16
8 files changed, 118 insertions(+), 44 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
index 1f9890b..c4e0775 100644
--- a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
@@ -140,6 +140,7 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
var result = [];
var configsToRemove = [];
var hdfsSiteConfigs =
this.get('serverConfigData').items.findProperty('type', 'hdfs-site').properties;
+var wizardController = App.router.get(this.get('content.controllerName'));
if (!hdfsSiteConfigs['dfs.namenode.servicerpc-address.' +
dependencies.nameservice1 + '.nn1'] &&
!hdfsSiteConfigs['dfs.namenode.servicerpc-address.' + dependencies.nameservice1
+ '.nn2']) {
configsToRemove = configsToRemove.concat([
@@ -205,10 +206,10 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
configs.forEach(function (config) {
if (!configsToRemove.contains(config.name)) {
config.isOverridable = false;
-config.name = this.replaceDependencies(config.name, dependencies);
-config.displayName = this.replaceDependencies(config.displayName,
dependencies);
-config.value = this.replaceDependencies(config.value, dependencies);
-config.recommendedValue =
this.replaceDependencies(config.recommendedValue, dependencies);
+config.name = wizardController.replaceDependencies(config.name,
dependencies);
+config.displayName =
wizardController.replaceDependencies(config.displayName, dependencies);
+config.value = wizardController.replaceDependencies(config.value,
dependencies);
+config.recommendedValue =
wizardController.replaceDependencies(config.recommendedValue, dependencies);
result.push(config);
}
}, this);
@@ -229,13 +230,6 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
};
},
- replaceDependencies: function (value, dependencies) {
-Em.keys(dependencies).forEach(function (key) {
- value = value.replace(new RegExp('{{' + key + '}}', 'g'),
dependencies[key]);
-});
-return value;
- },
-
removeConfigs: function (configsToRemove, configs) {
Em.keys(configsToRemove).forEach(function (site) {
var siteConfigs = configs.items.findProperty('type', site);
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
index 108c97a..7b52ff4 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
@@ -82,7 +82,7 @@ App.ManageJournalNodeWizardStep2Controller =
Em.Controller.extend({
onLoadConfigs: function (data) {
this.set('serverConfigData', data);
-this.set('content.nameServiceId',
data.items[0].properties['dfs.nameservices']);
+this.set('content.nameServiceIds',
data.items[0].properties['dfs.nameservices'].split(','));
this.tweakServiceConfigs(this.get('moveJNConfig.configs'));
this.renderServiceConfigs(this.get('moveJNConfig'));
this.set('isLoaded', true);
@@ -91,10 +91,10 @@ App.ManageJournalNodeWizardStep2Controller =
Em.Controller.extend({
/**
* Generate set of data used to corre
[ambari] branch branch-2.7 updated: AMBARI-25303 Cluster Information Page URL is broken - additional patch. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 ab83d74 AMBARI-25303 Cluster Information Page URL is broken -
additional patch. (ababiichuk)
ab83d74 is described below
commit ab83d7439732a9fba0373659b8b019b69f472bdf
Author: ababiichuk
AuthorDate: Fri Jun 14 14:55:33 2019 +0300
AMBARI-25303 Cluster Information Page URL is broken - additional patch.
(ababiichuk)
---
.../main/resources/ui/admin-web/app/scripts/directives/linkToDir.js | 2 +-
ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js | 5 ++---
.../src/main/resources/ui/admin-web/app/views/ambariViews/edit.html | 6 +++---
.../resources/ui/admin-web/app/views/ambariViews/viewsList.html | 2 +-
.../admin-web/app/views/remoteClusters/editRemoteClusterPage.html | 2 +-
.../main/resources/ui/admin-web/app/views/remoteClusters/list.html | 4 ++--
.../ui/admin-web/app/views/remoteClusters/remoteClusterPage.html| 2 +-
ambari-admin/src/main/resources/ui/admin-web/app/views/sideNav.html | 6 +++---
.../main/resources/ui/admin-web/app/views/stackVersions/list.html | 4 ++--
.../ui/admin-web/app/views/stackVersions/stackVersionPage.html | 2 +-
.../resources/ui/admin-web/app/views/userManagement/groupEdit.html | 6 +++---
.../main/resources/ui/admin-web/app/views/userManagement/main.html | 4 ++--
.../resources/ui/admin-web/app/views/userManagement/userEdit.html | 6 +++---
.../resources/ui/admin-web/app/views/userManagement/usersList.html | 2 +-
14 files changed, 26 insertions(+), 27 deletions(-)
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/linkToDir.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/linkToDir.js
index c93948d..6a46b65 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/linkToDir.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/linkToDir.js
@@ -28,7 +28,7 @@ angular.module('ambariAdminConsole')
id: '@'
},
-template: '',
+template: '',
controller: ['$scope', 'ROUTES', function($scope, ROUTES) {
var route = ROUTES;
angular.forEach($scope.route.split('.'), function(routeObj) {
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
index bb1f447..a660a58 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
@@ -147,6 +147,7 @@ angular.module('ambariAdminConsole')
}
})
.config(['$routeProvider', '$locationProvider', 'ROUTES', function
($routeProvider, $locationProvider, ROUTES) {
+ $locationProvider.hashPrefix('');
var createRoute = function (routeObj) {
if (routeObj.url) {
$routeProvider.when(routeObj.url, routeObj);
@@ -157,9 +158,7 @@ angular.module('ambariAdminConsole')
var rootUrl = ROUTES['clusters']['clusterInformation'].url;
angular.forEach(ROUTES, createRoute);
$routeProvider.otherwise({
-redirectTo: function () {
- return rootUrl;
-}
+redirectTo: rootUrl
});
}])
.run(['$rootScope', 'ROUTES', 'Settings', function ($rootScope, ROUTES,
Settings) {
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 a0b6291..66a5040 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
@@ -17,7 +17,7 @@
-->
-{{'common.views' | translate}}
+{{'common.views' | translate}}
{{instance.ViewInstanceInfo.label}}
@@ -94,10 +94,10 @@
-{{'urls.createNewUrl'
| translate}}
+{{'urls.createNewUrl'
| translate}}
-{{'urls.createNewUrl'
| translate}}
+{{'urls.createNewUrl'
| translate}}
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
index 3d24225..5015253 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
@@ -88,7 +88,7 @@
[ambari] branch branch-2.7 updated: AMBARI-25303 Cluster Information Page URL is broken. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 89de628 AMBARI-25303 Cluster Information Page URL is broken.
(ababiichuk)
89de628 is described below
commit 89de628d0f3f280f181e270e6e0545c05d579194
Author: ababiichuk
AuthorDate: Wed Jun 12 16:31:56 2019 +0300
AMBARI-25303 Cluster Information Page URL is broken. (ababiichuk)
---
ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
index c8d0e96..bb1f447 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
@@ -157,7 +157,9 @@ angular.module('ambariAdminConsole')
var rootUrl = ROUTES['clusters']['clusterInformation'].url;
angular.forEach(ROUTES, createRoute);
$routeProvider.otherwise({
-redirectTo: rootUrl
+redirectTo: function () {
+ return rootUrl;
+}
});
}])
.run(['$rootScope', 'ROUTES', 'Settings', function ($rootScope, ROUTES,
Settings) {
[ambari] branch branch-2.7 updated: AMBARI-25283 Ambari UI evaluates Javascript embedded in user input when adding hosts, adding remote clusters, and renaming the cluster. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8817363 AMBARI-25283 Ambari UI evaluates Javascript embedded in user
input when adding hosts, adding remote clusters, and renaming the cluster.
(ababiichuk)
8817363 is described below
commit 881736325e9f2e63280070ef24698e5f896b6b80
Author: ababiichuk
AuthorDate: Tue May 21 13:42:37 2019 +0300
AMBARI-25283 Ambari UI evaluates Javascript embedded in user input when
adding hosts, adding remote clusters, and renaming the cluster. (ababiichuk)
---
.../app/scripts/controllers/clusters/ClusterInformationCtrl.js | 1 +
.../app/scripts/controllers/remoteClusters/RemoteClustersCreateCtrl.js | 1 +
.../app/scripts/controllers/remoteClusters/RemoteClustersEditCtrl.js | 1 +
.../src/main/resources/ui/admin-web/app/scripts/i18n.config.js | 1 +
.../resources/ui/admin-web/app/views/clusters/clusterInformation.html | 3 ++-
.../ui/admin-web/app/views/remoteClusters/editRemoteClusterPage.html | 3 ++-
.../ui/admin-web/app/views/remoteClusters/remoteClusterPage.html | 3 ++-
ambari-web/app/controllers/wizard/step2_controller.js | 2 +-
8 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClusterInformationCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClusterInformationCtrl.js
index 62eca96..0278133 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClusterInformationCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClusterInformationCtrl.js
@@ -27,6 +27,7 @@ function($scope, $http, $location, Cluster, $routeParams,
$translate, $rootScope
clusterName: null
};
$scope.isClusterNameEdited = false;
+ $scope.nameValidationPattern = /^\s*\w*\s*$/;
$scope.$watch(function() {
return $rootScope.cluster;
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersCreateCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersCreateCtrl.js
index 0315a9e..c030a9b 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersCreateCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersCreateCtrl.js
@@ -24,6 +24,7 @@ angular.module('ambariAdminConsole')
$scope.cluster = {};
$scope.nameValidationPattern = /^\s*\w*\s*$/;
+ $scope.urlValidationPattern =
/^(https?|ftp):\/\/[a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0
[...]
$scope.registerRemoteCluster = function () {
$scope.form.submitted = true;
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersEditCtrl.js
index 14726c8..8cc3273 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersEditCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersEditCtrl.js
@@ -25,6 +25,7 @@ angular.module('ambariAdminConsole')
$scope.instancesAffected = [];
$scope.nameValidationPattern = /^\s*\w*\s*$/;
+ $scope.urlValidationPattern =
/^(https?|ftp):\/\/[a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0
[...]
$scope.openChangePwdDialog = function() {
var modalInstance = $modal.open({
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 42da1dd..cee8099 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/s
[ambari] branch branch-2.6 updated: AMBARI-25259 upgrade moment.js to v2.22.2. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new e18775e AMBARI-25259 upgrade moment.js to v2.22.2. (ababiichuk)
e18775e is described below
commit e18775efcbae95584a09aaff72e28e30b3f48aea
Author: ababiichuk
AuthorDate: Tue Apr 30 15:49:42 2019 +0300
AMBARI-25259 upgrade moment.js to v2.22.2. (ababiichuk)
---
ambari-web/config.coffee|2 +-
ambari-web/karma.conf.js|2 +-
ambari-web/vendor/scripts/moment.js | 3195 ---
ambari-web/vendor/scripts/moment.min.js |6 +
4 files changed, 8 insertions(+), 3197 deletions(-)
diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee
index 2b2b78b..6a3f5ef 100644
--- a/ambari-web/config.coffee
+++ b/ambari-web/config.coffee
@@ -63,7 +63,7 @@ exports.config =
'vendor/scripts/difflib.js',
'vendor/scripts/diffview.js',
'vendor/scripts/visualsearch.js',
- 'vendor/scripts/moment.js',
+ 'vendor/scripts/moment.min.js',
'vendor/scripts/moment-timezone-with-data-2010-2020.js',
'vendor/scripts/workflow_visualization.js',
'vendor/scripts/rickshaw.js',
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index e144a84..03c2413 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -80,7 +80,7 @@ module.exports = function(config) {
'vendor/scripts/jquery.flexibleArea.js',
'vendor/scripts/FileSaver.js',
'vendor/scripts/Blob.js',
- 'vendor/scripts/moment.js',
+ 'vendor/scripts/moment.min.js',
'vendor/scripts/moment-timezone-with-data-2010-2020.js',
'vendor/**/*.js',
'app/templates/**/*.hbs',
diff --git a/ambari-web/vendor/scripts/moment.js
b/ambari-web/vendor/scripts/moment.js
deleted file mode 100644
index fe0e19c..000
--- a/ambari-web/vendor/scripts/moment.js
+++ /dev/null
@@ -1,3195 +0,0 @@
-//! moment.js
-//! version : 2.10.6
-//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
-//! license : MIT
-//! momentjs.com
-
-(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ?
module.exports = factory() :
-typeof define === 'function' && define.amd ? define(factory) :
- global.moment = factory()
-}(this, function () { 'use strict';
-
- var hookCallback;
-
- function utils_hooks__hooks () {
-return hookCallback.apply(null, arguments);
- }
-
- // This is done to register the method called with moment()
- // without creating circular dependencies.
- function setHookCallback (callback) {
-hookCallback = callback;
- }
-
- function isArray(input) {
-return Object.prototype.toString.call(input) === '[object Array]';
- }
-
- function isDate(input) {
-return input instanceof Date || Object.prototype.toString.call(input) ===
'[object Date]';
- }
-
- function map(arr, fn) {
-var res = [], i;
-for (i = 0; i < arr.length; ++i) {
- res.push(fn(arr[i], i));
-}
-return res;
- }
-
- function hasOwnProp(a, b) {
-return Object.prototype.hasOwnProperty.call(a, b);
- }
-
- function extend(a, b) {
-for (var i in b) {
- if (hasOwnProp(b, i)) {
-a[i] = b[i];
- }
-}
-
-if (hasOwnProp(b, 'toString')) {
- a.toString = b.toString;
-}
-
-if (hasOwnProp(b, 'valueOf')) {
- a.valueOf = b.valueOf;
-}
-
-return a;
- }
-
- function create_utc__createUTC (input, format, locale, strict) {
-return createLocalOrUTC(input, format, locale, strict, true).utc();
- }
-
- function defaultParsingFlags() {
-// We need to deep clone this object.
-return {
- empty : false,
- unusedTokens: [],
- unusedInput : [],
- overflow: -2,
- charsLeftOver : 0,
- nullInput : false,
- invalidMonth: null,
- invalidFormat : false,
- userInvalidated : false,
- iso : false
-};
- }
-
- function getParsingFlags(m) {
-if (m._pf == null) {
- m._pf = defaultParsingFlags();
-}
-return m._pf;
- }
-
- function valid__isValid(m) {
-if (m._isValid == null) {
- var flags = getParsingFlags(m);
- m._isValid = !isNaN(m._d.getTime()) &&
-flags.overflow < 0 &&
-!flags.empty &&
-!flags.invalidMonth &&
-!flags.invalidWeekday &&
-!flags.nullInput &&
-!flags.invalidFormat &&
-!flags.userInvalidated;
-
-
[ambari] branch branch-2.7 updated: AMBARI-25259 upgrade moment.js to v2.22.2. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 31fad8b AMBARI-25259 upgrade moment.js to v2.22.2. (ababiichuk)
31fad8b is described below
commit 31fad8befb67756b8991dd745ef587b870951fde
Author: ababiichuk
AuthorDate: Thu Apr 18 14:26:49 2019 +0300
AMBARI-25259 upgrade moment.js to v2.22.2. (ababiichuk)
---
ambari-web/vendor/scripts/moment.min.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/ambari-web/vendor/scripts/moment.min.js
b/ambari-web/vendor/scripts/moment.min.js
index d301ddb..c9dcf04 100644
--- a/ambari-web/vendor/scripts/moment.min.js
+++ b/ambari-web/vendor/scripts/moment.min.js
@@ -1,7 +1,6 @@
//! moment.js
-//! version : 2.13.0
+//! version : 2.22.2
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
-!function(a,b){"object"==typeof exports&&"undefined"!=typeof
module?module.exports=b():"function"==typeof
define&&define.amd?define(b):a.moment=b()}(this,function(){"use
strict";function a(){return fd.apply(null,arguments)}function
b(a){fd=a}function c(a){return a instanceof Array||"[object
Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof
Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var
c,d=[];for(c=0;c=f&&["m"]||f=g&&["h"]||g=h&&["d"]||h=i&&["M"]||i=j&&["y"]||["yy",j];return
k[2]=b, [...]
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof
module?module.exports=t():"function"==typeof
define&&define.amd?define(t):e.moment=t()}(this,function(){"use strict";var
e,i;function c(){return e.apply(null,arguments)}function o(e){return e
instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function
u(e){return null!=e&&"[object
Object]"===Object.prototype.toString.call(e)}function l(e){return void
0===e}function d(e){return"number"==typeof e||"[object Num [...]
\ No newline at end of file
[ambari] branch branch-2.7 updated: AMBARI-25248. Hive service check is failing after moving Hive Metastore from node to another using system tests. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8ed83a0 AMBARI-25248. Hive service check is failing after moving Hive
Metastore from node to another using system tests. (ababiichuk)
8ed83a0 is described below
commit 8ed83a02e000eb6137ee96be7fa61c0c86f96ab9
Author: aBabiichuk
AuthorDate: Tue Apr 16 13:21:40 2019 +0300
AMBARI-25248. Hive service check is failing after moving Hive Metastore
from node to another using system tests. (ababiichuk)
---
.../main/service/reassign/step3_controller.js| 20 +++-
.../controllers/main/service/reassign_controller.js | 2 +-
.../app/utils/configs/move_hm_config_initializer.js | 18 --
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git
a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index 8d09745..58f799e 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -371,13 +371,14 @@ App.ReassignMasterWizardStep3Controller =
Em.Controller.extend({
this.get('propertiesToChange')[type].forEach(function (property) {
var propertyName = property.name,
stackProperty =
App.configsCollection.getConfigByName(propertyName, type) || {},
+ displayName = self.getDisplayName(stackProperty.displayName,
propertyName, type, serviceName),
displayedProperty = App.ServiceConfigProperty.create({
name: propertyName,
-displayName: propertyName,
fileName: type
}, stackProperty, {
value: configs[type][propertyName],
category: serviceName,
+displayName,
isEditable: Boolean(stackProperty.isEditable !== false &&
!property.isSecure)
});
displayedConfigs.push(displayedProperty);
@@ -392,6 +393,23 @@ App.ReassignMasterWizardStep3Controller =
Em.Controller.extend({
});
},
+ getDisplayName: function (stackDisplayName, propertyName, type, serviceName)
{
+let displayName = stackDisplayName || propertyName;
+const keys = Em.keys(this.get('propertiesToChange'));
+for (let i = 0; i < keys.length; i++) {
+ const fileName = keys[i],
+ service = App.config.get('serviceByConfigTypeMap')[fileName];
+ if (fileName !== type && service && service.get('serviceName') ===
serviceName) {
+const configs = this.get('propertiesToChange')[fileName];
+if (configs.someProperty('name', propertyName)) {
+ displayName = `${type}/${propertyName}`;
+ break;
+}
+ }
+}
+return displayName;
+ },
+
onLoadConfigs: function (data) {
// Find hawq-site.xml location
var hawqSiteIndex = -1;
diff --git a/ambari-web/app/controllers/main/service/reassign_controller.js
b/ambari-web/app/controllers/main/service/reassign_controller.js
index 1f97a50..bf1e2ab 100644
--- a/ambari-web/app/controllers/main/service/reassign_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign_controller.js
@@ -158,7 +158,7 @@ App.ReassignMasterController = App.WizardController.extend({
'APP_TIMELINE_SERVER': ['yarn-site', 'yarn-env'],
'OOZIE_SERVER': ['oozie-site', 'core-site', 'oozie-env'],
'HIVE_SERVER': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
-'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
+'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site',
'hive-interactive-site'],
'MYSQL_SERVER': ['hive-site'],
'HISTORYSERVER': ['mapred-site'],
'TIMELINE_READER' : ['yarn-site']
diff --git a/ambari-web/app/utils/configs/move_hm_config_initializer.js
b/ambari-web/app/utils/configs/move_hm_config_initializer.js
index 527ba70..e6529f2 100644
--- a/ambari-web/app/utils/configs/move_hm_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_hm_config_initializer.js
@@ -47,20 +47,18 @@ App.MoveHmConfigInitializer =
App.MoveHiveComponentConfigInitializerClass.create
* @method _initHiveMetastoreUris
*/
_initHiveMetastoreUris: function (configProperty, localDB, dependencies) {
-if (App.config.getConfigTagFromFileName(Em.get(configProperty,
'filename')) === '
[ambari] branch branch-2.7 updated: AMBARI-25227 Unable to move Hive metastore from one node to another. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 1fa8541 AMBARI-25227 Unable to move Hive metastore from one node to
another. (ababiichuk)
1fa8541 is described below
commit 1fa854123fe8fda8cc6126a11f17a4c24daf06d2
Author: aBabiichuk
AuthorDate: Tue Apr 2 20:14:19 2019 +0300
AMBARI-25227 Unable to move Hive metastore from one node to another.
(ababiichuk)
---
.../main/service/reassign/step1_controller.js | 8 ++---
.../main/service/reassign/step4_controller.js | 37 ++
2 files changed, 6 insertions(+), 39 deletions(-)
diff --git
a/ambari-web/app/controllers/main/service/reassign/step1_controller.js
b/ambari-web/app/controllers/main/service/reassign/step1_controller.js
index 12d77d3..02eafa5 100644
--- a/ambari-web/app/controllers/main/service/reassign/step1_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step1_controller.js
@@ -27,12 +27,12 @@ App.ReassignMasterWizardStep1Controller =
Em.Controller.extend({
*/
dbPropertyMap: {
'HIVE_SERVER': {
- type: 'hive-site',
- name: 'javax.jdo.option.ConnectionDriverName'
+ type: 'hive-env',
+ name: 'hive_database_type'
},
'HIVE_METASTORE': {
- type: 'hive-site',
- name: 'javax.jdo.option.ConnectionDriverName'
+ type: 'hive-env',
+ name: 'hive_database_type'
},
'OOZIE_SERVER': {
type: 'oozie-site',
diff --git
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index b95e206..474a327 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -72,21 +72,6 @@ App.ReassignMasterWizardStep4Controller =
App.HighAvailabilityProgressPageContro
dependentHostComponents: [],
- dbPropertyMap: {
-'HIVE_SERVER': {
- type: 'hive-site',
- name: 'javax.jdo.option.ConnectionDriverName'
-},
-'HIVE_METASTORE': {
- type: 'hive-site',
- name: 'javax.jdo.option.ConnectionDriverName'
-},
-'OOZIE_SERVER': {
- type: 'oozie-site',
- name: 'oozie.service.JPAService.jdbc.url'
-}
- },
-
/**
* load step info
*/
@@ -659,30 +644,12 @@ App.ReassignMasterWizardStep4Controller =
App.HighAvailabilityProgressPageContro
return propertiesMap[this.get('content.reassign.service_id')];
}.property(),
- dbType: function() {
-var databaseTypes = /MySQL|PostgreS|Oracle|Derby|MSSQL|Anywhere/gi,
- dbPropertyMapItem = Em.getWithDefault(this.get('dbPropertyMap'),
this.get('content.reassign.component_name'), null),
- databasePropMatch,
- databaseProp,
- result;
-
-if (dbPropertyMapItem) {
- databaseProp = Em.getWithDefault(this.get('content.configs'),
dbPropertyMapItem.type, {})[dbPropertyMapItem.name];
- databasePropMatch = databaseProp && databaseProp.match(databaseTypes);
- if (databasePropMatch) {
-result = databasePropMatch[0];
- }
-}
-
-return result;
- }.property(),
-
prepareDBCheckAction: function() {
var params = this.get('preparedDBProperties');
var ambariProperties =
App.router.get('clusterController.ambariProperties');
-params['db_name'] = this.get('dbType');
+params['db_name'] = this.get('content.databaseType');
params['jdk_location'] = ambariProperties['jdk_location'];
params['jdk_name'] = ambariProperties['jdk.name'];
params['java_home'] = ambariProperties['java.home'];
@@ -774,7 +741,7 @@ App.ReassignMasterWizardStep4Controller =
App.HighAvailabilityProgressPageContro
testDBRetryTooltip: function() {
var db_host = this.get('content.serviceProperties.database_hostname');
-var db_type = this.get('dbType');
+var db_type = this.get('content.databaseType');
var db_props = this.get('preparedDBProperties');
return
Em.I18n.t('services.reassign.step4.tasks.testDBConnection.tooltip').format(
[ambari] branch branch-2.7 updated: AMBARI-25185 Chrome and Firefox browsers are crashing while opening Ambari UI. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 e89e204 AMBARI-25185 Chrome and Firefox browsers are crashing while
opening Ambari UI. (ababiichuk)
e89e204 is described below
commit e89e2048515c2a8f279d0e0e8bc772f6654468bf
Author: ababiichuk
AuthorDate: Mon Mar 11 13:11:01 2019 +0200
AMBARI-25185 Chrome and Firefox browsers are crashing while opening Ambari
UI. (ababiichuk)
---
ambari-web/app/views/common/configs/config_versions_control_view.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ambari-web/app/views/common/configs/config_versions_control_view.js
b/ambari-web/app/views/common/configs/config_versions_control_view.js
index 6cf4523..47ebaa6 100644
--- a/ambari-web/app/views/common/configs/config_versions_control_view.js
+++ b/ambari-web/app/views/common/configs/config_versions_control_view.js
@@ -47,7 +47,7 @@ App.ConfigVersionsControlView = Em.View.extend({
return serviceVersions.sort(function (a, b) {
return Em.get(b, 'createTime') - Em.get(a, 'createTime');
});
- }.property('serviceName', 'controller.selectedConfigGroup.name'),
+ }.property('controller.selectedConfigGroup.name'),
primaryServiceVersionsInCompare: function() {
return this.get('serviceVersions').filter((sv) => sv.get('version') !==
this.get('controller.compareServiceVersion.version'));
[ambari] branch trunk updated: AMBARI-25150 Implement additional error reporting for ambari-web unit tests. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 2bd65e8 AMBARI-25150 Implement additional error reporting for
ambari-web unit tests. (ababiichuk)
2bd65e8 is described below
commit 2bd65e811d26210a507ee92a2da421756ebffe1b
Author: ababiichuk
AuthorDate: Fri Feb 8 13:30:31 2019 +0200
AMBARI-25150 Implement additional error reporting for ambari-web unit
tests. (ababiichuk)
---
ambari-web/app/assets/test/tests.js | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index ca7b58b..b402a9d 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -585,7 +585,13 @@ describe('Ambari Web Unit tests', function() {
files.forEach(function (file) {
describe(file, function() {
- require(file);
+ try {
+require(file);
+ } catch (error) {
+it('Execution of test suite was terminated', function () {
+ throw error;
+});
+ }
});
});
[ambari] branch trunk updated: AMBARI-25143 Remove unused models from ambari-web. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 78c9b13 AMBARI-25143 Remove unused models from ambari-web.
(ababiichuk)
78c9b13 is described below
commit 78c9b13cfc4e1f0bc481b61892aa0d871b6399e7
Author: ababiichuk
AuthorDate: Tue Feb 5 14:48:32 2019 +0200
AMBARI-25143 Remove unused models from ambari-web. (ababiichuk)
---
ambari-web/app/assets/data/racks/racks.json| 12 --
ambari-web/app/assets/test/tests.js| 4 -
.../app/controllers/global/cluster_controller.js | 7 -
ambari-web/app/controllers/main.js | 1 -
ambari-web/app/mappers.js | 3 -
ambari-web/app/mappers/racks_mapper.js | 25 ---
ambari-web/app/mappers/root_service_mapper.js | 57 ---
ambari-web/app/mappers/target_cluster_mapper.js| 53 --
ambari-web/app/models.js | 7 -
ambari-web/app/models/authentication.js| 104
ambari-web/app/models/background_operation.js | 75 -
ambari-web/app/models/form.js | 178 -
ambari-web/app/models/rack.js | 42 -
ambari-web/app/models/root_service.js | 44 -
ambari-web/app/models/service_audit.js | 71
ambari-web/app/models/target_cluster.js| 33
ambari-web/app/models/user.js | 70
ambari-web/app/utils/ajax/ajax.js | 5 -
.../controllers/global/cluster_controller_test.js | 9 --
.../test/controllers/main/charts/heatmap_test.js | 1 -
ambari-web/test/models/authentication_test.js | 95 ---
ambari-web/test/models/form_test.js| 173
ambari-web/test/models/rack_test.js| 53 --
ambari-web/test/models/root_service_test.js| 78 -
ambari-web/test/models/user_test.js| 52 --
ambari-web/test/utils/form_field_test.js | 42 -
26 files changed, 1294 deletions(-)
diff --git a/ambari-web/app/assets/data/racks/racks.json
b/ambari-web/app/assets/data/racks/racks.json
deleted file mode 100644
index 0eda3ff..000
--- a/ambari-web/app/assets/data/racks/racks.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "href": "http://localhost:8080/api/racks?fields=*";,
- "items": [
-{
- "href": "http://localhost:8080/api/racks/1";,
- "Racks": {
-"id": 1,
-"name": "Default Rack"
- }
-}
- ]
-}
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index 760a27d..ed39021 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -239,7 +239,6 @@ var files = [
'test/utils/ember_reopen_test',
'test/utils/errors/assertions_test',
'test/utils/errors/definitions_test',
- 'test/utils/form_field_test',
'test/utils/file_utils_test',
'test/utils/handlebars_helpers_test',
'test/utils/host_progress_popup_test',
@@ -489,18 +488,15 @@ var files = [
'test/models/alerts/alert_group_test',
'test/models/alerts/alert_instance_test',
'test/models/alerts/alert_notification_test',
- 'test/models/authentication_test',
'test/models/client_component_test',
'test/models/cluster_states_test',
'test/models/cluster_test',
- 'test/models/form_test',
'test/models/host_test',
'test/models/host_component_test',
'test/models/hosts_test',
'test/models/master_component_test',
'test/models/operating_system_test',
'test/models/repository_test',
- 'test/models/root_service_test',
'test/models/stack_service_component_test',
'test/models/service_test',
'test/models/slave_component_test',
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index 9e5b4f7..13a8e1f 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -378,13 +378,6 @@ App.ClusterController =
Em.Controller.extend(App.ReloadPopupMixin, {
return "ABORTED" === status;
},
- loadRootService: function () {
-return App.ajax.send({
- name: 'service.ambari',
- sender: this
-});
- },
-
requestHosts: function (realUrl, callback) {
var testHostUrl = '/data/hosts/HDP2/hosts.json';
var url = this.getUrl(testHostUrl, re
[ambari] branch trunk updated: AMBARI-25138 Cover mappers files with unit tests. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 100fa13 AMBARI-25138 Cover mappers files with unit tests. (ababiichuk)
100fa13 is described below
commit 100fa13734d223cb0ddd9a3dbae3ec8dc24f7cb1
Author: ababiichuk
AuthorDate: Fri Feb 1 20:40:26 2019 +0200
AMBARI-25138 Cover mappers files with unit tests. (ababiichuk)
---
ambari-web/app/assets/test/tests.js| 4 +
.../app/mappers/alert_notification_mapper.js | 1 -
ambari-web/app/mappers/quicklinks_mapper.js| 16 -
ambari-web/app/models/widget.js| 5 +-
ambari-web/test/helpers.js | 13 +-
.../test/mappers/alert_groups_mapper_test.js | 1 +
.../test/mappers/alert_notification_mapper_test.js | 429 +
ambari-web/test/mappers/cluster_mapper_test.js | 97 +
.../test/mappers/stack_version_mapper_test.js | 333
ambari-web/test/mappers/widget_mapper_test.js | 162
10 files changed, 1038 insertions(+), 23 deletions(-)
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index d42fbfb..c20a839 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -163,6 +163,8 @@ var files = [
'test/mappers/alert_instances_mapper_test',
'test/mappers/alert_definitions_mapper_test',
'test/mappers/alert_definition_summary_mapper_test',
+ 'test/mappers/alert_notification_mapper_test',
+ 'test/mappers/cluster_mapper_test',
'test/mappers/server_data_mapper_test',
'test/mappers/hosts_mapper_test',
'test/mappers/service_mapper_test',
@@ -171,8 +173,10 @@ var files = [
'test/mappers/users_mapper_test',
'test/mappers/stack_mapper_test',
'test/mappers/stack_service_mapper_test',
+ 'test/mappers/stack_version_mapper_test',
'test/mappers/repository_version_mapper_test',
'test/mappers/stack_upgrade_history_mapper_test',
+ 'test/mappers/widget_mapper_test',
'test/mappers/configs/config_groups_mapper_test',
'test/mappers/configs/service_config_version_mapper_test',
'test/mappers/configs/themes_mapper_test',
diff --git a/ambari-web/app/mappers/alert_notification_mapper.js
b/ambari-web/app/mappers/alert_notification_mapper.js
index 8c7f50f..e0ca8d2 100644
--- a/ambari-web/app/mappers/alert_notification_mapper.js
+++ b/ambari-web/app/mappers/alert_notification_mapper.js
@@ -77,7 +77,6 @@ App.alertNotificationMapper = App.QuickDataMapper.create({
* @private
*/
_setPropertiesToEachModel: function (propertyName, propertiesMap) {
-var modelsMap = this.get('modelsMap');
for (var recordId in propertiesMap) {
if (propertiesMap.hasOwnProperty(recordId)) {
App.AlertNotification.find(recordId).set(propertyName,
propertiesMap[recordId]);
diff --git a/ambari-web/app/mappers/quicklinks_mapper.js
b/ambari-web/app/mappers/quicklinks_mapper.js
index 6de9b34..05cd5b9 100644
--- a/ambari-web/app/mappers/quicklinks_mapper.js
+++ b/ambari-web/app/mappers/quicklinks_mapper.js
@@ -29,21 +29,5 @@ App.quicklinksMapper = App.QuickDataMapper.create({
"name" : "QuickLinkInfo.quicklink_data.QuickLinksConfiguration.name",
"protocol" :
"QuickLinkInfo.quicklink_data.QuickLinksConfiguration.configuration.protocol",
"links" :
"QuickLinkInfo.quicklink_data.QuickLinksConfiguration.configuration.links"
- },
-
- map: function(json){
-console.time('App.quicklinksMapper execution time');
-
-var result = [];
-var linkResult = [];
-
-json.items.forEach(function(item) {
- var parseResult = this.parseIt(item, this.get('config'));
- console.log("parseResult", parseResult);
- result.push(parseResult);
-}, this);
-
-App.store.safeLoadMany(this.get('model'), result);
-console.timeEnd('App.quicklinksMapper execution time');
}
});
diff --git a/ambari-web/app/models/widget.js b/ambari-web/app/models/widget.js
index 8c76123..64fd566 100644
--- a/ambari-web/app/models/widget.js
+++ b/ambari-web/app/models/widget.js
@@ -45,10 +45,13 @@ App.Widget = DS.Model.extend({
tag: DS.attr('string'),
isVisible: DS.attr('boolean', {defaultValue: true}),
/**
+ * This field is not derived from API but needs to be filled in the mapper
on the client side
* @type {number}
* @default 0
*/
- defaultOrder: 0, // This field is not derived from API but needs to be
filled in the mapper on the client side
+ defaultOrder: DS.attr('number', {
[ambari] branch trunk updated: AMBARI-25122 UI unit tests are sometimes failing. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 6f856ee AMBARI-25122 UI unit tests are sometimes failing. (ababiichuk)
6f856ee is described below
commit 6f856eee063bd91de5eff0e025af36fa15e9e821
Author: ababiichuk
AuthorDate: Wed Jan 23 19:44:12 2019 +0200
AMBARI-25122 UI unit tests are sometimes failing. (ababiichuk)
---
ambari-web/app/assets/test/tests.js| 4 ++
ambari-web/test/controllers/application_test.js| 4 +-
.../global/user_settings_controller_test.js| 2 -
.../progress_popup_controller_test.js | 2 -
.../test/controllers/main/admin/kerberos_test.js | 2 -
.../admin/stack_and_upgrade_controller_test.js | 4 --
.../alert_definitions_actions_controller_test.js | 8
.../manage_alert_notifications_controller_test.js | 8
.../test/controllers/main/host/details_test.js | 41
.../test/controllers/main/service/item_test.js | 11 +-
ambari-web/test/controllers/wizard/step2_test.js | 14 ---
ambari-web/test/controllers/wizard/step3_test.js | 44 --
.../wizard/step7/assign_master_controller_test.js | 4 --
ambari-web/test/controllers/wizard/step7_test.js | 10 -
ambari-web/test/controllers/wizard/step8_test.js | 12 --
ambari-web/test/controllers/wizard_test.js | 6 +--
.../service/configs/config_overridable_test.js | 6 ---
ambari-web/test/utils/host_progress_popup_test.js | 8
ambari-web/test/utils/hosts_test.js| 13 +--
.../configs/config_versions_control_view_test.js | 2 +-
.../common/configs/service_config_view_test.js | 2 -
.../stack_upgrade/upgrade_version_box_view_test.js | 6 +--
.../test/views/main/dashboard/widget_test.js | 9 -
.../wizard/step3/hostWarningPopupBody_view_test.js | 9 -
24 files changed, 11 insertions(+), 220 deletions(-)
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index e1808da..e1c31da 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -562,6 +562,9 @@ describe('Ambari Web Unit tests', function() {
});
sinon.stub(App.updater, 'run', Em.K);
sinon.stub(App.updater, 'immediateRun', Em.K);
+sinon.stub(App.ModalPopup, 'show', function (options) {
+ return this.create(options);
+});
});
afterEach(function () {
@@ -569,6 +572,7 @@ describe('Ambari Web Unit tests', function() {
$.ajax.restore();
App.updater.run.restore();
App.updater.immediateRun.restore();
+App.ModalPopup.show.restore();
});
files.forEach(function (file) {
diff --git a/ambari-web/test/controllers/application_test.js
b/ambari-web/test/controllers/application_test.js
index 2333e5e..dc22133 100644
--- a/ambari-web/test/controllers/application_test.js
+++ b/ambari-web/test/controllers/application_test.js
@@ -40,13 +40,11 @@ describe('App.ApplicationController', function () {
describe('#showAboutPopup', function() {
var dataToShowRes = {};
beforeEach(function () {
+ App.ModalPopup.show.restore();
sinon.stub(App.ModalPopup, 'show', function(dataToShow){
dataToShowRes = dataToShow;
});
});
-afterEach(function () {
- App.ModalPopup.show.restore();
-});
it ('Should send correct data to popup', function() {
applicationController.showAboutPopup();
dataToShowRes = JSON.parse(JSON.stringify(dataToShowRes));
diff --git
a/ambari-web/test/controllers/global/user_settings_controller_test.js
b/ambari-web/test/controllers/global/user_settings_controller_test.js
index f68c109..ef9e9a2 100644
--- a/ambari-web/test/controllers/global/user_settings_controller_test.js
+++ b/ambari-web/test/controllers/global/user_settings_controller_test.js
@@ -336,12 +336,10 @@ describe('App.UserSettingsController', function () {
describe('#_showSettingsPopup()', function() {
beforeEach(function() {
- sinon.stub(App.ModalPopup, 'show');
sinon.stub(App, 'showAlertPopup');
});
afterEach(function() {
- App.ModalPopup.show.restore();
App.showAlertPopup.restore();
});
diff --git
a/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
b/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
index b14bf86..213f95a 100644
---
a/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
+++
b/ambari-web/test/controllers/main/admin/highAvailability/progress_popup_controller_test.js
@@ -239,13 +239,11 @@ describe('App.HighAvailabi
[ambari] branch trunk updated: AMBARI-25112 Cover errors utils with unit tests. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 3ad2ab8 AMBARI-25112 Cover errors utils with unit tests. (ababiichuk)
3ad2ab8 is described below
commit 3ad2ab8fb49e4f330fa4b4a2e23c8c68de27f161
Author: aBabiichuk
AuthorDate: Tue Jan 22 18:38:40 2019 +0200
AMBARI-25112 Cover errors utils with unit tests. (ababiichuk)
---
ambari-web/app/assets/test/tests.js | 2 +
ambari-web/test/utils/errors/assertions_test.js | 654 +++
ambari-web/test/utils/errors/definitions_test.js | 127 +
3 files changed, 783 insertions(+)
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index 68ce6c1..e1808da 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -233,6 +233,8 @@ var files = [
'test/utils/db_test',
'test/utils/ember_computed_test',
'test/utils/ember_reopen_test',
+ 'test/utils/errors/assertions_test',
+ 'test/utils/errors/definitions_test',
'test/utils/form_field_test',
'test/utils/file_utils_test',
'test/utils/handlebars_helpers_test',
diff --git a/ambari-web/test/utils/errors/assertions_test.js
b/ambari-web/test/utils/errors/assertions_test.js
new file mode 100644
index 000..276deba
--- /dev/null
+++ b/ambari-web/test/utils/errors/assertions_test.js
@@ -0,0 +1,654 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+require('utils/errors/assertions');
+
+describe('Error assertions', function () {
+ describe('#App.assert', function () {
+var errorCases = [
+ {
+args: [null, false],
+errorType: Error,
+desc: '',
+title: 'default error object, no description'
+ },
+ {
+args: ['desc0', false],
+errorType: Error,
+desc: ' Info: desc0',
+title: 'default error object, custom description'
+ },
+ {
+args: [null, false, TypeError],
+errorType: TypeError,
+desc: '',
+title: 'custom error object, no description'
+ },
+ {
+args: ['desc1', false, TypeError],
+errorType: TypeError,
+desc: ' Info: desc1',
+title: 'custom error object, custom description'
+ }
+];
+errorCases.forEach(function (test) {
+ it(test.title, function () {
+var testFunction = function () {
+ App.assert.apply(null, test.args);
+};
+expect(testFunction).to.throw(test.errorType, test.desc);
+ });
+});
+it('no error', function () {
+ expect(App.assert.bind(null, 'desc2', true)).to.not.throw();
+});
+ });
+
+ describe('#App.assertExists', function () {
+var errorCases = [
+{
+ value: null,
+ desc: 'desc0',
+ title: 'null'
+},
+{
+ value: undefined,
+ desc: 'desc1',
+ title: 'undefined'
+}
+ ],
+ noErrorCases = [
+{
+ value: [],
+ title: 'empty array'
+},
+{
+ value: [0],
+ title: 'non-empty array'
+},
+{
+ value: {},
+ title: 'empty object'
+},
+{
+ value: {
+a: ''
+ },
+ title: 'non-empty object'
+},
+{
+ value: Em.Object.create(),
+ title: 'empty Ember object'
+},
+{
+ value: Em.Object.create({
+a: ''
+ }),
+ title: 'non-empty Ember object'
+},
+{
+ value: 0,
+ title: '0'
+},
+{
+ value: 1,
+
[ambari] branch trunk updated: AMBARI-25103 Duplicate title on YARN summary page. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 0fdfa1a AMBARI-25103 Duplicate title on YARN summary page.
(ababiichuk)
0fdfa1a is described below
commit 0fdfa1afa534c022d6546aac9da6ff9bfc3b6302
Author: ababiichuk
AuthorDate: Mon Jan 14 18:33:31 2019 +0200
AMBARI-25103 Duplicate title on YARN summary page. (ababiichuk)
---
.../main/service/info/summary/master_components.hbs | 12
ambari-web/app/templates/main/service/services/hbase.hbs | 2 +-
ambari-web/app/templates/main/service/services/hdfs.hbs | 12
ambari-web/app/templates/main/service/services/hive.hbs | 2 +-
ambari-web/app/templates/main/service/services/onefs.hbs | 2 +-
ambari-web/app/templates/main/service/services/ranger.hbs| 2 +-
ambari-web/app/templates/main/service/services/storm.hbs | 4 ++--
ambari-web/app/templates/main/service/services/yarn.hbs | 2 +-
ambari-web/app/views/main/service/service.js | 2 ++
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git
a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
index 249247f..72a91d4 100644
--- a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
@@ -64,18 +64,6 @@
{{/if}}
{{/if}}
{{/each}}
-{{#unless view.mastersComp.length}}
-
-
- {{#if view.parentView.parentView.hasComponents}}
-{{t dashboard.services.hdfs.summary.components}}
- {{/if}}
-
-
- {{view App.SummaryClientComponentsView
clientsObjBinding="view.parentView.parentView.clientObj"}}
-
-
-{{/unless}}
{{#if view.parentView.parentView.service.hasMasterOrSlaveComponent}}
{{#if view.componentCommonWidgetsView}}
{{view view.componentCommonWidgetsView}}
diff --git a/ambari-web/app/templates/main/service/services/hbase.hbs
b/ambari-web/app/templates/main/service/services/hbase.hbs
index 6134c71..581099b 100644
--- a/ambari-web/app/templates/main/service/services/hbase.hbs
+++ b/ambari-web/app/templates/main/service/services/hbase.hbs
@@ -22,7 +22,7 @@
{{view view.dashboardMasterComponentView}}
-{{#if view.hasMultipleMasterGroups}}
+{{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs
b/ambari-web/app/templates/main/service/services/hdfs.hbs
index 43a0083..7f6b647 100644
--- a/ambari-web/app/templates/main/service/services/hdfs.hbs
+++ b/ambari-web/app/templates/main/service/services/hdfs.hbs
@@ -25,5 +25,17 @@
{{view view.slaveComponentsView
slaveComponentsViewBinding="view.slaveComponentsView" summaryViewBinding="view"
showTitle=true}}
{{/if}}
+{{#unless view.parentView.service.hasMasterOrSlaveComponent}}
+
+
+ {{#if view.parentView.hasComponents}}
+{{t dashboard.services.hdfs.summary.components}}
+ {{/if}}
+
+
+ {{view App.SummaryClientComponentsView
clientsObjBinding="view.parentView.clientObj"}}
+
+
+{{/unless}}
diff --git a/ambari-web/app/templates/main/service/services/hive.hbs
b/ambari-web/app/templates/main/service/services/hive.hbs
index ebd1e28..00ad345 100644
--- a/ambari-web/app/templates/main/service/services/hive.hbs
+++ b/ambari-web/app/templates/main/service/services/hive.hbs
@@ -20,7 +20,7 @@
{{view view.dashboardMasterComponentView}}
- {{#if view.hasMultipleMasterGroups}}
+ {{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
diff --git a/ambari-web/app/templates/main/service/services/onefs.hbs
b/ambari-web/app/templates/main/service/services/onefs.hbs
index e4d6d27..23dd7f9 100644
--- a/ambari-web/app/templates/main/service/services/onefs.hbs
+++ b/ambari-web/app/templates/main/service/services/onefs.hbs
@@ -39,7 +39,7 @@
-{{#if view.hasMultipleMasterGroups}}
+{{#if view.showComponentsTitleForNonMasters}}
{{t dashboard.services.hdfs.summary.components}}
{{/if}}
diff --git a/ambari-web/app/templates/main/service/services/ranger.hbs
b/ambari-web/app/templates/main/service/services/ranger.hbs
index 54b3efc..bed92e8 100644
--- a/ambari-web/app/templates/main/service/services/ranger.hbs
+++ b/ambari-web/app/templates/main/service/services/ranger.hbs
@@ -20,7 +20,7 @@
{{view view.dashboardMasterComponentView}}
- {{#if vie
[ambari] branch trunk updated: AMBARI-25094 Remove Flume Live widget from Ambari, alongside the Flume service during upgrade to HDP3. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 04e120a AMBARI-25094 Remove Flume Live widget from Ambari, alongside
the Flume service during upgrade to HDP3. (ababiichuk)
04e120a is described below
commit 04e120a9334f21773cf0ce3fc94c84ff4c0da11f
Author: ababiichuk
AuthorDate: Wed Jan 9 20:52:54 2019 +0200
AMBARI-25094 Remove Flume Live widget from Ambari, alongside the Flume
service during upgrade to HDP3. (ababiichuk)
---
ambari-web/app/views/main/dashboard/widgets.js | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/views/main/dashboard/widgets.js
b/ambari-web/app/views/main/dashboard/widgets.js
index bcc219f..76c3f81 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -539,7 +539,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.Persist,
App.LocalStorage, App
},
/**
- * check if stack has upgraded from HDP 1.0 to 2.0 OR add/delete services.
+ * Check if any services with widgets were added or deleted.
* Update the value on server if true.
*/
checkServicesChange: function () {
@@ -560,6 +560,12 @@ App.MainDashboardWidgetsView = Em.View.extend(App.Persist,
App.LocalStorage, App
newValue[state].push(id);
}
});
+ userPreferences[state].forEach(id => {
+if (!defaultPreferences.visible.contains(id) &&
!defaultPreferences.hidden.contains(id)) {
+ isChanged = true;
+ newValue[state] = newValue[state].without(id);
+}
+ });
Object.keys(defaultPreferences.groups).forEach(groupName => {
const groupPreferences = defaultPreferences.groups[groupName],
subGroupForAllItems = groupPreferences['*'],
[ambari] branch trunk updated: AMBARI-25058 Ambari Admin doesn't redirect user to login page if auth session becomes invalidated. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 3fc52fc AMBARI-25058 Ambari Admin doesn't redirect user to login page
if auth session becomes invalidated. (ababiichuk)
3fc52fc is described below
commit 3fc52fcbe3e8fa221abf22aee6acb69211fb337c
Author: ababiichuk
AuthorDate: Thu Dec 20 15:29:33 2018 +0200
AMBARI-25058 Ambari Admin doesn't redirect user to login page if auth
session becomes invalidated. (ababiichuk)
---
.../main/resources/ui/admin-web/app/scripts/app.js | 21 +++--
.../ui/admin-web/app/scripts/services/Cluster.js| 15 +++
2 files changed, 14 insertions(+), 22 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..259536d 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
@@ -64,21 +64,14 @@ angular.module('ambariAdminConsole', [
}]);
$httpProvider.interceptors.push(['$rootScope', '$q', function (scope, $q) {
-function success(response) {
- return response;
-}
-
-function error(response) {
- if (response.status == 403) {
-window.location = Settings.siteRoot;
-return;
+return {
+ responseError: function (response) {
+if (response.status === 403) {
+ window.location = Settings.siteRoot;
+}
+return $q.reject(response);
}
- return $q.reject(response);
-}
-
-return function (promise) {
- return promise.then(success, error);
-}
+};
}]);
$provide.factory('TimestampHttpInterceptor', [function($q) {
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
index 1a99a65..6731317 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
@@ -100,14 +100,13 @@ angular.module('ambariAdminConsole')
var deferred = $q.defer();
var url =
'/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/properties/user.inactivity.timeout.default';
$http.get(Settings.baseUrl + url)
- .then(function(data) {
-var properties = data.data.RootServiceComponents.properties;
-var timeout = properties?
properties['user.inactivity.timeout.default'] : 0;
-deferred.resolve(timeout);
- })
- .catch(function(data) {
-deferred.reject(data);
- });
+.then(function(data) {
+ var properties = data.data.RootServiceComponents.properties;
+ var timeout = properties ?
properties['user.inactivity.timeout.default'] : 0;
+ deferred.resolve(timeout);
+}, function (data) {
+ deferred.reject(data);
+});
return deferred.promise;
},
[ambari] branch trunk updated: AMBARI-24572 Fixing the cluster name alignment (sjanardhanhw via ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 ccdac06 AMBARI-24572 Fixing the cluster name alignment (sjanardhanhw
via ababiichuk)
ccdac06 is described below
commit ccdac060f9b0e3e8a17d58b30f4aca9c9362741c
Author: sjanardhanhw
AuthorDate: Tue Nov 13 17:35:22 2018 +0530
AMBARI-24572 Fixing the cluster name alignment (sjanardhanhw via ababiichuk)
---
ambari-web/app/styles/top-nav.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/styles/top-nav.less
b/ambari-web/app/styles/top-nav.less
index f14a014..53b853f 100644
--- a/ambari-web/app/styles/top-nav.less
+++ b/ambari-web/app/styles/top-nav.less
@@ -29,7 +29,7 @@
padding: @navbar-header-vertical-padding @navbar-header-padding-right
@navbar-header-vertical-padding @navbar-header-padding-left;
margin-top: -5px;
font-size: @navbar-header-font-size;
- width: ~"calc(100% - 400px)";
+ width: ~"calc(100% - 440px)";
a {
color: #313D54;
cursor: pointer;
[ambari] branch branch-2.7 updated: AMBARI-24572 Fixing the cluster name alignment (sjanardhanhw via ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 56ffa1e AMBARI-24572 Fixing the cluster name alignment (sjanardhanhw
via ababiichuk)
56ffa1e is described below
commit 56ffa1e2236a517741ef22fb6ea19ff2a3414341
Author: sjanardhanhw
AuthorDate: Tue Nov 13 17:34:55 2018 +0530
AMBARI-24572 Fixing the cluster name alignment (sjanardhanhw via ababiichuk)
---
ambari-web/app/styles/top-nav.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/styles/top-nav.less
b/ambari-web/app/styles/top-nav.less
index f14a014..53b853f 100644
--- a/ambari-web/app/styles/top-nav.less
+++ b/ambari-web/app/styles/top-nav.less
@@ -29,7 +29,7 @@
padding: @navbar-header-vertical-padding @navbar-header-padding-right
@navbar-header-vertical-padding @navbar-header-padding-left;
margin-top: -5px;
font-size: @navbar-header-font-size;
- width: ~"calc(100% - 400px)";
+ width: ~"calc(100% - 440px)";
a {
color: #313D54;
cursor: pointer;
[ambari] branch trunk updated: AMBARI-24603 Better scrolling for long list of components in dropdown in host details page (sjanardhanhw via ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 a22df8a AMBARI-24603 Better scrolling for long list of components in
dropdown in host details page (sjanardhanhw via ababiichuk)
a22df8a is described below
commit a22df8ad540fa9fbe7034d6d7ef87beec29414a4
Author: sjanardhanhw
AuthorDate: Tue Nov 13 17:33:43 2018 +0530
AMBARI-24603 Better scrolling for long list of components in dropdown in
host details page (sjanardhanhw via ababiichuk)
---
ambari-web/app/styles/hosts.less | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ambari-web/app/styles/hosts.less b/ambari-web/app/styles/hosts.less
index 6904a14..51086e9 100644
--- a/ambari-web/app/styles/hosts.less
+++ b/ambari-web/app/styles/hosts.less
@@ -419,6 +419,8 @@
vertical-align: middle;
}
.dropdown-menu {
+ max-height: 450px;
+ overflow-y: scroll;
.disabled {
pointer-events: none;
color: #808080;
[ambari] branch branch-2.7 updated: AMBARI-24603 Better scrolling for long list of components in dropdown in host details page (sjanardhanhw via ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 25ab8d7 AMBARI-24603 Better scrolling for long list of components in
dropdown in host details page (sjanardhanhw via ababiichuk)
25ab8d7 is described below
commit 25ab8d75d24c125a0cd09a42e78c7a136d5698fe
Author: sjanardhanhw
AuthorDate: Tue Nov 13 17:33:05 2018 +0530
AMBARI-24603 Better scrolling for long list of components in dropdown in
host details page (sjanardhanhw via ababiichuk)
---
ambari-web/app/styles/hosts.less | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ambari-web/app/styles/hosts.less b/ambari-web/app/styles/hosts.less
index 6904a14..51086e9 100644
--- a/ambari-web/app/styles/hosts.less
+++ b/ambari-web/app/styles/hosts.less
@@ -419,6 +419,8 @@
vertical-align: middle;
}
.dropdown-menu {
+ max-height: 450px;
+ overflow-y: scroll;
.disabled {
pointer-events: none;
color: #808080;
[ambari] branch trunk updated: AMBARI-24666 Implement data visualization color palette. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository. ababiichuk 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 f45cfa1 AMBARI-24666 Implement data visualization color palette. (ababiichuk) f45cfa1 is described below commit f45cfa1d6afebd7cac75f1086adb218071999fe7 Author: ababiichuk AuthorDate: Thu Sep 20 14:37:56 2018 +0300 AMBARI-24666 Implement data visualization color palette. (ababiichuk) --- ambari-web/app/assets/img/widget-gauge.png | Bin 6444 -> 3563 bytes ambari-web/app/assets/img/widget-graph.png | Bin 9778 -> 3844 bytes ambari-web/app/assets/img/widget-number.png| Bin 5297 -> 3209 bytes ambari-web/app/assets/img/widget-template.png | Bin 4834 -> 2574 bytes ambari-web/app/assets/test/tests.js| 2 +- ambari-web/app/config.js | 2 ++ ambari-web/app/utils/chart_utils.js| 29 ambari-web/app/views/common/chart/linear_time.js | 3 +- ambari-web/app/views/common/chart/pie.js | 7 ++-- .../app/views/common/widget/gauge_widget_view.js | 9 ++--- .../views/main/dashboard/cluster_metrics/cpu.js| 7 .../main/dashboard/widgets/pie_chart_widget.js | 9 ++--- ambari-web/app/views/main/host/metrics/cpu.js | 7 .../service/info/metrics/flume/channel_size_mma.js | 11 -- .../info/metrics/flume/flume_incoming_mma.js | 12 --- .../info/metrics/flume/flume_outgoing_mma.js | 12 --- .../app/views/main/service/services/onefs.js | 3 +- ambari-web/test/utils/chart_utils_test.js | 38 + 18 files changed, 89 insertions(+), 62 deletions(-) diff --git a/ambari-web/app/assets/img/widget-gauge.png b/ambari-web/app/assets/img/widget-gauge.png index a923247..4715115 100644 Binary files a/ambari-web/app/assets/img/widget-gauge.png and b/ambari-web/app/assets/img/widget-gauge.png differ diff --git a/ambari-web/app/assets/img/widget-graph.png b/ambari-web/app/assets/img/widget-graph.png index 97f5d8a..1da664e 100644 Binary files a/ambari-web/app/assets/img/widget-graph.png and b/ambari-web/app/assets/img/widget-graph.png differ diff --git a/ambari-web/app/assets/img/widget-number.png b/ambari-web/app/assets/img/widget-number.png index 84b7bb6..f2d6b0e 100644 Binary files a/ambari-web/app/assets/img/widget-number.png and b/ambari-web/app/assets/img/widget-number.png differ diff --git a/ambari-web/app/assets/img/widget-template.png b/ambari-web/app/assets/img/widget-template.png index 59fef8d..98b79f2 100644 Binary files a/ambari-web/app/assets/img/widget-template.png and b/ambari-web/app/assets/img/widget-template.png differ diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js index 5cd18f7..58b0744 100644 --- a/ambari-web/app/assets/test/tests.js +++ b/ambari-web/app/assets/test/tests.js @@ -222,13 +222,13 @@ var files = [ 'test/utils/array_utils_test', 'test/utils/batch_scheduled_requests_test', 'test/utils/blueprint_test', + 'test/utils/chart_utils_test', 'test/utils/config_test', 'test/utils/configs_collection_test', 'test/utils/credentials_test', 'test/utils/date/date_test', 'test/utils/date/timezone_test', 'test/utils/data_manipulation_test', - 'test/utils/config_test', 'test/utils/db_test', 'test/utils/ember_computed_test', 'test/utils/ember_reopen_test', diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index c5bf5f0..807b841 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -57,6 +57,8 @@ App.healthStatusRed = '#EF6162'; App.healthStatusGreen = '#1EB475'; App.healthStatusOrange = '#E98A40'; App.widgetContentColor = '#66'; +App.gaugeWidgetRemainingAreaColor = '#DD'; +App.dataVisualizationColorScheme = ['#41bfae', '#79e3d1', '#63c2e5', '#c4aeff', '#b991d9', '#ffb9bf', '#ffae65', '#f6d151', '#a7cf82', '#abdfd5', '#3aac9c', '#6dccbc', '#59aece', '#b09ce5', '#a682c3', '#e5a6ac', '#e59c5b', '#ddbc49', '#96ba75', '#9ac8bf', '#83d5ca', '#a8ede1', '#99d7ee', '#d9caff', '#d1b7e6', '#ffd1d5', '#ffca9b', '#f9e18e', '#c6e0ae', '#c8eae4']; App.inactivityRemainTime = 60; // in seconds App.enableLogger = true; App.stackVersionsAvailable = true; diff --git a/ambari-web/app/utils/chart_utils.js b/ambari-web/app/utils/chart_utils.js new fi
[ambari] branch branch-2.7 updated: AMBARI-24645 Issues with tooltip containing custom time range for charts. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 580153b AMBARI-24645 Issues with tooltip containing custom time range
for charts. (ababiichuk)
580153b is described below
commit 580153bb959ec70760c4b241edefe5bcaf8823ba
Author: ababiichuk
AuthorDate: Fri Sep 14 19:19:50 2018 +0300
AMBARI-24645 Issues with tooltip containing custom time range for charts.
(ababiichuk)
---
ambari-web/app/mixins/common/widgets/time_range_mixin.js | 4 +++-
.../main/service/info/metrics/flume/flume_agent_metrics_section.hbs | 4 +---
ambari-web/app/views/main/service/info/metrics_view.js| 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ambari-web/app/mixins/common/widgets/time_range_mixin.js
b/ambari-web/app/mixins/common/widgets/time_range_mixin.js
index 0553a8e..ab00bf4 100644
--- a/ambari-web/app/mixins/common/widgets/time_range_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/time_range_mixin.js
@@ -79,7 +79,9 @@ App.TimeRangeMixin = Em.Mixin.create({
didInsertElement: function () {
App.tooltip(this.$(), {
- selector: '.dropdown-toggle[rel="tooltip"]'
+ selector: '.dropdown-toggle[rel="tooltip"]',
+ html: true,
+ placement: 'left'
});
},
diff --git
a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
index d32afdd..5289b70 100644
---
a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
+++
b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
@@ -26,9 +26,7 @@
{{view.header}}
-{{#if showTimeRangeControl}}
- {{view view.timeRangeListView}}
-{{/if}}
+ {{view view.timeRangeListView}}
diff --git a/ambari-web/app/views/main/service/info/metrics_view.js
b/ambari-web/app/views/main/service/info/metrics_view.js
index 450410e..e61a628 100644
--- a/ambari-web/app/views/main/service/info/metrics_view.js
+++ b/ambari-web/app/views/main/service/info/metrics_view.js
@@ -100,6 +100,7 @@ App.MainServiceInfoMetricsView =
Em.View.extend(App.Persist, App.TimeRangeMixin,
this.makeSortable('#widget_layout');
this.makeSortable('#ns_widget_layout', true);
this.addWidgetTooltip();
+this._super();
},
loadActiveWidgetLayout: function () {
[ambari] branch trunk updated: AMBARI-24645 Issues with tooltip containing custom time range for charts. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 9a81c82 AMBARI-24645 Issues with tooltip containing custom time range
for charts. (ababiichuk)
9a81c82 is described below
commit 9a81c820816df788493cc43e37de4d33e01ddc3a
Author: ababiichuk
AuthorDate: Fri Sep 14 19:19:50 2018 +0300
AMBARI-24645 Issues with tooltip containing custom time range for charts.
(ababiichuk)
---
ambari-web/app/mixins/common/widgets/time_range_mixin.js | 4 +++-
.../main/service/info/metrics/flume/flume_agent_metrics_section.hbs | 4 +---
ambari-web/app/views/main/service/info/metrics_view.js| 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ambari-web/app/mixins/common/widgets/time_range_mixin.js
b/ambari-web/app/mixins/common/widgets/time_range_mixin.js
index 0553a8e..ab00bf4 100644
--- a/ambari-web/app/mixins/common/widgets/time_range_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/time_range_mixin.js
@@ -79,7 +79,9 @@ App.TimeRangeMixin = Em.Mixin.create({
didInsertElement: function () {
App.tooltip(this.$(), {
- selector: '.dropdown-toggle[rel="tooltip"]'
+ selector: '.dropdown-toggle[rel="tooltip"]',
+ html: true,
+ placement: 'left'
});
},
diff --git
a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
index d32afdd..5289b70 100644
---
a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
+++
b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs
@@ -26,9 +26,7 @@
{{view.header}}
-{{#if showTimeRangeControl}}
- {{view view.timeRangeListView}}
-{{/if}}
+ {{view view.timeRangeListView}}
diff --git a/ambari-web/app/views/main/service/info/metrics_view.js
b/ambari-web/app/views/main/service/info/metrics_view.js
index 450410e..e61a628 100644
--- a/ambari-web/app/views/main/service/info/metrics_view.js
+++ b/ambari-web/app/views/main/service/info/metrics_view.js
@@ -100,6 +100,7 @@ App.MainServiceInfoMetricsView =
Em.View.extend(App.Persist, App.TimeRangeMixin,
this.makeSortable('#widget_layout');
this.makeSortable('#ns_widget_layout', true);
this.addWidgetTooltip();
+this._super();
},
loadActiveWidgetLayout: function () {
[ambari] branch trunk updated: AMBARI-24619 Horizontal scroll bar on assign slaves and clients page is not convenient for deploy with numerous hosts. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 6645b45 AMBARI-24619 Horizontal scroll bar on assign slaves and
clients page is not convenient for deploy with numerous hosts. (ababiichuk)
6645b45 is described below
commit 6645b45e9bb680e41255671d3e742fe097018de6
Author: ababiichuk
AuthorDate: Tue Sep 11 16:09:53 2018 +0300
AMBARI-24619 Horizontal scroll bar on assign slaves and clients page is not
convenient for deploy with numerous hosts. (ababiichuk)
---
ambari-web/app/styles/common.less | 17 +++
ambari-web/app/styles/wizard.less | 136
ambari-web/app/templates/wizard/step6.hbs | 72 ++---
ambari-web/app/views/wizard/step6_view.js | 36 +--
ambari-web/test/views/wizard/step6_view_test.js | 21 ++--
5 files changed, 176 insertions(+), 106 deletions(-)
diff --git a/ambari-web/app/styles/common.less
b/ambari-web/app/styles/common.less
index 249321b..03e989d 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -227,5 +227,22 @@
@navbar-header-padding-left: 0;
@navbar-header-font-size: 20px;
+/
+* Table styles
+***/
@table-color: @gray-text;
@table-font-size: 13px;
+@table-hover-background-color: #E7F6FC;
+@table-hover-border-color: #A7DFF2;
+@table-margin-bottom: 20px;
+@table-footer-color: #999;
+@table-footer-border: 2px solid #EEE;
+@table-cell-padding: 8px;
+
+/
+* Checkbox styles
+***/
+@checkbox-color: #1491C1;
+@checkbox-size: 10px;
+@checkbox-border-radius: 2px;
+@checkbox-top: 4px;
diff --git a/ambari-web/app/styles/wizard.less
b/ambari-web/app/styles/wizard.less
index 8341bb6..89784a8 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -19,6 +19,7 @@
@import 'common.less';
@wizard-side-nav-width: 250px;
+@host-column-width: 210px;
#enable_security {
.step3 {
@@ -251,57 +252,106 @@
}
#step6 {
.pre-scrollable {
- max-height: 440px;
+ width: 100%;
+ overflow: auto;
position: relative;
- display: flex;
- overflow-y: auto;
+ max-height: 440px;
+ border-bottom: @table-footer-border;
#component_assign_table {
-display: inline-block;
-overflow-x: auto;
-margin-left: 190px;
-margin-bottom: 10px;
-height: 100%;
-tbody td, th {
- white-space: nowrap;
-}
-tfoot td {
- padding-bottom: 30px;
-}
-.trim_hostname {
- .ellipsis-overflow-nowrap;
- max-width: 180px;
- float:left;
+margin-bottom: 0;
+tr {
display: block;
-}
-.checkbox {
- margin: 0;
-}
-.host-component-checkbox {
- line-height: 17px;
- font-size: 12px;
- top: 0;
-}
-.freeze {
- position: absolute;
- left: 0;
- width: 210px;
- border-top-color: #eee;
- border-bottom: 1px solid #eee;
-}
-td.freeze {
- padding-bottom: 11px;
-}
-tr.last-row {
- td {
-border-bottom: 2px solid #eee;
+ padding-left: @host-column-width;
+ td, th {
+white-space: nowrap;
+ }
+ .freeze {
+width: @host-column-width;
+position: absolute;
+left: 0;
+background-color: #fff;
+border-left: 1px solid transparent;
+ }
+ .trim_hostname {
+.ellipsis-overflow-nowrap;
+max-width: 180px;
+float: left;
+display: block;
+ }
+ .checkbox {
+margin: 0;
+position: static;
+input[type="checkbox"] {
+ + label.host-component-checkbox {
+display: inline;
+line-height: 17px;
+font-size: 12px;
+position: static;
+padding-left: 0;
+&:before {
+ position: static;
+ display: inline-block;
+ margin-top: @checkbox-top;
+ margin-right: @checkbox-size;
+}
+&:after {
+ background-color: @checkbox-color;
+ border-color: @checkbox-color;
+ position: static;
+ display: inline-block;
+ float: left;
+
[ambari] branch trunk updated: AMBARI-24561 Update styles for pre-upgrade modals. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 6451f81 AMBARI-24561 Update styles for pre-upgrade modals.
(ababiichuk)
6451f81 is described below
commit 6451f81783a11b9e159763d98df8a9691062ddc9
Author: ababiichuk
AuthorDate: Wed Aug 29 15:41:55 2018 +0300
AMBARI-24561 Update styles for pre-upgrade modals. (ababiichuk)
---
.../main/admin/stack_and_upgrade_controller.js | 8 +-
ambari-web/app/styles/stack_versions.less | 26 ++--
.../common/modal_popups/cluster_check_dialog.hbs | 12 +-
.../stack_upgrade/upgrade_configs_merge_table.hbs | 4 +-
.../upgrade_configs_recommend_table.hbs| 4 +-
.../main/admin/stack_upgrade/upgrade_options.hbs | 138 ++---
.../app/templates/wizard/step8/step8_log_popup.hbs | 1 -
.../common/modal_popups/cluster_check_popup.js | 1 +
8 files changed, 90 insertions(+), 104 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index ac04c88..e76fef0 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -896,7 +896,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
*/
showPreparingUpgradeIndicator: function () {
return App.ModalPopup.show({
- header: '',
+ header: Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.header'),
showFooter: false,
showCloseButton: false,
bodyClass: Em.View.extend({
@@ -911,12 +911,6 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
progressBarClass: 'progress log_popup',
/**
- * Popup-message
- * @type {string}
- */
-message: Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.header'),
-
-/**
* Hide popup when upgrade wizard is open
* @method autoHide
*/
diff --git a/ambari-web/app/styles/stack_versions.less
b/ambari-web/app/styles/stack_versions.less
index 8a88ac9..911475c 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -618,6 +618,8 @@
}
.img-thumbnail {
background-color: #e4e4e4;
+ text-align: center;
+ padding: 10px;
.method-name,.method-icon,.method-description {
color: #333;
}
@@ -630,25 +632,13 @@
.method-name {
font-size: 16px;
font-weight: bold;
-text-align: center;
margin-top: 2px;
}
.method-description {
margin-top: 5px;
-text-align: center;
}
}
-.ROLLING {
- .method-icon {
-margin-left: 88px;
- }
-}
-.NON_ROLLING, .HOST_ORDERED {
- .method-icon {
-margin-left: 94px;
- }
-}
.selected.ROLLING, .selected.NON_ROLLING {
background-color: #d3e7ca;
box-shadow: 0 8px 6px -6px #b3b3b3;
@@ -700,7 +690,6 @@
display: inline-block;
width: auto;
height: @spinner-small-height;
-padding-left: @spinner-small-width + 4px;
i {
font-size: 1em;
}
@@ -727,10 +716,13 @@
font-size: 16px;
}
}
- .tolerance-text .tolerance-option {
-margin: 5px 15px;
-.ember-checkbox {
- margin-top: 0;
+ .tolerance-text {
+margin-bottom: 30px;
+.tolerance-option {
+ margin: 5px 15px;
+ .ember-checkbox {
+margin-top: 0;
+ }
}
}
.text {
diff --git
a/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
b/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
index 83a57a6..23f5276 100644
--- a/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
+++ b/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs
@@ -24,9 +24,9 @@
{{view.failTitle}}
{{/if}}
{{#if view.failAlert}}
-
+
{{view.failAlert}}
-
+
{{/if}}
{{#each item in view.fails}}
@@ -42,9 +42,9 @@
{{view.failTitle}}
{{/if}}
{{#if view.failAlert}}
-
+
{{view.failAlert}}
-
+
{{/if}}
{{#each item in view.bypass}}
@@ -59,9 +59,9 @@
{{view.warningTitle}}
{{/if}}
{{#if view.warningAlert}}
-
+
{{view.warningAlert}}
-
+
{{/if}}
{{#each item in view.warnings}}
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs
index b78ba
[ambari] branch branch-2.7 updated: AMBARI-24555 Nifi Registry install fails. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 f1bd6b9 AMBARI-24555 Nifi Registry install fails. (ababiichuk)
f1bd6b9 is described below
commit f1bd6b93159a799c38f7ffbe1bbaba815323038f
Author: ababiichuk
AuthorDate: Tue Aug 28 17:52:20 2018 +0300
AMBARI-24555 Nifi Registry install fails. (ababiichuk)
---
ambari-web/app/mixins/wizard/addSecurityConfigs.js| 2 +-
ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js | 6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
index 54cdb82..f19accd 100644
--- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
+++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
@@ -895,7 +895,7 @@ App.AddSecurityConfigs = Em.Mixin.create({
* @returns {object}
*/
removeIdentityReferences: function(kerberosDescriptor) {
-const notReference = (identity) => Em.isNone(identity.reference);
+const notReference = (identity) => (Em.isNone(identity.reference) &&
!identity.name.startsWith('/'));
kerberosDescriptor.services.forEach((service) => {
if (service.identities) {
service.identities = service.identities.filter(notReference);
diff --git a/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
b/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
index 9cbdf08..92f87fb 100644
--- a/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
+++ b/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
@@ -337,6 +337,9 @@ describe('App.AddSecurityConfigs', function () {
},
{
name: 'foo'
+ },
+ {
+name: '/foo'
}
],
components: [
@@ -347,6 +350,9 @@ describe('App.AddSecurityConfigs', function () {
},
{
name: 'foo'
+ },
+ {
+name: '/foo'
}
]
}
[ambari] branch trunk updated: AMBARI-24555 Nifi Registry install fails. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 14811e4 AMBARI-24555 Nifi Registry install fails. (ababiichuk)
14811e4 is described below
commit 14811e4ff0049382e8f9496e9f3742ca0e141873
Author: ababiichuk
AuthorDate: Tue Aug 28 17:52:20 2018 +0300
AMBARI-24555 Nifi Registry install fails. (ababiichuk)
---
ambari-web/app/mixins/wizard/addSecurityConfigs.js| 2 +-
ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js | 6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
index 54cdb82..f19accd 100644
--- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
+++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
@@ -895,7 +895,7 @@ App.AddSecurityConfigs = Em.Mixin.create({
* @returns {object}
*/
removeIdentityReferences: function(kerberosDescriptor) {
-const notReference = (identity) => Em.isNone(identity.reference);
+const notReference = (identity) => (Em.isNone(identity.reference) &&
!identity.name.startsWith('/'));
kerberosDescriptor.services.forEach((service) => {
if (service.identities) {
service.identities = service.identities.filter(notReference);
diff --git a/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
b/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
index 9cbdf08..92f87fb 100644
--- a/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
+++ b/ambari-web/test/mixins/wizard/addSeccurityConfigs_test.js
@@ -337,6 +337,9 @@ describe('App.AddSecurityConfigs', function () {
},
{
name: 'foo'
+ },
+ {
+name: '/foo'
}
],
components: [
@@ -347,6 +350,9 @@ describe('App.AddSecurityConfigs', function () {
},
{
name: 'foo'
+ },
+ {
+name: '/foo'
}
]
}
[ambari] branch branch-2.7 updated: AMBARI-24525 Accumulo does not startup in Federated Cluster. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 bfcec7b AMBARI-24525 Accumulo does not startup in Federated Cluster.
(ababiichuk)
bfcec7b is described below
commit bfcec7bf72677785539eae5130ed56ed84877e06
Author: ababiichuk
AuthorDate: Wed Aug 22 17:30:14 2018 +0300
AMBARI-24525 Accumulo does not startup in Federated Cluster. (ababiichuk)
---
.../main/admin/federation/step3_controller.js | 55 +++---
.../main/admin/federation/step4_controller.js | 10 +++-
.../data/configs/wizards/federation_properties.js | 3 +-
3 files changed, 60 insertions(+), 8 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
index 50dd211..1f9890b 100644
--- a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
@@ -53,27 +53,29 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
return App.ajax.send({
name: 'config.tags',
sender: this,
- success: 'onLoadConfigsTags',
- error: 'onTaskError'
+ success: 'onLoadConfigsTags'
});
},
onLoadConfigsTags: function (data) {
+var servicesModel = App.Service.find();
var urlParams = '(type=hdfs-site&tag=' +
data.Clusters.desired_configs['hdfs-site'].tag + ')';
-if (App.Service.find().someProperty('serviceName', 'RANGER')) {
+if (servicesModel.someProperty('serviceName', 'RANGER')) {
urlParams += '|(type=core-site&tag=' +
data.Clusters.desired_configs['core-site'].tag + ')' +
'|(type=ranger-tagsync-site&tag=' +
data.Clusters.desired_configs['ranger-tagsync-site'].tag + ')' +
'|(type=ranger-hdfs-security&tag=' +
data.Clusters.desired_configs['ranger-hdfs-security'].tag + ')'
}
+if (servicesModel.someProperty('serviceName', 'ACCUMULO')) {
+ urlParams += '|(type=accumulo-site&tag=' +
data.Clusters.desired_configs['accumulo-site'].tag + ')';
+}
App.ajax.send({
name: 'admin.get.all_configurations',
sender: this,
data: {
urlParams: urlParams
},
- success: 'onLoadConfigs',
- error: 'onTaskError'
+ success: 'onLoadConfigs'
});
},
@@ -131,6 +133,7 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
},
tweakServiceConfigs: function (configs) {
+var servicesModel = App.Service.find();
var dependencies = this.prepareDependencies();
var nameServices =
App.HDFSService.find().objectAt(0).get('masterComponentGroups').mapProperty('name');
nameServices.push(dependencies.newNameservice);
@@ -147,7 +150,7 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
]);
}
-if (App.Service.find().someProperty('serviceName', 'RANGER')) {
+if (servicesModel.someProperty('serviceName', 'RANGER')) {
var hdfsRangerConfigs =
this.get('serverConfigData').items.findProperty('type',
'ranger-hdfs-security').properties;
var reponamePrefix =
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] === '{{repo_name}}' ?
dependencies.clustername + '_hadoop_' :
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] + '_';
var coreSiteConfigs =
this.get('serverConfigData').items.findProperty('type', 'core-site').properties;
@@ -159,6 +162,46 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
}, this);
}
+if (servicesModel.someProperty('serviceName', 'ACCUMULO')) {
+ var hdfsNameSpacesModel =
App.HDFSService.find().objectAt(0).get('masterComponentGroups');
+ var newNameSpace = this.get('content.nameServiceId');
+ var volumesValue = nameServices.map(function (ns) {
+return 'hdfs://' + ns + '/apps/accumulo/data';
+ }).join();
+ var replacementsValue = nameServices.map(function (ns) {
+var hostName;
+if (ns === newNameSpace) {
+ var hostNames =
this.get('content.masterComponentHosts').filter(function (hc) {
+return hc.component === 'NAMENODE' && !hc.isInstalled;
[ambari] branch trunk updated: AMBARI-24525 Accumulo does not startup in Federated Cluster. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 e6f1d35 AMBARI-24525 Accumulo does not startup in Federated Cluster.
(ababiichuk)
e6f1d35 is described below
commit e6f1d35bf630ca3f7f5f479978baf3430a10089d
Author: aBabiichuk
AuthorDate: Fri Aug 31 13:31:44 2018 +0300
AMBARI-24525 Accumulo does not startup in Federated Cluster. (ababiichuk)
---
.../main/admin/federation/step3_controller.js | 55 +++---
.../main/admin/federation/step4_controller.js | 10 +++-
.../data/configs/wizards/federation_properties.js | 3 +-
.../main/admin/federation/step3_controller_test.js | 27 ---
4 files changed, 80 insertions(+), 15 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
index 50dd211..1f9890b 100644
--- a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
@@ -53,27 +53,29 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
return App.ajax.send({
name: 'config.tags',
sender: this,
- success: 'onLoadConfigsTags',
- error: 'onTaskError'
+ success: 'onLoadConfigsTags'
});
},
onLoadConfigsTags: function (data) {
+var servicesModel = App.Service.find();
var urlParams = '(type=hdfs-site&tag=' +
data.Clusters.desired_configs['hdfs-site'].tag + ')';
-if (App.Service.find().someProperty('serviceName', 'RANGER')) {
+if (servicesModel.someProperty('serviceName', 'RANGER')) {
urlParams += '|(type=core-site&tag=' +
data.Clusters.desired_configs['core-site'].tag + ')' +
'|(type=ranger-tagsync-site&tag=' +
data.Clusters.desired_configs['ranger-tagsync-site'].tag + ')' +
'|(type=ranger-hdfs-security&tag=' +
data.Clusters.desired_configs['ranger-hdfs-security'].tag + ')'
}
+if (servicesModel.someProperty('serviceName', 'ACCUMULO')) {
+ urlParams += '|(type=accumulo-site&tag=' +
data.Clusters.desired_configs['accumulo-site'].tag + ')';
+}
App.ajax.send({
name: 'admin.get.all_configurations',
sender: this,
data: {
urlParams: urlParams
},
- success: 'onLoadConfigs',
- error: 'onTaskError'
+ success: 'onLoadConfigs'
});
},
@@ -131,6 +133,7 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
},
tweakServiceConfigs: function (configs) {
+var servicesModel = App.Service.find();
var dependencies = this.prepareDependencies();
var nameServices =
App.HDFSService.find().objectAt(0).get('masterComponentGroups').mapProperty('name');
nameServices.push(dependencies.newNameservice);
@@ -147,7 +150,7 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
]);
}
-if (App.Service.find().someProperty('serviceName', 'RANGER')) {
+if (servicesModel.someProperty('serviceName', 'RANGER')) {
var hdfsRangerConfigs =
this.get('serverConfigData').items.findProperty('type',
'ranger-hdfs-security').properties;
var reponamePrefix =
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] === '{{repo_name}}' ?
dependencies.clustername + '_hadoop_' :
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] + '_';
var coreSiteConfigs =
this.get('serverConfigData').items.findProperty('type', 'core-site').properties;
@@ -159,6 +162,46 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
}, this);
}
+if (servicesModel.someProperty('serviceName', 'ACCUMULO')) {
+ var hdfsNameSpacesModel =
App.HDFSService.find().objectAt(0).get('masterComponentGroups');
+ var newNameSpace = this.get('content.nameServiceId');
+ var volumesValue = nameServices.map(function (ns) {
+return 'hdfs://' + ns + '/apps/accumulo/data';
+ }).join();
+ var replacementsValue = nameServices.map(function (ns) {
+var hostName;
+if (ns === newNameSpace) {
+ var hostNames =
this.get('content.masterComponentHosts').filter(function (hc) {
+return hc.compo
[ambari] branch trunk updated: AMBARI-24500 Stack and Versions page style fixes. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 e7a37c6 AMBARI-24500 Stack and Versions page style fixes. (ababiichuk)
e7a37c6 is described below
commit e7a37c60b0d408ff756caa9d76e38405964a3e64
Author: ababiichuk
AuthorDate: Fri Aug 17 20:40:02 2018 +0300
AMBARI-24500 Stack and Versions page style fixes. (ababiichuk)
---
ambari-web/app/messages.js | 2 +-
ambari-web/app/styles/common.less | 5 +
ambari-web/app/styles/stack_versions.less | 509 +++--
.../admin/stack_upgrade/upgrade_version_column.hbs | 166 +++
.../main/admin/stack_upgrade/versions.hbs | 26 +-
.../stack_upgrade/upgrade_version_column_view.js | 34 +-
6 files changed, 386 insertions(+), 356 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6883dc5..5ef9da7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1827,7 +1827,7 @@ Em.I18n.translations = {
'admin.stackVersions.manageVersions': "Manage Versions",
'admin.stackVersions.manageVersions.popup.body': 'You are about to leave the
Cluster Management interface' +
' and go to the Ambari Administration interface. You can return to
cluster management by using the' +
-' “Go to Dashboard” link in the Ambari Administration > Clusters section.',
+' “Dashboard” link in the Ambari Administration > Clusters section.',
'admin.stackVersions.version.installNow': "Install Packages",
'admin.stackVersions.version.reinstall': "Reinstall Packages",
'admin.stackVersions.version.installError': "Installation Error!",
diff --git a/ambari-web/app/styles/common.less
b/ambari-web/app/styles/common.less
index 22ef496..249321b 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -190,6 +190,8 @@
@smaller-font-size: 12px;
@default-button-height: 34px;
@default-line-height: 1.3em;
+@default-line-height-calculated: @default-font-size *
unit(@default-line-height);
+@default-paragraph-margin-bottom: 10px;
/
* Modal popup properties
@@ -224,3 +226,6 @@
@navbar-header-padding-right: 15px;
@navbar-header-padding-left: 0;
@navbar-header-font-size: 20px;
+
+@table-color: @gray-text;
+@table-font-size: 13px;
diff --git a/ambari-web/app/styles/stack_versions.less
b/ambari-web/app/styles/stack_versions.less
index 72a1897..b597ce5 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -17,9 +17,39 @@
*/
@import 'common.less';
-@left-menu-table-z-index: 999;
-@left-menu-table-margin-top: 150px;
+@versions-slides-margin-top: 10px;
+@versions-slides-padding-top: 15px;
+@service-cell-wrapper-horizontal-padding: 7px;
+@service-cell-border-width: 1px;
+@service-cell-vertical-padding: 6px;
+@version-display-name-line-height: 18px;
+@version-display-name-padding-bottom: 5px;
+@version-display-name-height: @version-display-name-line-height +
@version-display-name-padding-bottom;
+@version-repository-name-line-height: @default-line-height-calculated;
+@version-repository-name-height: @version-repository-name-line-height +
@default-paragraph-margin-bottom;
+@version-show-details-padding: 5px;
+@version-show-details-line-height: @default-line-height-calculated;
+@version-show-details-border-bottom-width: 1px;
+@version-show-details-height: (2 * @version-show-details-padding) +
@version-show-details-line-height
+ + @version-show-details-border-bottom-width;
+@version-state-vertical-margin: 5px;
+@version-state-content-height: 35px;
+@version-state-height: (2 * @version-state-vertical-margin) +
@version-state-content-height;
+@service-section-margin-top: -1 * @service-cell-vertical-padding;
+@left-menu-table-padding-top: @service-cell-border-width + (2 *
@service-cell-vertical-padding)
+ + @version-display-name-height + @version-repository-name-height +
@version-show-details-height
+ + @version-state-height + @service-section-margin-top;
@version-line-height: 20px;
+@out-of-sync-badge-left: -1px;
+@current-version-background: #e6f1f6;
+@current-version-box-shadow: 0 8px 6px -6px #a3a3a3;
+
+.c {
+ font-size: @version-display-name-height;
+ line-height: @version-repository-name-height;
+ width: @version-show-details-height;
+ height: @version-state-height;
+}
#advancedRepoAccordion{
.panel-heading {
@@ -126,107 +156,54 @@
}
}
}
-.version-box-popup {
- .modal{
-overflow: visible;
-.modal-dialog{
- width: 340px;
-}
-.modal-body {
- padding: 0px 0px;
- overflow: visible;
- paddi
[ambari] branch branch-2.7 updated: AMBARI-24482 Overlapping text in Recommendations in Configurations page while UI installer. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 6d563b9 AMBARI-24482 Overlapping text in Recommendations in
Configurations page while UI installer. (ababiichuk)
6d563b9 is described below
commit 6d563b971a730d40ae9b63e60ec2f0abe8701b04
Author: ababiichuk
AuthorDate: Wed Aug 15 15:55:12 2018 +0300
AMBARI-24482 Overlapping text in Recommendations in Configurations page
while UI installer. (ababiichuk)
---
ambari-web/app/styles/application.less | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 3f8bd9a..394d94a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2180,13 +2180,15 @@ input[type="radio"].align-checkbox,
input[type="checkbox"].align-checkbox {
table-layout: fixed;
td, th {
&.issue-type-cell {
-width: 5%;
+width: 8%;
}
&.service-name-cell {
width: 15%;
}
&.property-name-cell {
-width: 15%;
+width: 20%;
+overflow: hidden;
+overflow-wrap: break-word;
}
&.property-value-cell {
width: 25%;
@@ -2194,7 +2196,7 @@ input[type="radio"].align-checkbox,
input[type="checkbox"].align-checkbox {
overflow-wrap: break-word;
}
&.property-description-cell {
-width: 40%;
+width: 32%;
}
}
tbody{
[ambari] branch trunk updated: AMBARI-24482 Overlapping text in Recommendations in Configurations page while UI installer. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 55351b8 AMBARI-24482 Overlapping text in Recommendations in
Configurations page while UI installer. (ababiichuk)
55351b8 is described below
commit 55351b80b39920c74fddfc47be6e400d69c53d87
Author: ababiichuk
AuthorDate: Wed Aug 15 15:55:12 2018 +0300
AMBARI-24482 Overlapping text in Recommendations in Configurations page
while UI installer. (ababiichuk)
---
ambari-web/app/styles/application.less | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 37fd1dc..734c5d5 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2181,13 +2181,15 @@ input[type="radio"].align-checkbox,
input[type="checkbox"].align-checkbox {
table-layout: fixed;
td, th {
&.issue-type-cell {
-width: 5%;
+width: 8%;
}
&.service-name-cell {
width: 15%;
}
&.property-name-cell {
-width: 15%;
+width: 20%;
+overflow: hidden;
+overflow-wrap: break-word;
}
&.property-value-cell {
width: 25%;
@@ -2195,7 +2197,7 @@ input[type="radio"].align-checkbox,
input[type="checkbox"].align-checkbox {
overflow-wrap: break-word;
}
&.property-description-cell {
-width: 40%;
+width: 32%;
}
}
tbody{
[ambari] branch trunk updated: AMBARI-24362 Fixes for modal with config validations and dependent properties. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 b7d81b2 AMBARI-24362 Fixes for modal with config validations and
dependent properties. (ababiichuk)
b7d81b2 is described below
commit b7d81b2c523a052b776df28a8d387230c3371f68
Author: ababiichuk
AuthorDate: Thu Jul 26 19:42:48 2018 +0300
AMBARI-24362 Fixes for modal with config validations and dependent
properties. (ababiichuk)
---
ambari-web/app/controllers/main/host/details.js| 184 -
ambari-web/app/controllers/main/service/item.js| 4 +-
.../common/configs/config_recommendations.js | 12 +-
ambari-web/app/styles/application.less | 33 +++-
ambari-web/app/styles/bootstrap_overrides.less | 2 +-
ambari-web/app/styles/common.less | 13 ++
ambari-web/app/styles/modal_popups.less| 13 +-
ambari-web/app/styles/top-nav.less | 4 +-
.../templates/common/configs/services_config.hbs | 4 +-
.../modal_popups/config_recommendation_popup.hbs | 40 ++---
.../common/modal_popups/dependent_configs_list.hbs | 6 +-
.../modal_popups/dependent_configs_table.hbs | 24 +--
ambari-web/app/views/common/modal_popup.js | 13 +-
.../config_validation/config_validation_popup.js | 4 +-
.../modal_popups/dependent_configs_list_popup.js | 45 +++--
.../common/modal_popups/log_file_search_popup.js | 2 +-
.../common/configs/config_recommendations_test.js | 22 ++-
17 files changed, 269 insertions(+), 156 deletions(-)
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index d2c9aca..8a445dd 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -540,9 +540,9 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
header: Em.I18n.t('popup.confirmation.commonHeader'),
controller: this,
hasPropertiesToChange: false,
- classNameBindings:
['controller.hasPropertiesToChange:common-modal-wrapper',
'controller.hasPropertiesToChange:modal-full-width'],
+ classNameBindings:
['controller.hasPropertiesToChange:common-modal-wrapper'],
modalDialogClasses: function () {
-return this.get('controller.hasPropertiesToChange') ? ['modal-lg'] :
[];
+return this.get('controller.hasPropertiesToChange') ? ['modal-xlg'] :
[];
}.property('controller.hasPropertiesToChange'),
primary: Em.I18n.t('hosts.host.deleteComponent.popup.confirm'),
bodyClass: this.get('addDeleteComponentPopupBody').extend({
@@ -808,9 +808,9 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
header: Em.I18n.t('popup.confirmation.commonHeader'),
controller: self,
hasPropertiesToChange: false,
- classNameBindings: ['hasPropertiesToChange:common-modal-wrapper',
'hasPropertiesToChange:modal-full-width'],
+ classNameBindings: ['hasPropertiesToChange:common-modal-wrapper'],
modalDialogClasses: function () {
-return this.get('controller.hasPropertiesToChange') ? ['modal-lg'] :
[];
+return this.get('controller.hasPropertiesToChange') ? ['modal-xlg'] :
[];
}.property('controller.hasPropertiesToChange'),
primary: Em.I18n.t('hosts.host.addComponent.popup.confirm'),
bodyClass: self.get('addDeleteComponentPopupBody').extend({
@@ -990,19 +990,19 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
* @method updateZkConfigs
*/
updateZkConfigs: function (configs) {
-var portValue = configs['zoo.cfg'] && Em.get(configs['zoo.cfg'],
'clientPort');
-var zkPort = typeof portValue === 'undefined' ? '2181' : portValue;
-var infraSolrZnode = configs['infra-solr-env'] ?
Em.get(configs['infra-solr-env'], 'infra_solr_znode') : '/ambari-solr';
-var initializer = App.AddZooKeeperComponentsInitializer;
-var hostComponentsTopology = {
- masterComponentHosts: []
-};
-var propertiesToChange = this.get('allPropertiesToChange');
-var masterComponents = this.bootstrapHostsMapping('ZOOKEEPER_SERVER');
+const portValue = configs['zoo.cfg'] && Em.get(configs['zoo.cfg'],
'clientPort'),
+ zkPort = typeof portValue === 'undefined' ? '2181' : portValue,
+ infraSolrZnode = configs['infra-solr-en
[ambari] branch branch-2.7 updated: AMBARI-24362 Fixes for modal with config validations and dependent properties. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 22c18e5 AMBARI-24362 Fixes for modal with config validations and
dependent properties. (ababiichuk)
22c18e5 is described below
commit 22c18e59a5dd067075d1e407a533297cbd97aefe
Author: ababiichuk
AuthorDate: Thu Jul 26 19:42:48 2018 +0300
AMBARI-24362 Fixes for modal with config validations and dependent
properties. (ababiichuk)
---
ambari-web/app/controllers/main/host/details.js| 184 -
ambari-web/app/controllers/main/service/item.js| 4 +-
.../common/configs/config_recommendations.js | 12 +-
ambari-web/app/styles/application.less | 33 +++-
ambari-web/app/styles/bootstrap_overrides.less | 2 +-
ambari-web/app/styles/common.less | 13 ++
ambari-web/app/styles/modal_popups.less| 13 +-
ambari-web/app/styles/top-nav.less | 4 +-
.../templates/common/configs/services_config.hbs | 4 +-
.../modal_popups/config_recommendation_popup.hbs | 40 ++---
.../common/modal_popups/dependent_configs_list.hbs | 6 +-
.../modal_popups/dependent_configs_table.hbs | 24 +--
ambari-web/app/views/common/modal_popup.js | 13 +-
.../config_validation/config_validation_popup.js | 4 +-
.../modal_popups/dependent_configs_list_popup.js | 45 +++--
.../common/modal_popups/log_file_search_popup.js | 2 +-
.../common/configs/config_recommendations_test.js | 22 ++-
17 files changed, 269 insertions(+), 156 deletions(-)
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index d2c9aca..8a445dd 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -540,9 +540,9 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
header: Em.I18n.t('popup.confirmation.commonHeader'),
controller: this,
hasPropertiesToChange: false,
- classNameBindings:
['controller.hasPropertiesToChange:common-modal-wrapper',
'controller.hasPropertiesToChange:modal-full-width'],
+ classNameBindings:
['controller.hasPropertiesToChange:common-modal-wrapper'],
modalDialogClasses: function () {
-return this.get('controller.hasPropertiesToChange') ? ['modal-lg'] :
[];
+return this.get('controller.hasPropertiesToChange') ? ['modal-xlg'] :
[];
}.property('controller.hasPropertiesToChange'),
primary: Em.I18n.t('hosts.host.deleteComponent.popup.confirm'),
bodyClass: this.get('addDeleteComponentPopupBody').extend({
@@ -808,9 +808,9 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
header: Em.I18n.t('popup.confirmation.commonHeader'),
controller: self,
hasPropertiesToChange: false,
- classNameBindings: ['hasPropertiesToChange:common-modal-wrapper',
'hasPropertiesToChange:modal-full-width'],
+ classNameBindings: ['hasPropertiesToChange:common-modal-wrapper'],
modalDialogClasses: function () {
-return this.get('controller.hasPropertiesToChange') ? ['modal-lg'] :
[];
+return this.get('controller.hasPropertiesToChange') ? ['modal-xlg'] :
[];
}.property('controller.hasPropertiesToChange'),
primary: Em.I18n.t('hosts.host.addComponent.popup.confirm'),
bodyClass: self.get('addDeleteComponentPopupBody').extend({
@@ -990,19 +990,19 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
* @method updateZkConfigs
*/
updateZkConfigs: function (configs) {
-var portValue = configs['zoo.cfg'] && Em.get(configs['zoo.cfg'],
'clientPort');
-var zkPort = typeof portValue === 'undefined' ? '2181' : portValue;
-var infraSolrZnode = configs['infra-solr-env'] ?
Em.get(configs['infra-solr-env'], 'infra_solr_znode') : '/ambari-solr';
-var initializer = App.AddZooKeeperComponentsInitializer;
-var hostComponentsTopology = {
- masterComponentHosts: []
-};
-var propertiesToChange = this.get('allPropertiesToChange');
-var masterComponents = this.bootstrapHostsMapping('ZOOKEEPER_SERVER');
+const portValue = configs['zoo.cfg'] && Em.get(configs['zoo.cfg'],
'clientPort'),
+ zkPort = typeof portValue === 'undefined' ? '2181' : portValue,
+ infraSolrZnode = configs['infra-solr-en
[ambari] branch branch-2.7 updated: AMBARI-24260 Ambari shows success when HBase Decommission/Recommission operations fail. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 9303409 AMBARI-24260 Ambari shows success when HBase
Decommission/Recommission operations fail. (ababiichuk)
9303409 is described below
commit 9303409f70be58eeb9cb53b71a60c8c73b3c35a6
Author: aBabiichuk
AuthorDate: Wed Jul 25 19:45:18 2018 +0300
AMBARI-24260 Ambari shows success when HBase Decommission/Recommission
operations fail. (ababiichuk)
---
ambari-web/app/utils/ajax/ajax.js | 3 +
.../host_component_views/regionserver_view.js | 58 +-
.../host_component_views/regionserver_view_test.js | 218 -
3 files changed, 270 insertions(+), 9 deletions(-)
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 9c36c45..1308c21 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -988,6 +988,9 @@ var urls = {
'real':
'/clusters/{clusterName}/host_components?HostRoles/component_name=NAMENODE&HostRoles/host_name.in({hostNames})&fields=metrics/dfs/namenode',
'mock': '/data/hosts/HDP2/decommission_state.json'
},
+ 'host.host_component.decommission_status_regionserver': {
+'real':
'/clusters/{clusterName}/host_components?HostRoles/component_name=HBASE_MASTER&HostRoles/host_name={hostName}&fields=metrics/hbase/master/liveRegionServersHosts,metrics/hbase/master/deadRegionServersHosts&minimal_response=true'
+ },
'host.region_servers.in_inservice': {
'real':
'/clusters/{clusterName}/host_components?HostRoles/component_name=HBASE_REGIONSERVER&HostRoles/desired_admin_state=INSERVICE&fields=HostRoles/host_name&minimal_response=true',
'mock': ''
diff --git
a/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
b/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
index 8cfb5f5..a2fbecd 100644
---
a/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
+++
b/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
@@ -23,12 +23,64 @@ App.RegionServerComponentView =
App.HostComponentView.extend(App.Decommissionabl
componentForCheckDecommission: 'HBASE_MASTER',
setDesiredAdminState: function (desiredAdminState) {
+this.getRSDecommissionStatus(desiredAdminState);
+ },
+
+ getRSDecommissionStatus: function (desiredAdminState) {
+const hostName = App.HBaseService.find('HBASE').get('master.hostName');
+App.ajax.send({
+ name: 'host.host_component.decommission_status_regionserver',
+ sender: this,
+ data: {
+hostName,
+desiredAdminState
+ },
+ success: 'getRSDecommissionStatusSuccessCallback',
+ error: 'getRSDecommissionStatusErrorCallback'
+});
+ },
+
+ getRSDecommissionStatusSuccessCallback: function (data, opt, params) {
+const {desiredAdminState} = params,
+ hostName = this.get('content.hostName');
+if (data) {
+ const liveRSHostsMetrics = Em.get(data,
'items.0.metrics.hbase.master.liveRegionServersHosts'),
+deadRSHostsMetrics = Em.get(data,
'items.0.metrics.hbase.master.deadRegionServersHosts'),
+liveRSHosts = this.parseRegionServersHosts(liveRSHostsMetrics),
+deadRSHosts = this.parseRegionServersHosts(deadRSHostsMetrics),
+isLiveRS = liveRSHosts.contains(hostName),
+isDeadRS = deadRSHosts.contains(hostName),
+isInServiceDesired = desiredAdminState === 'INSERVICE',
+isDecommissionedDesired = desiredAdminState === 'DECOMMISSIONED';
+ if ((liveRSHosts.length + deadRSHosts.length === 0) ||
(isInServiceDesired && isLiveRS) || (isDecommissionedDesired && isDeadRS)) {
+this.setDesiredAdminStateDefault(desiredAdminState);
+ } else if (isInServiceDesired) {
+this.setStatusAs('RS_DECOMMISSIONED');
+ } else if (isDecommissionedDesired) {
+this.setStatusAs('INSERVICE');
+ }
+} else {
+ this.setDesiredAdminStateDefault(desiredAdminState);
+}
+ },
+
+ getRSDecommissionStatusErrorCallback: function (request, ajaxOptions, error,
opt, params) {
+this.setDesiredAdminStateDefault(params.desiredAdminState);
+ },
+
+ parseRegionServersHosts: function (str) {
+const items = str ? str.split(';') : [],
+ hosts = items.map(item => item.split(',')[0]);
+return hosts;
+ },
+
+ setDesiredAdminStateDefault: function (desiredAdminState) {
switch (desiredAdminState) {
-
[ambari] branch trunk updated: AMBARI-24260 Ambari shows success when HBase Decommission/Recommission operations fail. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 24c1a6e AMBARI-24260 Ambari shows success when HBase
Decommission/Recommission operations fail. (ababiichuk)
24c1a6e is described below
commit 24c1a6eab620445266fa2af3737f081fbebe7959
Author: aBabiichuk
AuthorDate: Wed Jul 25 19:44:51 2018 +0300
AMBARI-24260 Ambari shows success when HBase Decommission/Recommission
operations fail. (ababiichuk)
---
ambari-web/app/utils/ajax/ajax.js | 3 +
.../host_component_views/regionserver_view.js | 58 +-
.../host_component_views/regionserver_view_test.js | 218 -
3 files changed, 270 insertions(+), 9 deletions(-)
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 9c36c45..1308c21 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -988,6 +988,9 @@ var urls = {
'real':
'/clusters/{clusterName}/host_components?HostRoles/component_name=NAMENODE&HostRoles/host_name.in({hostNames})&fields=metrics/dfs/namenode',
'mock': '/data/hosts/HDP2/decommission_state.json'
},
+ 'host.host_component.decommission_status_regionserver': {
+'real':
'/clusters/{clusterName}/host_components?HostRoles/component_name=HBASE_MASTER&HostRoles/host_name={hostName}&fields=metrics/hbase/master/liveRegionServersHosts,metrics/hbase/master/deadRegionServersHosts&minimal_response=true'
+ },
'host.region_servers.in_inservice': {
'real':
'/clusters/{clusterName}/host_components?HostRoles/component_name=HBASE_REGIONSERVER&HostRoles/desired_admin_state=INSERVICE&fields=HostRoles/host_name&minimal_response=true',
'mock': ''
diff --git
a/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
b/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
index 8cfb5f5..a2fbecd 100644
---
a/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
+++
b/ambari-web/app/views/main/host/details/host_component_views/regionserver_view.js
@@ -23,12 +23,64 @@ App.RegionServerComponentView =
App.HostComponentView.extend(App.Decommissionabl
componentForCheckDecommission: 'HBASE_MASTER',
setDesiredAdminState: function (desiredAdminState) {
+this.getRSDecommissionStatus(desiredAdminState);
+ },
+
+ getRSDecommissionStatus: function (desiredAdminState) {
+const hostName = App.HBaseService.find('HBASE').get('master.hostName');
+App.ajax.send({
+ name: 'host.host_component.decommission_status_regionserver',
+ sender: this,
+ data: {
+hostName,
+desiredAdminState
+ },
+ success: 'getRSDecommissionStatusSuccessCallback',
+ error: 'getRSDecommissionStatusErrorCallback'
+});
+ },
+
+ getRSDecommissionStatusSuccessCallback: function (data, opt, params) {
+const {desiredAdminState} = params,
+ hostName = this.get('content.hostName');
+if (data) {
+ const liveRSHostsMetrics = Em.get(data,
'items.0.metrics.hbase.master.liveRegionServersHosts'),
+deadRSHostsMetrics = Em.get(data,
'items.0.metrics.hbase.master.deadRegionServersHosts'),
+liveRSHosts = this.parseRegionServersHosts(liveRSHostsMetrics),
+deadRSHosts = this.parseRegionServersHosts(deadRSHostsMetrics),
+isLiveRS = liveRSHosts.contains(hostName),
+isDeadRS = deadRSHosts.contains(hostName),
+isInServiceDesired = desiredAdminState === 'INSERVICE',
+isDecommissionedDesired = desiredAdminState === 'DECOMMISSIONED';
+ if ((liveRSHosts.length + deadRSHosts.length === 0) ||
(isInServiceDesired && isLiveRS) || (isDecommissionedDesired && isDeadRS)) {
+this.setDesiredAdminStateDefault(desiredAdminState);
+ } else if (isInServiceDesired) {
+this.setStatusAs('RS_DECOMMISSIONED');
+ } else if (isDecommissionedDesired) {
+this.setStatusAs('INSERVICE');
+ }
+} else {
+ this.setDesiredAdminStateDefault(desiredAdminState);
+}
+ },
+
+ getRSDecommissionStatusErrorCallback: function (request, ajaxOptions, error,
opt, params) {
+this.setDesiredAdminStateDefault(params.desiredAdminState);
+ },
+
+ parseRegionServersHosts: function (str) {
+const items = str ? str.split(';') : [],
+ hosts = items.map(item => item.split(',')[0]);
+return hosts;
+ },
+
+ setDesiredAdminStateDefault: function (desiredAdminState) {
switch (desiredAdminState) {
- case &qu
[ambari] branch branch-2.7 updated: AMBARI-24308 'Changed properties' filter for configs is displayed even in non-compare mode. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 fcea976 AMBARI-24308 'Changed properties' filter for configs is
displayed even in non-compare mode. (ababiichuk)
fcea976 is described below
commit fcea9763f856afaffbbf6a001e3cc1b3a7ecebed
Author: ababiichuk
AuthorDate: Thu Jul 19 15:05:30 2018 +0300
AMBARI-24308 'Changed properties' filter for configs is displayed even in
non-compare mode. (ababiichuk)
---
ambari-web/app/controllers/main/service/info/configs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 564758f..49ec591 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -230,7 +230,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.AddSecurityConfi
var filterColumns = [];
this.get('propertyFilters').forEach(function(filter) {
- if (this.get('canBeExcluded') && !(Em.isNone(filter.dependentOn) ||
this.get(filter.dependentOn))) {
+ if (filter.canBeExcluded && !(Em.isNone(filter.dependentOn) ||
this.get(filter.dependentOn))) {
return; // exclude column
}
filterColumns.push(Ember.Object.create({
[ambari] branch branch-2.7 updated: AMBARI-24310 UI sends host check request for custom jdk with invalid hosts. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 4b3611f AMBARI-24310 UI sends host check request for custom jdk with
invalid hosts. (ababiichuk)
4b3611f is described below
commit 4b3611f44cbc179d68ed1867829cf331bbbfa795
Author: ababiichuk
AuthorDate: Thu Jul 19 15:56:12 2018 +0300
AMBARI-24310 UI sends host check request for custom jdk with invalid hosts.
(ababiichuk)
---
ambari-web/app/controllers/wizard/step3_controller.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 18d8e84..f6d9f21 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -725,9 +725,9 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, App.Check
},
doCheckJDK: function () {
-var hostsNames = (!this.get('content.installOptions.manualInstall')) ?
this.get('bootHosts').filterProperty('bootStatus',
'REGISTERED').getEach('name').join(",") :
this.get('bootHosts').getEach('name').join(",");
-var javaHome = this.get('javaHome');
-var jdkLocation = this.get('jdkLocation');
+const hostsNames = this.get('bootHosts').filterProperty('bootStatus',
'REGISTERED').getEach('name').join(','),
+ javaHome = this.get('javaHome'),
+ jdkLocation = this.get('jdkLocation');
App.ajax.send({
name: 'wizard.step3.jdk_check',
sender: this,
[ambari] branch trunk updated: AMBARI-24308 'Changed properties' filter for configs is displayed even in non-compare mode. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 e53aaf6 AMBARI-24308 'Changed properties' filter for configs is
displayed even in non-compare mode. (ababiichuk)
e53aaf6 is described below
commit e53aaf66a651f18fe2e7f4d83a180ec3f726652e
Author: ababiichuk
AuthorDate: Thu Jul 19 15:05:30 2018 +0300
AMBARI-24308 'Changed properties' filter for configs is displayed even in
non-compare mode. (ababiichuk)
---
ambari-web/app/controllers/main/service/info/configs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 564758f..49ec591 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -230,7 +230,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.AddSecurityConfi
var filterColumns = [];
this.get('propertyFilters').forEach(function(filter) {
- if (this.get('canBeExcluded') && !(Em.isNone(filter.dependentOn) ||
this.get(filter.dependentOn))) {
+ if (filter.canBeExcluded && !(Em.isNone(filter.dependentOn) ||
this.get(filter.dependentOn))) {
return; // exclude column
}
filterColumns.push(Ember.Object.create({
[ambari] branch trunk updated: AMBARI-24310 UI sends host check request for custom jdk with invalid hosts. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8bbd90c AMBARI-24310 UI sends host check request for custom jdk with
invalid hosts. (ababiichuk)
8bbd90c is described below
commit 8bbd90cc2e0b53ef40fc75f5c9623eb15df43f04
Author: ababiichuk
AuthorDate: Thu Jul 19 15:56:12 2018 +0300
AMBARI-24310 UI sends host check request for custom jdk with invalid hosts.
(ababiichuk)
---
ambari-web/app/controllers/wizard/step3_controller.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 18d8e84..f6d9f21 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -725,9 +725,9 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, App.Check
},
doCheckJDK: function () {
-var hostsNames = (!this.get('content.installOptions.manualInstall')) ?
this.get('bootHosts').filterProperty('bootStatus',
'REGISTERED').getEach('name').join(",") :
this.get('bootHosts').getEach('name').join(",");
-var javaHome = this.get('javaHome');
-var jdkLocation = this.get('jdkLocation');
+const hostsNames = this.get('bootHosts').filterProperty('bootStatus',
'REGISTERED').getEach('name').join(','),
+ javaHome = this.get('javaHome'),
+ jdkLocation = this.get('jdkLocation');
App.ajax.send({
name: 'wizard.step3.jdk_check',
sender: this,
[ambari] branch branch-2.7 updated: AMBARI-24161 Cannot distinguish components on Host Details page due to shortened display name (Ambari should show full component name on mouse over). (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 6f5e966 AMBARI-24161 Cannot distinguish components on Host Details
page due to shortened display name (Ambari should show full component name on
mouse over). (ababiichuk)
6f5e966 is described below
commit 6f5e966cb372af85b1562d3d608bda708caf301f
Author: ababiichuk
AuthorDate: Thu Jul 19 14:40:02 2018 +0300
AMBARI-24161 Cannot distinguish components on Host Details page due to
shortened display name (Ambari should show full component name on mouse over).
(ababiichuk)
---
ambari-web/app/templates/main/host/details/host_component.hbs | 4 ++--
ambari-web/app/views/main/host/details/host_component_view.js | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/templates/main/host/details/host_component.hbs
b/ambari-web/app/templates/main/host/details/host_component.hbs
index 7ff0425..e2c4d5d 100644
--- a/ambari-web/app/templates/main/host/details/host_component.hbs
+++ b/ambari-web/app/templates/main/host/details/host_component.hbs
@@ -47,9 +47,9 @@
{{#if component.displayNameAdvanced}}
- {{component.getDisplayNameAdvanced}} /
+ {{component.getDisplayNameAdvanced}} /
{{else}}
- {{component.getDisplayName}} /
+ {{component.getDisplayName}} /
{{/if}}
diff --git a/ambari-web/app/views/main/host/details/host_component_view.js
b/ambari-web/app/views/main/host/details/host_component_view.js
index e785259..e560812 100644
--- a/ambari-web/app/views/main/host/details/host_component_view.js
+++ b/ambari-web/app/views/main/host/details/host_component_view.js
@@ -274,6 +274,7 @@ App.HostComponentView = Em.View.extend({
didInsertElement: function () {
App.tooltip($('[rel=componentHealthTooltip]'));
App.tooltip($('[rel=passiveTooltip]'));
+App.tooltip($('[rel=componentNameTooltip]'));
if (this.get('isInProgress')) {
this.doBlinking();
}
[ambari] branch trunk updated: AMBARI-24161 Cannot distinguish components on Host Details page due to shortened display name (Ambari should show full component name on mouse over). (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 9eccc67 AMBARI-24161 Cannot distinguish components on Host Details
page due to shortened display name (Ambari should show full component name on
mouse over). (ababiichuk)
9eccc67 is described below
commit 9eccc67e20edfe387c75804dbf7564d22b49326a
Author: ababiichuk
AuthorDate: Thu Jul 19 14:40:02 2018 +0300
AMBARI-24161 Cannot distinguish components on Host Details page due to
shortened display name (Ambari should show full component name on mouse over).
(ababiichuk)
---
ambari-web/app/templates/main/host/details/host_component.hbs | 4 ++--
ambari-web/app/views/main/host/details/host_component_view.js | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/templates/main/host/details/host_component.hbs
b/ambari-web/app/templates/main/host/details/host_component.hbs
index 7ff0425..e2c4d5d 100644
--- a/ambari-web/app/templates/main/host/details/host_component.hbs
+++ b/ambari-web/app/templates/main/host/details/host_component.hbs
@@ -47,9 +47,9 @@
{{#if component.displayNameAdvanced}}
- {{component.getDisplayNameAdvanced}} /
+ {{component.getDisplayNameAdvanced}} /
{{else}}
- {{component.getDisplayName}} /
+ {{component.getDisplayName}} /
{{/if}}
diff --git a/ambari-web/app/views/main/host/details/host_component_view.js
b/ambari-web/app/views/main/host/details/host_component_view.js
index e785259..e560812 100644
--- a/ambari-web/app/views/main/host/details/host_component_view.js
+++ b/ambari-web/app/views/main/host/details/host_component_view.js
@@ -274,6 +274,7 @@ App.HostComponentView = Em.View.extend({
didInsertElement: function () {
App.tooltip($('[rel=componentHealthTooltip]'));
App.tooltip($('[rel=passiveTooltip]'));
+App.tooltip($('[rel=componentNameTooltip]'));
if (this.get('isInProgress')) {
this.doBlinking();
}
[ambari] branch trunk updated: AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8c150b4 AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)
8c150b4 is described below
commit 8c150b4f2348b2fe371d80fd7606c6220698ccd0
Author: aBabiichuk
AuthorDate: Thu Jul 12 18:55:23 2018 +0300
AMBARI-24280 Fix ambari-admin UI unit tests. (ababiichuk)
---
ambari-admin/pom.xml | 2 --
.../src/main/resources/ui/admin-web/package.json | 9 +++---
.../test/unit/controllers/AppCtrl_test.js | 17 +-
.../controllers/ClusterInformationCtrl_test.js | 6 ++--
.../stackVersions/StackversionsListCtrl_test.js| 2 +-
.../test/unit/directives/comboSearch_test.js | 2 +-
.../test/unit/directives/editablelist_test.js | 37 +-
.../test/unit/services/AddRepositoryModal_test.js | 2 +-
.../test/unit/services/PermissionSaver_test.js | 8 ++---
.../test/unit/services/UnsavedDialog__test.js | 2 +-
.../admin-web/test/unit/services/Utility_test.js | 8 ++---
11 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 281280a..22795b7 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -136,7 +136,6 @@
${args.shell}
${basedir}${dirsep}set-ambari-version.${fileextension.shell}
${ambariVersion}
-
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json
b/ambari-admin/src/main/resources/ui/admin-web/package.json
index ac903c5..0048037 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -19,11 +19,12 @@
"gulp-uglify": "0.2.1",
"gulp-useref": "0.4.2",
"http-server": "0.6.1",
-"karma": "0.12.16",
+"jasmine-core": "^3.1.0",
+"karma": "^2.0.4",
"karma-chrome-launcher": "0.1.4",
-"karma-jasmine": "0.1.5",
-"karma-ng-html2js-preprocessor": "^0.1.0",
-"karma-phantomjs-launcher": "0.1",
+"karma-jasmine": "^1.1.2",
+"karma-ng-html2js-preprocessor": "^1.0.0",
+"karma-phantomjs-launcher": "^1.0.4",
"phantomjs": "^2.1.7",
"protractor": "1.0.0"
},
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
index 1bbe47a..1897269 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
@@ -47,7 +47,7 @@ describe('#AppCtrl', function () {
inject(function (_$httpBackend_, $rootScope, $controller, _$window_,
_Cluster_, _$q_) {
clusterService = _Cluster_;
deferred = _$q_.defer();
- spyOn(clusterService, 'getStatus').andReturn(deferred.promise);
+ spyOn(clusterService, 'getStatus').and.returnValue(deferred.promise);
deferred.resolve({
Clusters: {
provisioning_state: 'INIT'
@@ -132,7 +132,7 @@ describe('#AppCtrl', function () {
describe('signout', function () {
-beforeEach(function () {
+beforeEach(function (done) {
$httpBackend.whenGET(/\/api\/v1\/logout\?_=\d+/).respond(200,{
message: "successfully logged out"
});
@@ -145,20 +145,19 @@ describe('#AppCtrl', function () {
}
]
});
-});
-
-it('should reset window.location and ambari localstorage', function () {
scope.signOut();
+ $httpBackend.flush();
+ done();
+});
- runs(function() {
-chai.expect($window.location.pathname).to.equal('/');
- });
+it('should reset window.location and ambari localstorage', function (done)
{
+ chai.expect($window.location.pathname).to.equal('/');
+ done();
var data = JSON.parse(localStorage.ambari);
chai.expect(data.app.authenticated).to.equal(undefined);
chai.expect(data.app.loginName).to.equal(undefined);
chai.expect(data.app.user).to.equal(undefined);
- $httpBackend.flush();
});
});
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
in
[ambari] branch trunk updated: AMBARI-24221 Add Service Wizard: Next Button is not enabled while adding Ranger after fixing an erroneous property. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 effd430 AMBARI-24221 Add Service Wizard: Next Button is not enabled
while adding Ranger after fixing an erroneous property. (ababiichuk)
effd430 is described below
commit effd430630d247285175952bd34bbb76d9410975
Author: ababiichuk
AuthorDate: Fri Jun 29 16:21:44 2018 +0300
AMBARI-24221 Add Service Wizard: Next Button is not enabled while adding
Ranger after fixing an erroneous property. (ababiichuk)
---
.../app/controllers/wizard/step7_controller.js | 35 +-
ambari-web/test/controllers/wizard/step7_test.js | 4 +++
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 0a8e5b2..abb4a23 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -100,9 +100,13 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
* Is installer controller used
* @type {bool}
*/
- isInstallWizard: function () {
-return this.get('content.controllerName') === 'installerController';
- }.property('content.controllerName'),
+ isInstallWizard: Em.computed.equal('content.controllerName',
'installerController'),
+
+ /**
+ * Is add service controller used
+ * @type {bool}
+ */
+ isAddServiceWizard: Em.computed.equal('content.controllerName',
'addServiceController'),
/**
* List of config groups
@@ -168,7 +172,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
* @type {boolean}
*/
supportsPreInstallChecks: function () {
-return App.get('supports.preInstallChecks') && 'installerController' ===
this.get('content.controllerName');
+return App.get('supports.preInstallChecks') && this.get('isInstallWizard');
}.property('App.supports.preInstallChecks', 'wizardController.name'),
/**
@@ -218,7 +222,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
*/
installedServiceNames: function () {
var serviceNames =
this.get('content.services').filterProperty('isInstalled').mapProperty('serviceName');
-if (this.get('content.controllerName') !== 'installerController') {
+if (!this.get('isInstallWizard')) {
serviceNames = serviceNames.filter(function (_serviceName) {
return !App.get('services.noConfigTypes').contains(_serviceName);
});
@@ -610,7 +614,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
this.updateConfigAttributesFromThemes();
this.checkHostOverrideInstaller();
this.selectProperService();
-var isInstallerWizard = (this.get("content.controllerName") ===
'installerController');
+var isInstallerWizard = this.get('isInstallWizard');
var isRangerServiceAbsent = rangerService &&
!rangerService.get('isInstalled') && !rangerService.get('isSelected');
if (isRangerServiceAbsent) {
var isExternalRangerSetup;
@@ -1630,11 +1634,11 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
this.hide();
parent.hide();
// go back to step 5: assign masters and disable default
navigation warning
- if ('installerController' ===
self.get('content.controllerName')) {
+ if (self.get('isInstallWizard')) {
App.router.get('installerController').gotoStep(5, true);
}
else {
-if ('addServiceController' ===
self.get('content.controllerName')) {
+if (self.get('isAddServiceWizard')) {
App.router.get('addServiceController').gotoStep(2, true);
}
}
@@ -1801,21 +1805,24 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
},
postSubmit: function () {
-var self = this;
this.set('submitButtonClicked', true);
if (this.get('isInstallWizard')) {
this.serverSideValidationCallback();
} else {
- this.serverSideValidation().done(function () {
-self.serverSideValidationCallback();
- }).fail(function (value) {
+ this.serverSideValidation().done(() => {
+this.serverSideValidationCallback();
+ }).fail(val
[ambari] branch trunk updated: AMBARI-24136 Components Filter in "Manage ConfigGroup at Customize Services page" doesn't list hosts correctly
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 d22f30e AMBARI-24136 Components Filter in "Manage ConfigGroup at
Customize Services page" doesn't list hosts correctly
d22f30e is described below
commit d22f30e5fa9ab4da7976665566fbb4dd6cc4da17
Author: ababiichuk
AuthorDate: Mon Jun 18 16:29:01 2018 +0300
AMBARI-24136 Components Filter in "Manage ConfigGroup at Customize Services
page" doesn't list hosts correctly
---
.../service/manage_config_groups_controller.js | 58 --
1 file changed, 20 insertions(+), 38 deletions(-)
diff --git
a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index e46d5f9..3f144be 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -1065,49 +1065,31 @@ App.ManageConfigGroupsController =
Em.Controller.extend(App.ConfigOverridable, {
},
loadInstallerHostsSuccessCallback: function (data) {
-var rawHosts = App.router.get('installerController.content.hosts'),
- masterComponents =
App.router.get('installerController.content.masterComponentHosts'),
+const allHosts =
App.router.get('installerController.allHosts').toMapByProperty('hostName'),
slaveComponents =
App.router.get('installerController.content.slaveComponentHosts'),
- hosts = [];
-masterComponents.forEach(function (component) {
- var host = rawHosts[component.hostName];
- if (host.hostComponents) {
-host.hostComponents.push(Em.Object.create({
- componentName: component.component,
- displayName: component.display_name
-}));
- } else {
-rawHosts[component.hostName].hostComponents = [
- Em.Object.create({
-componentName: component.component,
-displayName: component.display_name
- })
-]
- }
-});
-slaveComponents.forEach(function (component) {
- component.hosts.forEach(function (rawHost) {
-var host = rawHosts[rawHost.hostName];
-if (host.hostComponents) {
- host.hostComponents.push(Em.Object.create({
-componentName: component.componentName,
-displayName: component.displayName
- }));
-} else {
- rawHosts[rawHost.hostName].hostComponents = [
-Em.Object.create({
- componentName: component.componentName,
- displayName: component.displayName
-})
- ]
+ clientComponents = App.router.get('installerController.content.clients'),
+ clients = clientComponents.map(client => ({
+componentName: client.component_name,
+displayName: client.display_name
+ }));
+let hosts = [];
+
+slaveComponents.forEach(component => {
+ component.hosts.forEach(rawHost => {
+let host = allHosts[rawHost.hostName];
+if (!host.hostComponents) {
+ host.hostComponents = [];
+}
+if (component.componentName === 'CLIENT') {
+ host.hostComponents.pushObjects(clients);
}
});
});
-data.items.forEach(function (host) {
- var disksOverallCapacity = 0,
+data.items.forEach(host => {
+ let disksOverallCapacity = 0,
diskFree = 0;
- host.Hosts.disk_info.forEach(function (disk) {
+ host.Hosts.disk_info.forEach(disk => {
disksOverallCapacity += parseFloat(disk.size);
diskFree += parseFloat(disk.available);
});
@@ -1123,7 +1105,7 @@ App.ManageConfigGroupsController =
Em.Controller.extend(App.ConfigOverridable, {
diskInfo: host.Hosts.disk_info,
diskTotal: disksOverallCapacity / (1024 * 1024),
diskFree: diskFree / (1024 * 1024),
-hostComponents: (rawHosts[host.Hosts.host_name] &&
rawHosts[host.Hosts.host_name].hostComponents) || []
+hostComponents: (allHosts[host.Hosts.host_name] &&
allHosts[host.Hosts.host_name].hostComponents) || []
}));
});
[ambari] branch trunk updated: AMBARI-24128 Add notification to the Alert Groups not working. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 5cd6b30 AMBARI-24128 Add notification to the Alert Groups not
working. (ababiichuk)
5cd6b30 is described below
commit 5cd6b30b53f43fc9f24e96c85ae2e1367864c949
Author: ababiichuk
AuthorDate: Sat Jun 16 17:21:25 2018 +0300
AMBARI-24128 Add notification to the Alert Groups not working. (ababiichuk)
---
.../app/mappers/socket/alert_groups_mapper_adapter.js | 15 +++
.../templates/main/alerts/manage_alert_groups_popup.hbs | 1 +
ambari-web/app/views/common/editable_list.js | 8 ++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
b/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
index 58ff0b2..b606076 100644
--- a/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
+++ b/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
@@ -25,11 +25,12 @@ App.alertGroupsMapperAdapter = App.QuickDataMapper.create({
map: function(event) {
event.groups.forEach((alertGroup) => {
if (event.updateType === 'UPDATE' || event.updateType === 'CREATE') {
-const {definitions} = alertGroup;
+const {definitions, targets} = alertGroup;
if (definitions) {
- alertGroup.definitions = definitions.map(id => ({
-id
- }));
+ alertGroup.definitions = this.convertIdsToObjects(definitions);
+}
+if (targets) {
+ alertGroup.targets = this.convertIdsToObjects(targets);
}
App.alertGroupsMapper.map({
items: [
@@ -43,5 +44,11 @@ App.alertGroupsMapperAdapter = App.QuickDataMapper.create({
}
});
App.router.get('manageAlertGroupsController').toggleProperty('changeTrigger');
+ },
+
+ convertIdsToObjects: function (arr) {
+return arr.map(id => ({
+ id
+}));
}
});
diff --git a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
index db9a560..84e78ba 100644
--- a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
+++ b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
@@ -80,6 +80,7 @@
itemsBinding="selectedAlertGroup.notifications"
resourcesBinding="controller.alertNotifications"
nameBinding="selectedAlertGroup.displayName"
+ isCaseSensitive=false
}}
diff --git a/ambari-web/app/views/common/editable_list.js
b/ambari-web/app/views/common/editable_list.js
index b1d187d..636f782 100644
--- a/ambari-web/app/views/common/editable_list.js
+++ b/ambari-web/app/views/common/editable_list.js
@@ -31,6 +31,8 @@ App.EditableList = Ember.View.extend({
typeahead: [],
selectedTypeahed: 0,
+ isCaseSensitive: true,
+
init: function () {
this._super();
this.updateItemsOriginal();
@@ -73,11 +75,13 @@ App.EditableList = Ember.View.extend({
*/
availableItemsToAdd: function () {
var allItems = Em.copy(this.get('resources'));
-var input = this.get('input');
+var isCaseSensitive = this.get('isCaseSensitive');
+var input = isCaseSensitive ? this.get('input') :
this.get('input').toLowerCase();
var toRemove = [];
var existed = this.get('items');
allItems.forEach(function(item) {
- if (item.name.indexOf(input) < 0 || existed.findProperty('name',
item.name)) {
+ var nameToCompare = isCaseSensitive ? item.name :
item.name.toLowerCase();
+ if (nameToCompare.indexOf(input) < 0 || existed.findProperty('name',
item.name)) {
toRemove.push(item);
}
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24114 Ranger server password checks are not performed during Cluster Install Wizard. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 14e8bcd AMBARI-24114 Ranger server password checks are not performed
during Cluster Install Wizard. (ababiichuk)
14e8bcd is described below
commit 14e8bcd5d7c8bfb2c5568372a2af5ff763b61af4
Author: ababiichuk
AuthorDate: Fri Jun 15 16:59:27 2018 +0300
AMBARI-24114 Ranger server password checks are not performed during Cluster
Install Wizard. (ababiichuk)
---
.../app/controllers/wizard/step7_controller.js | 24 +-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 70c8c03..204d4be 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -1900,6 +1900,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
isActive: false,
isDisabled: false,
isSkipped: false,
+validateOnSwitch: false,
tabView: App.CredentialsTabOnStep7View
}),
Em.Object.create({
@@ -1909,6 +1910,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
isActive: false,
isDisabled: false,
isSkipped: false,
+validateOnSwitch: false,
tabView: App.DatabasesTabOnStep7View
}),
Em.Object.create({
@@ -1918,6 +1920,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
isActive: false,
isDisabled: false,
isSkipped: false,
+validateOnSwitch: false,
selectedServiceName: null,
tabView: App.DirectoriesTabOnStep7View
}),
@@ -1928,6 +1931,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
isActive: false,
isDisabled: false,
isSkipped: false,
+validateOnSwitch: false,
tabView: App.AccountsTabOnStep7View
}),
Em.Object.create({
@@ -1937,6 +1941,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
isActive: false,
isDisabled: false,
isSkipped: false,
+validateOnSwitch: true,
selectedServiceName: null,
tabView: App.ServicesConfigView
})
@@ -2117,6 +2122,23 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
updateConfigAttributesFromThemes: function () {
this.get('allSelectedServiceNames').forEach(serviceName =>
this.updateAttributesFromTheme(serviceName));
- }
+ },
+
+ validateOnTabSwitch: function () {
+const activeTab = this.get('tabs')[this.get('currentTabIndex')];
+if (activeTab && activeTab.get('validateOnSwitch')) {
+ if (this.get('requestTimer')) {
+clearTimeout(this.get('requestTimer'));
+ }
+ if (this.get('validationRequest')) {
+this.get('validationRequest').abort();
+ }
+ if (this.get('recommendationsInProgress')) {
+this.valueObserver();
+ } else {
+this.runServerSideValidation().done(() =>
this.set('validationRequest', null));
+ }
+}
+ }.observes('currentTabIndex')
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24102 Update the Manage JN wizard step for multiple nameservice scenario. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 f1334dc AMBARI-24102 Update the Manage JN wizard step for multiple
nameservice scenario. (ababiichuk)
f1334dc is described below
commit f1334dcdee050598019af49c4aef90c6d3f85871
Author: ababiichuk
AuthorDate: Thu Jun 14 15:31:24 2018 +0300
AMBARI-24102 Update the Manage JN wizard step for multiple nameservice
scenario. (ababiichuk)
---
.../journalNode/step3_controller.js| 58 -
.../highAvailability/nameNode/step4_controller.js | 29 +
ambari-web/app/messages.js | 31 +++---
.../admin/highAvailability/journalNode/step3.hbs | 14 +++--
ambari-web/app/utils/ajax/ajax.js | 4 ++
.../highAvailability/journalNode/step3_view.js | 72 +-
6 files changed, 180 insertions(+), 28 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step3_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step3_controller.js
index 6e73fc0..de9fc63 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step3_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step3_controller.js
@@ -19,5 +19,61 @@
var App = require('app');
App.ManageJournalNodeWizardStep3Controller =
App.HighAvailabilityWizardStep4Controller.extend({
- name: 'manageJournalNodeWizardStep3Controller'
+ name: 'manageJournalNodeWizardStep3Controller',
+
+ isActiveNameNodesStarted: true,
+
+ isHDFSNameSpacesLoaded:
Em.computed.alias('App.router.clusterController.isHDFSNameSpacesLoaded'),
+
+ isDataLoadedAndNextEnabled: Em.computed.and('isNextEnabled',
'isHDFSNameSpacesLoaded'),
+
+ pullCheckPointsStatuses: function () {
+if (this.get('isHDFSNameSpacesLoaded')) {
+ this.removeObserver('isHDFSNameSpacesLoaded', this,
'pullCheckPointsStatuses');
+ const hdfsModel = App.HDFSService.find('HDFS'),
+nameSpaces = hdfsModel.get('masterComponentGroups'),
+nameSpacesCount = nameSpaces.length;
+ if (nameSpacesCount > 1) {
+let hostNames =
hdfsModel.get('activeNameNodes').mapProperty('hostName');
+if (hostNames.length < nameSpacesCount) {
+ nameSpaces.forEach(nameSpace => {
+const {hosts} = nameSpace,
+ hasActiveNameNode = hosts.some(hostName =>
hostNames.contains(hostName));
+if (!hasActiveNameNode) {
+ const hostForNameSpace = hosts.find(hostName => {
+ return
App.HostComponent.find(`NAMENODE_${hostName}`).get('workStatus') === 'STARTED';
+}) || hosts[0];
+ hostNames.push(hostForNameSpace);
+}
+ });
+}
+App.ajax.send({
+ name: 'admin.high_availability.getNnCheckPointsStatuses',
+ sender: this,
+ data: {
+hostNames
+ },
+ success: 'checkNnCheckPointsStatuses'
+});
+ } else {
+this.pullCheckPointStatus();
+ }
+} else {
+ this.addObserver('isHDFSNameSpacesLoaded', this,
'pullCheckPointsStatuses');
+}
+ },
+
+ checkNnCheckPointsStatuses: function (data) {
+const items = Em.getWithDefault(data, 'items', []),
+ isNextEnabled = items.length && items.every(this.getNnCheckPointStatus);
+this.setProperties({
+ isActiveNameNodesStarted: items.length &&
items.everyProperty('HostRoles.desired_state', 'STARTED'),
+ isNextEnabled
+});
+if (!isNextEnabled) {
+ window.setTimeout(() => {
+this.pullCheckPointsStatuses();
+ }, this.POLL_INTERVAL);
+}
+ }
});
\ No newline at end of file
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step4_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step4_controller.js
index 5cf3880..2786f00 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step4_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step4_controller.js
@@ -46,19 +46,26 @@ App.HighAvailabilityWizardStep4Controller =
Em.Controller.extend({
checkNnCheckPointStatus: function (data) {
this.set('isNameNodeStarted', data.HostRoles.desired_state === 'STARTED');
-var self = this;
-var journalTransactionInfo = $.parseJSON(Em.get(data,
'metrics.dfs.namenode.JournalTransactionInfo'));
-var isInSafeMode = !Em.isEmpty(Em.get
[ambari] branch trunk updated: AMBARI-24082 Reordering of dashboard widgets doesn't work after enabling NN federation. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 3fbc357 AMBARI-24082 Reordering of dashboard widgets doesn't work
after enabling NN federation. (ababiichuk)
3fbc357 is described below
commit 3fbc357f3a972e2e987c56af17e1aac64d91c828
Author: ababiichuk
AuthorDate: Tue Jun 12 18:13:52 2018 +0300
AMBARI-24082 Reordering of dashboard widgets doesn't work after enabling NN
federation. (ababiichuk)
---
ambari-web/app/views/main/dashboard/widgets.js | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/views/main/dashboard/widgets.js
b/ambari-web/app/views/main/dashboard/widgets.js
index 3fcee73..bcc219f 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -255,6 +255,25 @@ App.MainDashboardWidgetsView = Em.View.extend(App.Persist,
App.LocalStorage, App
});
});
}
+this.get('widgetGroups').forEach(group => {
+ const groupName = group.get('name');
+ group.get('allWidgets').forEach(widgetsSubGroup => {
+const subGroupName = widgetsSubGroup.get('subGroupName'),
+ widgets = widgetsSubGroup.get('widgets'),
+ arrayFromSettings =
newSettings.groups[groupName][subGroupName].visible,
+ isSubGroupForAll = subGroupName === '*',
+ orderedArray = isSubGroupForAll
+? arrayFromSettings.map(widget =>
`${widget.id}-${groupName}-${widget.subGroup}-*`)
+: arrayFromSettings;
+widgetsSubGroup.set('widgets', widgets.sort((widgetA, widgetB) => {
+ const idA = isSubGroupForAll ? widgetA.get('id') :
parseInt(widgetA.get('id')),
+idB = isSubGroupForAll ? widgetB.get('id') :
parseInt(widgetB.get('id')),
+indexA = orderedArray.indexOf(idA),
+indexB = orderedArray.indexOf(idB);
+ return indexA > -1 && indexB > -1 ? indexA - indexB : 0;
+}));
+ });
+});
this.set('userPreferences', newSettings);
this.setDBProperty(this.get('persistKey'), newSettings);
this.postUserPref(this.get('persistKey'), newSettings);
@@ -336,8 +355,9 @@ App.MainDashboardWidgetsView = Em.View.extend(App.Persist,
App.LocalStorage, App
if (!existingEntry) {
preferences.groups[widgetGroupName] = currentEntry;
}
+} else {
+ preferences[state].push(id);
}
-preferences[state].push(id);
}
preferences.threshold[id] = widget.threshold;
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24073 Adding alerts to alert groups not working. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 1ab3bec AMBARI-24073 Adding alerts to alert groups not working.
(ababiichuk)
1ab3bec is described below
commit 1ab3bec90b4ff292a801b7fdcf7c12ecf89c2342
Author: ababiichuk
AuthorDate: Mon Jun 11 16:02:27 2018 +0300
AMBARI-24073 Adding alerts to alert groups not working. (ababiichuk)
---
ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js | 6 ++
.../test/mappers/socket/alert_groups_mapper_adapter_test.js| 10 --
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
b/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
index c325da3..58ff0b2 100644
--- a/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
+++ b/ambari-web/app/mappers/socket/alert_groups_mapper_adapter.js
@@ -25,6 +25,12 @@ App.alertGroupsMapperAdapter = App.QuickDataMapper.create({
map: function(event) {
event.groups.forEach((alertGroup) => {
if (event.updateType === 'UPDATE' || event.updateType === 'CREATE') {
+const {definitions} = alertGroup;
+if (definitions) {
+ alertGroup.definitions = definitions.map(id => ({
+id
+ }));
+}
App.alertGroupsMapper.map({
items: [
{
diff --git a/ambari-web/test/mappers/socket/alert_groups_mapper_adapter_test.js
b/ambari-web/test/mappers/socket/alert_groups_mapper_adapter_test.js
index ab1684e..4163f6a 100644
--- a/ambari-web/test/mappers/socket/alert_groups_mapper_adapter_test.js
+++ b/ambari-web/test/mappers/socket/alert_groups_mapper_adapter_test.js
@@ -40,7 +40,8 @@ describe('App.alertGroupsMapperAdapter', function () {
updateType: 'UPDATE',
groups: [
{
-id: 1
+id: 1,
+definitions: [2]
}
]
};
@@ -48,7 +49,12 @@ describe('App.alertGroupsMapperAdapter', function () {
expect(App.alertGroupsMapper.map.getCall(0).args[0]).to.be.eql({
items: [{
AlertGroup: {
-id: 1
+id: 1,
+definitions: [
+ {
+id: 2
+ }
+]
}
}]
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24051 Save button is disabled after adding the custom property. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 78730df AMBARI-24051 Save button is disabled after adding the custom
property. (ababiichuk)
78730df is described below
commit 78730df4677532a5c9fbba37a301cae588c718a2
Author: ababiichuk
AuthorDate: Thu Jun 7 14:47:51 2018 +0300
AMBARI-24051 Save button is disabled after adding the custom property.
(ababiichuk)
---
.../app/mixins/common/configs/enhanced_configs.js | 172 -
.../configs/service_config_layout_tab_view.js | 111 -
.../views/common/configs/service_config_view.js| 36 -
.../app/views/wizard/step7/databases_tab_view.js | 6 +-
.../app/views/wizard/step7/directories_tab_view.js | 1 -
5 files changed, 172 insertions(+), 154 deletions(-)
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 26ab7db..78e65a9 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -71,8 +71,36 @@ App.EnhancedConfigsMixin =
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
currentlyChangedConfig: null,
dependenciesGroupMessage:
Em.I18n.t('popup.dependent.configs.dependencies.for.groups'),
+
/**
- * message fro alert box for dependent configs
+ * ConfigType-Widget map
+ * key - widget type
+ * value - widget view
+ * @type {object}
+ */
+ widgetTypeMap: {
+checkbox: 'CheckboxConfigWidgetView',
+combo: 'ComboConfigWidgetView',
+directory: 'TextFieldConfigWidgetView',
+directories: 'DirectoryConfigWidgetView',
+list: 'ListConfigWidgetView',
+password: 'PasswordConfigWidgetView',
+'radio-buttons': 'RadioButtonConfigWidgetView',
+slider: 'SliderConfigWidgetView',
+'text-field': 'TextFieldConfigWidgetView',
+'time-interval-spinner': 'TimeIntervalSpinnerView',
+toggle: 'ToggleConfigWidgetView',
+'text-area': 'StringConfigWidgetView',
+'label': 'LabelView',
+'test-db-connection': 'TestDbConnectionWidgetView'
+ },
+
+ configNameWidgetMixinMap: {
+num_llap_nodes: App.NumLlapNodesWidgetMixin
+ },
+
+ /**
+ * message for alert box for dependent configs
* @type {string}
*/
dependenciesMessage: function() {
@@ -611,6 +639,7 @@ App.EnhancedConfigsMixin =
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
},
updateAttributesFromTheme: function (serviceName) {
+this.prepareSectionsConfigProperties(serviceName);
const serviceConfigs = this.get('stepConfigs').findProperty('serviceName',
serviceName).get('configs'),
configConditions = App.ThemeCondition.find().filter(condition => {
const dependentConfigName = condition.get('configName'),
@@ -629,6 +658,110 @@ App.EnhancedConfigsMixin =
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
this.updateAttributesFromConditions(configConditions, serviceConfigs,
serviceName);
},
+ prepareSectionsConfigProperties: function (serviceName) {
+const tabs = App.Tab.find().filterProperty('serviceName', serviceName);
+tabs.forEach(tab => {
+ this.processTab(tab);
+ tab.get('sectionRows').forEach(row => {
+row.forEach(section => {
+ section.get('subsectionRows').forEach(subRow => {
+subRow.forEach(subsection => {
+ this.setConfigsToContainer(subsection);
+ subsection.get('subSectionTabs').forEach(subSectionTab => {
+this.setConfigsToContainer(subSectionTab);
+ });
+});
+ });
+});
+ });
+});
+ },
+
+ /**
+ * set {code} configs {code} array of subsection or subsection tab.
+ * Also correct widget should be used for each config (it's selected
according to widget.type and
+ * widgetTypeMap). It may throw an error if needed widget can't
be found in the widgetTypeMap
+ * @param containerObject
+ */
+ setConfigsToContainer: function (containerObject) {
+containerObject.set('configs', []);
+
+containerObject.get('configProperties').forEach(function (configId) {
+ const config = App.configsCollection.getConfig(configId);
+ if (Em.get(config, 'widgetType')) {
+const stepConfig = this.get('stepConfigs').findProperty('serviceName',
Em.get(config, 'serviceName'));
+if (!stepConfig) return;
+
+const configProp
[ambari] branch trunk updated: AMBARI-24038 HDFS Metrics shows all blocks as 'Corrupt Replicas'. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 3bffd3c AMBARI-24038 HDFS Metrics shows all blocks as 'Corrupt
Replicas'. (ababiichuk)
3bffd3c is described below
commit 3bffd3c2c6902481b36ff9d15fb3bd2d0710ea64
Author: ababiichuk
AuthorDate: Tue Jun 5 21:28:37 2018 +0300
AMBARI-24038 HDFS Metrics shows all blocks as 'Corrupt Replicas'.
(ababiichuk)
---
ambari-web/app/views/main/service/info/summary/hdfs/widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
b/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
index 3071f3d..e6b4e53 100644
--- a/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
+++ b/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
@@ -63,7 +63,7 @@ App.HDFSSummaryWidgetsView =
Em.View.extend(App.NameNodeWidgetMixin, App.HDFSSum
dfsTotalBlocks: Em.computed.formatUnavailable('dfsTotalBlocksValue'),
- dfsCorruptBlocksValue: Em.computed.getByKey('model.dfsTotalBlocksValues',
'hostName'),
+ dfsCorruptBlocksValue: Em.computed.getByKey('model.dfsCorruptBlocksValues',
'hostName'),
dfsCorruptBlocks: Em.computed.formatUnavailable('dfsCorruptBlocksValue'),
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24037 Alerts label isn't clickable at the service page after turning on mm for service. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 009cd2b AMBARI-24037 Alerts label isn't clickable at the service page
after turning on mm for service. (ababiichuk)
009cd2b is described below
commit 009cd2bf675f0ea567a84db2ab681d990f748ffa
Author: ababiichuk
AuthorDate: Tue Jun 5 20:42:27 2018 +0300
AMBARI-24037 Alerts label isn't clickable at the service page after turning
on mm for service. (ababiichuk)
---
ambari-web/app/models/alerts/alert_definition.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/models/alerts/alert_definition.js
b/ambari-web/app/models/alerts/alert_definition.js
index 236a40f..1c4eea0 100644
--- a/ambari-web/app/models/alerts/alert_definition.js
+++ b/ambari-web/app/models/alerts/alert_definition.js
@@ -155,7 +155,7 @@ App.AlertDefinition = DS.Model.extend({
order.forEach(function (state) {
var cnt = summary[state] ? summary[state].count +
summary[state].maintenanceCount : 0;
if (cnt > 0) {
-text = summary[state].latestText;
+text = Em.getWithDefault(summary[state], 'latestText', '');
}
});
return text;
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24020 Remove HDFS Disk Usage widget from host summary page. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 c4b8db5 AMBARI-24020 Remove HDFS Disk Usage widget from host summary
page. (ababiichuk)
c4b8db5 is described below
commit c4b8db50c54581fe93fb089f1e62990cfc5435c8
Author: ababiichuk
AuthorDate: Mon Jun 4 14:45:11 2018 +0300
AMBARI-24020 Remove HDFS Disk Usage widget from host summary page.
(ababiichuk)
---
ambari-web/app/templates/main/host/summary.hbs | 4 ++--
ambari-web/app/views/main/host/summary.js | 10 --
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/ambari-web/app/templates/main/host/summary.hbs
b/ambari-web/app/templates/main/host/summary.hbs
index 2169331..a76a556 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -153,9 +153,9 @@
{{/if}}
{{#if view.hasNameNode}}
-
+
{{#if App.isHaEnabled}}
-{{t dashboard.widgets.nameSpace}}{{#if
view.nameNodeComponent.haNameSpace}}:
{{view.nameNodeComponent.haNameSpace}}{{/if}}
+{{t
dashboard.widgets.nameSpace}}{{#if view.nameNodeComponent.haNameSpace}}:
{{view.nameNodeComponent.haNameSpace}}{{/if}}
{{/if}}
diff --git a/ambari-web/app/views/main/host/summary.js
b/ambari-web/app/views/main/host/summary.js
index ed7a25a..b49b997 100644
--- a/ambari-web/app/views/main/host/summary.js
+++ b/ambari-web/app/views/main/host/summary.js
@@ -80,16 +80,6 @@ App.MainHostSummaryView = Em.View.extend(App.TimeRangeMixin,
{
threshold: widgetsDefinitions.NameNodeHeapPieChartView.threshold,
}
}),
-App.NameNodeCapacityPieChartView.extend({
- model,
- hostName,
- widgetHtmlId: 'nn-capacity',
- title: Em.I18n.t('dashboard.widgets.HDFSDiskUsage'),
- showActions: false,
- widget: {
-threshold:
widgetsDefinitions.NameNodeCapacityPieChartView.threshold
- }
-}),
App.NameNodeCpuPieChartView.extend({
widgetHtmlId: 'nn-cpu',
title: Em.I18n.t('dashboard.widgets.NameNodeCpu'),
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24003 Duplicate data is showing up when enabling NN Federation. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 f20beb6 AMBARI-24003 Duplicate data is showing up when enabling NN
Federation. (ababiichuk)
f20beb6 is described below
commit f20beb60ebed026e0c9e7764fedcd90aeb43bcab
Author: ababiichuk
AuthorDate: Thu May 31 21:50:36 2018 +0300
AMBARI-24003 Duplicate data is showing up when enabling NN Federation.
(ababiichuk)
---
.../app/controllers/global/update_controller.js| 4 +-
ambari-web/app/data/dashboard_widgets.js | 3 +-
ambari-web/app/mappers/service_metrics_mapper.js | 12 ++--
ambari-web/app/messages.js | 3 +-
ambari-web/app/mixins.js | 1 +
.../main/service/summary/hdfs_summary_widgets.js | 29
ambari-web/app/models/service/hdfs.js | 16 ++---
ambari-web/app/styles/application.less | 2 +-
.../templates/main/service/info/summary/base.hbs | 3 +-
.../service/info/summary/hdfs/common_widgets.hbs | 53 +++
.../main/service/info/summary/hdfs/widgets.hbs | 36 ++
.../service/info/summary/master_components.hbs | 3 +
.../app/templates/main/service/services/hdfs.hbs | 6 +-
ambari-web/app/views.js| 1 +
.../views/main/dashboard/widgets/hdfs_capacity.js | 12 ++--
.../service/info/summary/hdfs/common_widgets.js| 77 ++
.../main/service/info/summary/hdfs/widgets.js | 63 ++
ambari-web/app/views/main/service/services/hdfs.js | 3 +
18 files changed, 205 insertions(+), 122 deletions(-)
diff --git a/ambari-web/app/controllers/global/update_controller.js
b/ambari-web/app/controllers/global/update_controller.js
index ec2e3c3..2bcbd08 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -73,8 +73,8 @@ App.UpdateController = Em.Controller.extend({
},
nameNodeMetricsModelProperties: [
-'jvm_memory_heap_max_values', 'jvm_memory_heap_used_values',
'capacity_used_values', 'capacity_total_values',
-'capacity_remaining_values', 'capacity_non_dfs_used_values',
'name_node_rpc_values', 'name_node_start_time_values'
+'jvm_memory_heap_max_values', 'jvm_memory_heap_used_values',
'capacity_used', 'capacity_total',
+'capacity_remaining', 'capacity_non_dfs_used', 'name_node_rpc_values',
'name_node_start_time_values'
],
/**
diff --git a/ambari-web/app/data/dashboard_widgets.js
b/ambari-web/app/data/dashboard_widgets.js
index 85d497a..520e606 100644
--- a/ambari-web/app/data/dashboard_widgets.js
+++ b/ambari-web/app/data/dashboard_widgets.js
@@ -30,8 +30,7 @@ module.exports = [
viewName: 'NameNodeCapacityPieChartView',
sourceName: 'HDFS',
title: Em.I18n.t('dashboard.widgets.HDFSDiskUsage'),
-threshold: [85, 95],
-groupName: 'nn'
+threshold: [85, 95]
},
{
id: 3,
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js
b/ambari-web/app/mappers/service_metrics_mapper.js
index 4832d97..e780d78 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -53,10 +53,10 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
live_data_nodes: 'live_data_nodes',
dead_data_nodes: 'dead_data_nodes',
decommission_data_nodes: 'decommission_data_nodes',
-capacity_used_values: 'capacity_used_values',
-capacity_total_values: 'capacity_total_values',
-capacity_remaining_values: 'capacity_remaining_values',
-capacity_non_dfs_used_values: 'capacity_non_dfs_used_values',
+capacity_used:
'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CapacityUsed',
+capacity_total:
'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CapacityTotal',
+capacity_remaining:
'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CapacityRemaining',
+capacity_non_dfs_used:
'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CapacityNonDFSUsed',
dfs_total_blocks_values: 'dfs_total_blocks_values',
dfs_corrupt_blocks_values: 'dfs_corrupt_blocks_values',
dfs_missing_blocks_values: 'dfs_missing_blocks_values',
@@ -76,10 +76,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
activeNameNodeConfig: {
name_node_start_time_values: 'metrics.runtime.StartTime',
jvm_memory_heap_used_values: 'metr
[ambari] branch trunk updated: AMBARI-23826 Save button is inactive for changed filtered property after configs comparing - addendum (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 b337817 AMBARI-23826 Save button is inactive for changed filtered
property after configs comparing - addendum (ababiichuk)
b337817 is described below
commit b337817798dadc4b516b71c04775174fbdbf9b9a
Author: ababiichuk
AuthorDate: Wed May 30 19:21:46 2018 +0300
AMBARI-23826 Save button is inactive for changed filtered property after
configs comparing - addendum (ababiichuk)
---
.../app/controllers/main/service/info/configs.js | 12 +--
.../app/controllers/wizard/step7_controller.js | 5 ++
.../app/mixins/common/configs/enhanced_configs.js | 94 ++
.../common/configs/widgets/config_widget_view.js | 87 +---
4 files changed, 109 insertions(+), 89 deletions(-)
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index f1fb4f7..564758f 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -403,12 +403,12 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.AddSecurityConfi
},
parseConfigData: function(data) {
-var self = this;
-this.loadKerberosIdentitiesConfigs().done(function(identityConfigs) {
- self.prepareConfigObjects(data, identityConfigs);
- self.loadCompareVersionConfigs(self.get('allConfigs')).done(function() {
-self.addOverrides(data, self.get('allConfigs'));
-self.onLoadOverrides(self.get('allConfigs'));
+this.loadKerberosIdentitiesConfigs().done(identityConfigs => {
+ this.prepareConfigObjects(data, identityConfigs);
+ this.loadCompareVersionConfigs(this.get('allConfigs')).done(() => {
+this.addOverrides(data, this.get('allConfigs'));
+this.onLoadOverrides(this.get('allConfigs'));
+this.updateAttributesFromTheme(this.get('content.serviceName'));
});
});
},
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index c408e7c..70c8c03 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -596,6 +596,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
}
this.set('stepConfigs', serviceConfigs);
this.set('stepConfigsCreated', true);
+this.updateConfigAttributesFromThemes();
this.checkHostOverrideInstaller();
this.selectProperService();
var isInstallerWizard = (this.get("content.controllerName") ===
'installerController');
@@ -2112,6 +2113,10 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
} else {
App.router.send('back');
}
+ },
+
+ updateConfigAttributesFromThemes: function () {
+this.get('allSelectedServiceNames').forEach(serviceName =>
this.updateAttributesFromTheme(serviceName));
}
});
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 78902e8..26ab7db 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -608,5 +608,99 @@ App.EnhancedConfigsMixin =
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
removeCurrentFromDependentList: function (config, saveRecommended) {
var recommendation = this.getRecommendation(config.get('name'),
config.get('filename'), config.get('group.name'));
if (recommendation) this.saveRecommendation(recommendation,
saveRecommended);
+ },
+
+ updateAttributesFromTheme: function (serviceName) {
+const serviceConfigs = this.get('stepConfigs').findProperty('serviceName',
serviceName).get('configs'),
+ configConditions = App.ThemeCondition.find().filter(condition => {
+const dependentConfigName = condition.get('configName'),
+ dependentConfigFileName = condition.get('fileName'),
+ configsToDependOn = condition.getWithDefault('configs', []);
+return serviceConfigs.some(serviceConfig => {
+ const serviceConfigName = Em.get(serviceConfig, 'name'),
+serviceConfigFileName = Em.get(serviceConfig, 'filename');
+ return (serviceConfigName === dependentConfigName &&
serviceConfigFileName === dependentConfigFileName)
+|| configsToDependOn.some(config => {
+ const {configName, fileName} = config;
+
[ambari] branch trunk updated: AMBARI-23951 Selection information disappears when a filter is applied. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 1af8731 AMBARI-23951 Selection information disappears when a filter
is applied. (ababiichuk)
1af8731 is described below
commit 1af8731d61f24456466478b4428c316e98dc5570
Author: ababiichuk
AuthorDate: Fri May 25 15:24:14 2018 +0300
AMBARI-23951 Selection information disappears when a filter is applied.
(ababiichuk)
---
ambari-web/app/mixins/common/table_server_view_mixin.js | 5 ++---
ambari-web/app/templates/main/host.hbs | 4 ++--
ambari-web/app/views/main/host.js | 7 ++-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ambari-web/app/mixins/common/table_server_view_mixin.js
b/ambari-web/app/mixins/common/table_server_view_mixin.js
index 6fdbaa1..9695579 100644
--- a/ambari-web/app/mixins/common/table_server_view_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_view_mixin.js
@@ -65,9 +65,8 @@ App.TableServerViewMixin = Em.Mixin.create({
* @param iColumn
* @param value
* @param type
- * @param preserveSelection
*/
- updateFilter: function (iColumn, value, type, preserveSelection) {
+ updateFilter: function (iColumn, value, type) {
// Do not even trigger update flow if it's a blank update
if (this.isBlankFilterUpdate(iColumn, value, type)) { return; }
@@ -83,7 +82,7 @@ App.TableServerViewMixin = Em.Mixin.create({
this.set('controller.resetStartIndex', true);
//save filter only when it's applied
this.saveFilterConditions(iColumn, value, type, false);
- this.refresh(preserveSelection);
+ this.refresh();
}
return true;
},
diff --git a/ambari-web/app/templates/main/host.hbs
b/ambari-web/app/templates/main/host.hbs
index 86ab272..4b832f0 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -132,11 +132,11 @@
{{#if view.showSelectedFilter}}
-
+
{{view.selectedHosts.length}}
{{pluralize view.selectedHostsCount
singular="t:hosts.filters.selectedHostInfo"
plural="t:hosts.filters.selectedHostsInfo"}}
- - {{t
hosts.filters.clearSelection}}
+ - {{t hosts.filters.clearSelection}}
{{/if}}
{{view App.PaginationView
isDataLoadedBinding="view.filteringComplete"
rowsPerPageSelectViewBinding="view.rowsPerPageSelectView"}}
diff --git a/ambari-web/app/views/main/host.js
b/ambari-web/app/views/main/host.js
index f91af3b..53f2953 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -79,14 +79,11 @@ App.MainHostView =
App.TableView.extend(App.TableServerViewMixin, {
* request latest data filtered by new parameters
* called when trigger property(refreshTriggers) is changed
*/
- refresh: function (preserveSelection) {
+ refresh: function () {
App.loadTimer.start('Hosts Page');
this.set('filteringComplete', false);
var updaterMethodName =
this.get('updater.tableUpdaterMap')[this.get('tableName')];
this.get('updater')[updaterMethodName](this.updaterSuccessCb.bind(this),
this.updaterErrorCb.bind(this), true);
-if (!preserveSelection) {
- this.clearSelection();
-}
return true;
},
@@ -283,7 +280,7 @@ App.MainHostView =
App.TableView.extend(App.TableServerViewMixin, {
*/
filterSelected: function() {
//10 is an index of selected column
-this.updateFilter(10, this.get('selectedHosts'), 'multiple', true);
+this.updateFilter(10, this.get('selectedHosts'), 'multiple');
},
/**
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23937 Reassign Master Wizard issues. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8453f1d AMBARI-23937 Reassign Master Wizard issues. (ababiichuk)
8453f1d is described below
commit 8453f1d4078fda328d9e346456018368b62a0511
Author: ababiichuk
AuthorDate: Wed May 23 20:20:06 2018 +0300
AMBARI-23937 Reassign Master Wizard issues. (ababiichuk)
---
.../app/mixins/wizard/assign_master_components.js | 32 +-
ambari-web/app/routes/reassign_master_routes.js| 1 -
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js
b/ambari-web/app/mixins/wizard/assign_master_components.js
index 79ed6f9..2ac2a59 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -822,7 +822,37 @@ App.AssignMasterComponents =
Em.Mixin.create(App.HostComponentValidationMixin, A
masterComponents.forEach(function (item) {
var masterComponent =
App.StackServiceComponent.find().findProperty('componentName',
item.component_name);
- var componentObj = Em.Object.create(item);
+ var componentObj = Em.Object.create(item, item.nameSpace ? {
+allMasters: result,
+/**
+ * Namespace of NameNode for enabled HDFS federation.
+ * If a new host is assigned to component, looking for other NameNodes
+ * to find which namespace has a 'free' host after this assignment.
+ * NameNodes with new host assigned are excluded from this process
+ * since moving more than one component at once is not allowed.
+ */
+nameSpace: function () {
+ const hostComponent =
App.HostComponent.find(`${this.get('component_name')}_${this.get('selectedHost')}`);
+ if (hostComponent.get('isLoaded')) {
+return hostComponent.get('haNameSpace');
+ } else {
+let nameSpacesCounts = {};
+const allNameSpaces =
this.get('allMasters').filter(masterComponent => {
+ return masterComponent.get('serviceComponentId') !==
this.get('serviceComponentId')
+&&
App.HostComponent.find(`${masterComponent.get('component_name')}_${masterComponent.get('selectedHost')}`).get('isLoaded')
+&& masterComponent.get('nameSpace');
+}).mapProperty('nameSpace');
+allNameSpaces.forEach(nameSpace => {
+ const currentCount = nameSpacesCounts[nameSpace];
+ nameSpacesCounts[nameSpace] = currentCount ? currentCount + 1 :
1;
+});
+const nameSpacesWithMissingHost =
Object.keys(nameSpacesCounts).filter(key => nameSpacesCounts[key] === 1);
+if (nameSpacesWithMissingHost.length === 1) {
+ return nameSpacesWithMissingHost[0];
+}
+ }
+}.property('allMasters.@each.selectedHost')
+ } : {});
var showRemoveControl;
if (masterComponent.get('isMasterWithMultipleInstances')) {
showRemoveControl =
installedServices.contains(masterComponent.get('stackService.serviceName')) &&
diff --git a/ambari-web/app/routes/reassign_master_routes.js
b/ambari-web/app/routes/reassign_master_routes.js
index d7f84ff..26eccc0 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -302,7 +302,6 @@ module.exports = App.WizardRoute.extend({
next: function (router) {
var controller = router.get('reassignMasterController');
controller.finish();
- controller.get('popup').hide();
App.clusterStatus.setClusterStatus({
clusterName:
router.get('reassignMasterController.content.cluster.name'),
clusterState: 'DEFAULT',
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: [AMBARI-23889] [Log Search UI] Exclude filter not working as expected.
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 419bfc3 [AMBARI-23889] [Log Search UI] Exclude filter not working as
expected.
419bfc3 is described below
commit 419bfc3b6e372e530f5e2d1ff4c6deec214e5b93
Author: Tobias Istvan
AuthorDate: Wed May 23 16:00:44 2018 +0200
[AMBARI-23889] [Log Search UI] Exclude filter not working as expected.
---
.../src/app/components/search-box/search-box.component.ts | 3 ---
.../shared/components/dropdown-button/dropdown-button.component.ts | 3 ++-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts
index eb48bf7..62835bb 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts
@@ -140,9 +140,6 @@ export class SearchBoxComponent implements OnInit,
OnDestroy, ControlValueAccess
}
ngOnDestroy(): void {
-// this.parameterNameChangeSubject.unsubscribe();
-// this.parameterAddSubject.unsubscribe();
-// this.updateValueSubject.unsubscribe();
this.subscriptions.forEach((subscription: Subscription) =>
subscription.unsubscribe());
}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
index 403e2d7..ef014e0 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
@@ -108,7 +108,8 @@ export class DropdownButtonComponent {
}
const checkedItems = this.options.filter((option: ListItem): boolean =>
option.isChecked);
this.selection = checkedItems;
-this.selectItem.emit(checkedItems.map((option: ListItem): any =>
option.value));
+const selectedValues = checkedItems.map((option: ListItem): any =>
option.value);
+this.selectItem.emit(this.isMultipleChoice ? selectedValues :
selectedValues.shift());
}
}
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] 02/02: [AMBARI-23897] Log Search UI: login with invalid password – no error message is displayed
This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit abb5295f4ae0f1b0f98f4078dfb7bec9718986f6
Author: Tobias Istvan
AuthorDate: Wed May 23 09:31:46 2018 +0200
[AMBARI-23897] Log Search UI: login with invalid password – no error
message is displayed
---
.../src/app/components/login-form/login-form.component.html | 2 +-
.../src/app/components/login-form/login-form.component.ts | 5 +
.../ambari-logsearch-web/src/app/services/auth.service.ts | 4 ++--
.../ambari-logsearch-web/src/app/services/http-client.service.ts | 2 +-
ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json | 8 +++-
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
index 9e8b2a5..3db75c6 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
@@ -16,7 +16,7 @@
-->
-
+ {{errorMessage}}
{{'authorization.name' | translate}}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
index eee0b1b..d38fe33 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
@@ -76,10 +76,7 @@ export class LoginFormComponent implements OnInit, OnDestroy
{
}
private onLoginError = (resp: Boolean): void => {
-Observable.combineLatest(
- this.translateService.get('login.error.title'),
- this.translateService.get('login.error.message')
-).first().subscribe(([title, message]: [string, string]) => {
+
this.translateService.get('authorization.error.401').first().subscribe((message:
string) => {
this.errorMessage = message;
this.isLoginAlertDisplayed = true;
});
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.ts
index a3ed9b8..b78a88b 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.ts
@@ -81,7 +81,7 @@ export class AuthService {
const response$ = this.httpClient.postFormData('login', {
username: username,
password: password
-}).share();
+});
response$.subscribe(
(resp: Response) => this.onLoginResponse(resp),
(resp: Response) => this.onLoginError(resp)
@@ -103,7 +103,7 @@ export class AuthService {
* @returns {Observable}
*/
logout(): Observable {
-const response$ = this.httpClient.get('logout').share();
+const response$ = this.httpClient.get('logout');
response$.subscribe(
(resp: Response) => this.onLogoutResponse(resp),
(resp: Response) => this.onLogoutError(resp)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
index 19a12ab..c65278b 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
@@ -171,7 +171,7 @@ export class HttpClientService extends Http {
}
return handled;
};
-return super.request(this.generateUrl(url), options).first()
+return super.request(this.generateUrl(url), options).first().share()
.map(response => response)
.catch((error: any) => {
return handleResponseError(error) ? Observable.of(error) :
Observable.throw(error);
diff --git a/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
b/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
index fec6991..ad69e1b 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
+++ b/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
@@ -24,7 +24,9 @@
"authorization.name": "Username",
"authorization.password": "Password",
"authorization.signIn": "Sign In",
- "authorization.error": "Error! Invalid User
credentials.Please try again.",
+ "authorization.error.401": "Unable to sign in. Invalid username/password
combination.",
+
+ "login.title": "Login",
[ambari] 01/02: [AMBARI-23897] Log Search UI: login with invalid password – no error message is displayed
This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 9e07d7460642b36b0d3dd195920ab6aa2a0dd608
Author: Tobias Istvan
AuthorDate: Mon May 21 15:36:53 2018 +0200
[AMBARI-23897] Log Search UI: login with invalid password – no error
message is displayed
---
.../login-form/login-form.component.html | 2 +-
.../login-form/login-form.component.spec.ts| 23
.../components/login-form/login-form.component.ts | 61 --
.../src/app/services/auth.service.ts | 31 ---
.../ambari-logsearch-web/src/assets/i18n/en.json | 2 +
5 files changed, 86 insertions(+), 33 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
index 8b9c957..9e8b2a5 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.html
@@ -16,7 +16,7 @@
-->
-
+
{{'authorization.name' | translate}}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.spec.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.spec.ts
index 7e2f7a7..3ec55fd 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.spec.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.spec.ts
@@ -26,20 +26,23 @@ import {AuthService} from '@app/services/auth.service';
import {LoginFormComponent} from './login-form.component';
import {RouterTestingModule} from '@angular/router/testing';
+import {NotificationsService} from 'angular2-notifications';
+import {NotificationService} from
'@app/modules/shared/services/notification.service';
describe('LoginFormComponent', () => {
let component: LoginFormComponent;
let fixture: ComponentFixture;
const authMock = {
-isError: false
+isError: false,
+isAuthorized: false
};
- const httpClient = {
-isAuthorized: true,
-postFormData: () => {
+
+ const AuthServiceMock = {
+login: () => {
return {
-subscribe: (success: () => void, error: () => void) => {
- authMock.isError ? error() : success();
+subscribe: (observer: (resp) => void, error: (resp) => void) => {
+ authMock.isAuthorized ? observer(authMock.isAuthorized) :
error(authMock.isAuthorized);
}
};
}
@@ -59,10 +62,11 @@ describe('LoginFormComponent', () => {
providers: [
AppStateService,
{
- provide: HttpClientService,
- useValue: httpClient
+ provide: AuthService,
+ useValue: AuthServiceMock
},
-AuthService
+NotificationsService,
+NotificationService
]
})
.compileComponents();
@@ -98,6 +102,7 @@ describe('LoginFormComponent', () => {
describe(test.title, () => {
beforeEach(() => {
authMock.isError = test.isError;
+ authMock.isAuthorized = test.isAuthorized;
component.login();
});
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
index e3570c4..eee0b1b 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/login-form/login-form.component.ts
@@ -16,19 +16,23 @@
* limitations under the License.
*/
-import {Component} from '@angular/core';
+import {Component, ViewChild, OnInit, OnDestroy} from '@angular/core';
import {Response} from '@angular/http';
+import {Observable} from 'rxjs/Observable';
import 'rxjs/add/operator/finally';
+import {Subscription} from 'rxjs/Subscription';
import {AppStateService} from '@app/services/storage/app-state.service';
import {AuthService} from '@app/services/auth.service';
-import {Observable} from 'rxjs/Observable';
+import {NotificationService, NotificationType} from
'@modules/shared/services/notification.service';
+import {TranslateService} from '@ngx-translate/core';
+import {FormGroup} from '@angular/forms';
@Component({
selector: 'login-form',
templateUrl: './login-form.component.html',
styleUrls: ['./login-form.compon
[ambari] branch trunk updated (8a5d252 -> abb5295)
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 8a5d252 Update team page. (yusaku) new 9e07d74 [AMBARI-23897] Log Search UI: login with invalid password – no error message is displayed new abb5295 [AMBARI-23897] Log Search UI: login with invalid password – no error message is displayed The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../login-form/login-form.component.html | 2 +- .../login-form/login-form.component.spec.ts| 23 + .../components/login-form/login-form.component.ts | 58 +++--- .../src/app/services/auth.service.ts | 27 -- .../src/app/services/http-client.service.ts| 2 +- .../ambari-logsearch-web/src/assets/i18n/en.json | 6 +-- 6 files changed, 83 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact ababiic...@apache.org.
[ambari] branch trunk updated: [AMBARI-23918] [Logsearch UI] 'Component' option missing in the autofill in include filter
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 940268f [AMBARI-23918] [Logsearch UI] 'Component' option missing in
the autofill in include filter
940268f is described below
commit 940268fea4385d684c378843750dd82e7da0770b
Author: Tobias Istvan
AuthorDate: Mon May 21 18:03:49 2018 +0200
[AMBARI-23918] [Logsearch UI] 'Component' option missing in the autofill in
include filter
---
.../src/app/components/search-box/search-box.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
index f93f411..5af0eae 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html
@@ -29,7 +29,7 @@
{{activeItem.label | translate}}:
-
[ambari] branch trunk updated: [AMBARI-23916] [Logsearch UI] Rows per page drop down not working as expected
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 488a8c1 [AMBARI-23916] [Logsearch UI] Rows per page drop down not
working as expected
488a8c1 is described below
commit 488a8c165ad6c5cb8ad8d3a81ed21c0fea85d30f
Author: Tobias Istvan
AuthorDate: Mon May 21 16:33:21 2018 +0200
[AMBARI-23916] [Logsearch UI] Rows per page drop down not working as
expected
---
.../shared/components/dropdown-button/dropdown-button.component.ts | 5 ++---
.../shared/components/dropdown-list/dropdown-list.component.ts | 4
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
index cd426a9..403e2d7 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-button/dropdown-button.component.ts
@@ -98,14 +98,13 @@ export class DropdownButtonComponent {
}
});
} else {
-const selectedItem: ListItem = items.find((item: ListItem) =>
item.isChecked);
+const selectedItem: ListItem = Array.isArray(updatedItem) ?
updatedItem[0] : updatedItem;
this.options.forEach((item: ListItem) => {
- item.isChecked = !!selectedItem && this.utils.isEqual(item.value,
selectedItem.value);
+ item.isChecked = this.utils.isEqual(item.value, selectedItem.value);
});
}
} else {
this.options.forEach((item: ListItem) => item.isChecked = false);
- this.selection = [];
}
const checkedItems = this.options.filter((option: ListItem): boolean =>
option.isChecked);
this.selection = checkedItems;
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.ts
index a3e03ac..e20b625 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/dropdown-list/dropdown-list.component.ts
@@ -174,10 +174,6 @@ export class DropdownListComponent implements OnInit,
OnChanges, AfterViewChecke
}
this.separateSelections();
this.selectedItemChange.emit(item);
-if (event) {
- event.preventDefault();
- event.stopPropagation();
-}
}
doItemsCheck() {
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23911 Selection information not present in Hosts page filtering. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 30d9ce0 AMBARI-23911 Selection information not present in Hosts page
filtering. (ababiichuk)
30d9ce0 is described below
commit 30d9ce0c5871d50f671722f1351d2377fd4b28db
Author: ababiichuk
AuthorDate: Mon May 21 14:26:11 2018 +0300
AMBARI-23911 Selection information not present in Hosts page filtering.
(ababiichuk)
---
ambari-web/app/mixins/common/table_server_view_mixin.js | 5 +++--
ambari-web/app/templates/main/host.hbs | 9 +
ambari-web/app/templates/wizard/step3.hbs | 8
ambari-web/app/views/main/host.js | 9 +
ambari-web/app/views/wizard/step3_view.js | 3 +++
5 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ambari-web/app/mixins/common/table_server_view_mixin.js
b/ambari-web/app/mixins/common/table_server_view_mixin.js
index 9695579..6fdbaa1 100644
--- a/ambari-web/app/mixins/common/table_server_view_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_view_mixin.js
@@ -65,8 +65,9 @@ App.TableServerViewMixin = Em.Mixin.create({
* @param iColumn
* @param value
* @param type
+ * @param preserveSelection
*/
- updateFilter: function (iColumn, value, type) {
+ updateFilter: function (iColumn, value, type, preserveSelection) {
// Do not even trigger update flow if it's a blank update
if (this.isBlankFilterUpdate(iColumn, value, type)) { return; }
@@ -82,7 +83,7 @@ App.TableServerViewMixin = Em.Mixin.create({
this.set('controller.resetStartIndex', true);
//save filter only when it's applied
this.saveFilterConditions(iColumn, value, type, false);
- this.refresh();
+ this.refresh(preserveSelection);
}
return true;
},
diff --git a/ambari-web/app/templates/main/host.hbs
b/ambari-web/app/templates/main/host.hbs
index fe6780c..86ab272 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -130,6 +130,15 @@
+ {{#if view.showSelectedFilter}}
+
+
+{{view.selectedHosts.length}}
+{{pluralize view.selectedHostsCount
singular="t:hosts.filters.selectedHostInfo"
plural="t:hosts.filters.selectedHostsInfo"}}
+
+ - {{t
hosts.filters.clearSelection}}
+
+ {{/if}}
{{view App.PaginationView
isDataLoadedBinding="view.filteringComplete"
rowsPerPageSelectViewBinding="view.rowsPerPageSelectView"}}
diff --git a/ambari-web/app/templates/wizard/step3.hbs
b/ambari-web/app/templates/wizard/step3.hbs
index 5290845..bb5ac66 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -120,6 +120,14 @@
+ {{#if view.selectedHostsCount}}
+
+ {{view.selectedHostsCount}}
+ {{pluralize view.selectedHostsCount
singular="t:hosts.filters.selectedHostInfo"
plural="t:hosts.filters.selectedHostsInfo"}}
+
+-
+{{t
hosts.filters.clearSelection}}
+ {{/if}}
{{view App.PaginationView}}
diff --git a/ambari-web/app/views/main/host.js
b/ambari-web/app/views/main/host.js
index e6ca992..f91af3b 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -79,12 +79,14 @@ App.MainHostView =
App.TableView.extend(App.TableServerViewMixin, {
* request latest data filtered by new parameters
* called when trigger property(refreshTriggers) is changed
*/
- refresh: function () {
+ refresh: function (preserveSelection) {
App.loadTimer.start('Hosts Page');
this.set('filteringComplete', false);
var updaterMethodName =
this.get('updater.tableUpdaterMap')[this.get('tableName')];
this.get('updater')[updaterMethodName](this.updaterSuccessCb.bind(this),
this.updaterErrorCb.bind(this), true);
-this.clearSelection();
+if (!preserveSelection) {
+ this.clearSelection();
+}
return true;
},
@@ -255,7 +257,6 @@ App.MainHostView =
App.TableView.extend(App.TableServerViewMixin, {
this.set('selectAllHosts', false);
}
this.combineSelectedFilter();
-//10 is an index of selected column
App.db.setSelectedHosts(this.get('selectedHosts'));
this.addObserver('selectAllHosts', this, this.toggleAllHosts);
@@ -282,7 +283,7 @@ App.MainHostView =
App.
[ambari] branch trunk updated: AMBARI-23840 Log Search UI: Correct the links from Ambari to Log Search
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 73a8c8a AMBARI-23840 Log Search UI: Correct the links from Ambari to
Log Search
73a8c8a is described below
commit 73a8c8ae99d44bf48109ab31bf1d252b10daad02
Author: Istvan Tobias
AuthorDate: Mon May 21 12:29:00 2018 +0200
AMBARI-23840 Log Search UI: Correct the links from Ambari to Log Search
---
.../filter-button/filter-button.component.ts | 4 +-
.../logs-container/logs-container.component.ts | 20 +-
.../filter-dropdown/filter-dropdown.component.ts | 2 +-
.../src/app/services/auth.service.ts | 6 +-
.../src/app/services/logs-container.service.ts | 293 +++--
.../app/services/logs-filtering-utils.service.ts | 225 ++--
.../views/common/host_progress_popup_body_view.js | 2 +-
ambari-web/app/views/main/host/logs_view.js| 2 +-
ambari-web/test/views/main/host/logs_view_test.js | 4 +-
9 files changed, 209 insertions(+), 349 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
index c5e0c2c..5d47604 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
@@ -80,7 +80,9 @@ export class FilterButtonComponent extends
MenuButtonComponent implements Contro
const checkedItems = this.subItems.filter((option: ListItem): boolean =>
option.isChecked);
this.selection = checkedItems;
this.selectItem.emit(checkedItems.map((option: ListItem): any =>
option.value));
-this.dropdownList.doItemsCheck();
+if (this.dropdownList) {
+ this.dropdownList.doItemsCheck();
+}
}
writeValue(items: ListItem[]) {
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts
index 8ab1d49..1211eff 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts
@@ -102,9 +102,11 @@ export class LogsContainerComponent implements OnInit,
OnDestroy {
ngOnInit() {
this.logsContainerService.loadColumnsNames();
+// set te logsType when the activeLogsType state has changed
this.subscriptions.push(
this.appState.getParameter('activeLogsType').subscribe((value: LogsType)
=> this.logsType = value)
);
+// set the hhistogramm data
this.subscriptions.push(
this.serviceLogsHistogramStorage.getAll().subscribe((data: BarGraph[]):
void => {
this.serviceLogsHistogramData =
this.logsContainerService.getGraphData(data,
this.logsContainerService.logLevels.map((
@@ -114,11 +116,13 @@ export class LogsContainerComponent implements OnInit,
OnDestroy {
}));
})
);
+// audit graph data set
this.subscriptions.push(
this.auditLogsGraphStorage.getAll().subscribe((data: BarGraph[]): void
=> {
this.auditLogsGraphData = this.logsContainerService.getGraphData(data);
})
);
+// service log context flag subscription
this.subscriptions.push(
this.appState.getParameter('isServiceLogContextView').subscribe((value:
boolean): void => {
this.isServiceLogContextView = value;
@@ -130,27 +134,28 @@ export class LogsContainerComponent implements OnInit,
OnDestroy {
this.filtersForm.valueChanges
.filter(() =>
!this.logsContainerService.filtersFormSyncInProgress.getValue()).subscribe(this.onFiltersFormChange)
);
-
+// change the active tab when the active tab id changed in the URL
this.subscriptions.push(
this.activatedRoute.params.map((params: {[key: string]: any}) => params
&& params.activeTab)
.subscribe(this.onActiveTabParamChange)
);
-
+// sync to filters form when the query params changed (only when there is
no other way sync)
this.subscriptions.push(
this.activatedRoute.queryParams.filter(() =>
!this.queryParamsSyncInProgress.getValue()).subscribe(this.onQueryParamsChange)
);
+// get the current query params and sync them if any
this.activatedRoute.queryParams.first().subscribe((params) => {
if (!Object.keys(params).length) {
this.syncFiltersToQueryParams(this.filtersForm.value);
}
});
-
+// when the active tab id changed
[ambari] branch trunk updated: AMBARI-23904 ZKFC fails to start while moving Namenode on a cluster with multiple namespaces. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 10664e3 AMBARI-23904 ZKFC fails to start while moving Namenode on a
cluster with multiple namespaces. (ababiichuk)
10664e3 is described below
commit 10664e3b66516cfc04ac124ee00362b1705a6781
Author: ababiichuk
AuthorDate: Fri May 18 21:05:05 2018 +0300
AMBARI-23904 ZKFC fails to start while moving Namenode on a cluster with
multiple namespaces. (ababiichuk)
---
.../app/controllers/main/service/reassign/step3_controller.js | 6 +++---
ambari-web/app/utils/configs/move_namenode_config_initializer.js| 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index 65ccce9..bbc05d1 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -482,7 +482,7 @@ App.ReassignMasterWizardStep3Controller =
Em.Controller.extend({
if (additionalConfigs.hasOwnProperty(site)) {
for (var property in additionalConfigs[site]) {
if (additionalConfigs[site].hasOwnProperty(property)) {
-if (App.get('isHaEnabled') && componentName === 'NAMENODE' &&
(property === 'fs.defaultFS' || property === 'dfs.namenode.rpc-address'))
continue;
+if (App.get('isHaEnabled') && componentName === 'NAMENODE' &&
(['fs.defaultFS', 'dfs.namenode.rpc-address', 'dfs.namenode.http-address',
'dfs.namenode.https-address'].contains(property))) continue;
configs[site][property] =
additionalConfigs[site][property].replace('', replaceValue);
if (!this.get('propertiesToChange').hasOwnProperty(site)) {
@@ -553,9 +553,9 @@ App.ReassignMasterWizardStep3Controller =
Em.Controller.extend({
httpAddressPropertiesNames = propertyNames.filter(propertyName =>
propertyName.startsWith(propertyNameStart)),
matchingPropertyName = httpAddressPropertiesNames.find(propertyName
=>
configsObject[propertyName].startsWith(this.get('content.reassignHosts.source')));
if (matchingPropertyName) {
- const nameSpaceMatch = matchingPropertyName.match(new
RegExp(`${propertyNameStart}(\\w+)`));
+ const nameNodeSuffixMatch = matchingPropertyName.match(new
RegExp(`${propertyNameStart}(\\w+)`));
ret.namespaceId = nameSpace;
- ret.suffix = nameSpaceMatch && nameSpaceMatch[1];
+ ret.suffix = nameNodeSuffixMatch && nameNodeSuffixMatch[1];
break;
}
}
diff --git a/ambari-web/app/utils/configs/move_namenode_config_initializer.js
b/ambari-web/app/utils/configs/move_namenode_config_initializer.js
index 248b902..491923e 100644
--- a/ambari-web/app/utils/configs/move_namenode_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_namenode_config_initializer.js
@@ -30,7 +30,8 @@ App.MoveNameNodeConfigInitializer =
App.MoveComponentConfigInitializerClass.crea
initializers: {
'dfs.namenode.http-address.{{namespaceId}}.{{suffix}}':
App.MoveComponentConfigInitializerClass.getTargetHostConfig(50070),
'dfs.namenode.https-address.{{namespaceId}}.{{suffix}}':
App.MoveComponentConfigInitializerClass.getTargetHostConfig(50470),
-'dfs.namenode.rpc-address.{{namespaceId}}.{{suffix}}':
App.MoveComponentConfigInitializerClass.getTargetHostConfig(8020)
+'dfs.namenode.rpc-address.{{namespaceId}}.{{suffix}}':
App.MoveComponentConfigInitializerClass.getTargetHostConfig(8020),
+'dfs.namenode.servicerpc-address.{{namespaceId}}.{{suffix}}':
App.MoveComponentConfigInitializerClass.getTargetHostConfig(8021),
},
uniqueInitializers: {
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23881 Remove dependency on marked.js 0.3.2 in Ambari Web. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 0460f44 AMBARI-23881 Remove dependency on marked.js 0.3.2 in Ambari
Web. (ababiichuk)
0460f44 is described below
commit 0460f442618255d057627e9595d7561cd30af15b
Author: ababiichuk
AuthorDate: Thu May 17 18:40:08 2018 +0300
AMBARI-23881 Remove dependency on marked.js 0.3.2 in Ambari Web.
(ababiichuk)
---
ambari-web/api-docs/lib/marked.js | 464 --
1 file changed, 290 insertions(+), 174 deletions(-)
diff --git a/ambari-web/api-docs/lib/marked.js
b/ambari-web/api-docs/lib/marked.js
index c2a678d..5552616 100644
--- a/ambari-web/api-docs/lib/marked.js
+++ b/ambari-web/api-docs/lib/marked.js
@@ -1,10 +1,11 @@
/**
* marked - a markdown parser
* Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/chjj/marked
+ * https://github.com/markedjs/marked
*/
-;(function() {
+;(function(root) {
+'use strict';
/**
* Block-Level Grammar
@@ -14,55 +15,60 @@ var block = {
newline: /^\n+/,
code: /^( {4}[^\n]+\n*)+/,
fences: noop,
- hr: /^( *[-*_]){3,} *(?:\n+|$)/,
+ hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
nptable: noop,
- lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
- blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
+ blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing
*(?:\n{2,}|\s*$))/,
- def: /^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
+ def: /^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))?
*(?:\n+|$)/,
table: noop,
- paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
+ lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
+ paragraph: /^([^\n]+(?:\n?(?!hr|heading|lheading| {0,3}>|tag)[^\n]+)+)/,
text: /^[^\n]+/
};
+block._label = /(?:\\[\[\]]|[^\[\]])+/;
+block._title = /(?:"(?:\\"|[^"]|"[^"\n]*")*"|'\n?(?:[^'\n]+\n?)*'|\([^()]*\))/;
+block.def = edit(block.def)
+ .replace('label', block._label)
+ .replace('title', block._title)
+ .getRegex();
+
block.bullet = /(?:[*+-]|\d+\.)/;
block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
-block.item = replace(block.item, 'gm')
- (/bull/g, block.bullet)
- ();
+block.item = edit(block.item, 'gm')
+ .replace(/bull/g, block.bullet)
+ .getRegex();
-block.list = replace(block.list)
- (/bull/g, block.bullet)
- ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
- ('def', '\\n+(?=' + block.def.source + ')')
- ();
-
-block.blockquote = replace(block.blockquote)
- ('def', block.def)
- ();
+block.list = edit(block.list)
+ .replace(/bull/g, block.bullet)
+ .replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\*
*){3,})(?:\\n+|$))')
+ .replace('def', '\\n+(?=' + block.def.source + ')')
+ .getRegex();
block._tag = '(?!(?:'
+ 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
+ '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
- + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
-
-block.html = replace(block.html)
- ('comment', //)
- ('closed', /<(tag)[\s\S]+?<\/\1>/)
- ('closing', /])*?>/)
- (/tag/g, block._tag)
- ();
-
-block.paragraph = replace(block.paragraph)
- ('hr', block.hr)
- ('heading', block.heading)
- ('lheading', block.lheading)
- ('blockquote', block.blockquote)
- ('tag', '<' + block._tag)
- ('def', block.def)
- ();
+ + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b';
+
+block.html = edit(block.html)
+ .replace('comment', //)
+ .replace('closed', /<(tag)[\s\S]+?<\/\1>/)
+ .replace('closing', /\s]*)*?\/?>/)
+ .replace(/tag/g, block._tag)
+ .getRegex();
+
+block.paragraph = edit(block.paragraph)
+ .replace('hr', block.hr)
+ .replace('heading', block.heading)
+ .replace('lheading', block.lheading)
+ .replace('tag', '<' + block._tag)
+ .getRegex();
+
+block.blockquote = edit(block.blockquote)
+ .replace('paragraph', block.paragraph)
+ .getRegex();
/**
* Normal Block Grammar
@@ -75,15 +81,16 @@ block.normal = merge({}, block);
*/
block.gfm = merge({}, block.normal, {
- fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
- paragraph: /^
[ambari] branch trunk updated: AMBARI-23879 Redo the Manage Journalnodes wizard in the context of federation changes. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 9671dd1 AMBARI-23879 Redo the Manage Journalnodes wizard in the
context of federation changes. (ababiichuk)
9671dd1 is described below
commit 9671dd17d83d39589cb05e830ecaffcf2a025086
Author: aBabiichuk
AuthorDate: Thu May 17 17:38:09 2018 +0300
AMBARI-23879 Redo the Manage Journalnodes wizard in the context of
federation changes. (ababiichuk)
---
ambari-web/app/assets/test/tests.js| 1 -
ambari-web/app/controllers.js | 1 -
.../journalNode/step1_controller.js| 12 +
.../journalNode/step4_controller.js| 7 +--
.../journalNode/step5_controller.js| 11 +++-
.../journalNode/step6_controller.js| 13 ++---
.../journalNode/step7_controller.js| 13 ++---
.../journalNode/step8_controller.js| 35 -
.../journalNode/wizard_controller.js | 2 +-
ambari-web/app/messages.js | 47 +
ambari-web/app/routes/manage_journalnode_routes.js | 24 +
.../admin/highAvailability/journalNode/step3.hbs | 8 +--
.../admin/highAvailability/journalNode/step5.hbs | 13 +++--
.../admin/highAvailability/journalNode/step7.hbs | 12 +
.../admin/highAvailability/journalNode/step8.hbs | 18 ---
.../admin/highAvailability/journalNode/wizard.hbs | 5 +-
ambari-web/app/views.js| 1 -
.../highAvailability/journalNode/step5_view.js | 33 +---
.../highAvailability/journalNode/step7_view.js | 9 ++--
.../highAvailability/journalNode/step8_view.js | 29 --
.../journalNode/step4_controller_test.js | 22
.../journalNode/step6_controller_test.js | 55 +++
.../journalNode/step7_controller_test.js | 14 +++--
.../journalNode/step8_controller_test.js | 61 --
24 files changed, 107 insertions(+), 339 deletions(-)
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index 482f046..b8c34de 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -94,7 +94,6 @@ var files = [
'test/controllers/main/admin/highAvailability/journalNode/step4_controller_test',
'test/controllers/main/admin/highAvailability/journalNode/step6_controller_test',
'test/controllers/main/admin/highAvailability/journalNode/step7_controller_test',
-
'test/controllers/main/admin/highAvailability/journalNode/step8_controller_test',
'test/controllers/main/admin/highAvailability/journalNode/wizard_controller_test',
'test/controllers/main/admin/highAvailability/rangerAdmin/step3_controller_test',
'test/controllers/main/dashboard/config_history_controller_test',
diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
index c68d306..bd858a5 100644
--- a/ambari-web/app/controllers.js
+++ b/ambari-web/app/controllers.js
@@ -88,7 +88,6 @@
require('controllers/main/admin/highAvailability/journalNode/step4_controller');
require('controllers/main/admin/highAvailability/journalNode/step5_controller');
require('controllers/main/admin/highAvailability/journalNode/step6_controller');
require('controllers/main/admin/highAvailability/journalNode/step7_controller');
-require('controllers/main/admin/highAvailability/journalNode/step8_controller');
require('controllers/main/admin/stack_and_upgrade_controller');
require('controllers/main/admin/stack_upgrade_history_controller');
require('controllers/main/admin/serviceAccounts_controller');
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
index 197596c..8f914cd 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
@@ -65,6 +65,18 @@ App.ManageJournalNodeWizardStep1Controller =
Em.Controller.extend(App.BlueprintM
},
/**
+ * Override of method from App.AssignMasterComponents
+ * Added to satisfy the requirement that maximum number of new JournalNodes
to be added
+ * should be 1 less that total of the existing JournalNodes
+ * @returns {number}
+ */
+ getMaxNumberOfMasters: function () {
+const defaultLimitation = this._super('JOURNALNODE'),
+ installedJournalNodesCount =
App.HostComponent.find().filterProperty('componentName', '
[ambari] branch trunk updated: AMBARI-23854 NN Federation wizard is stuck on step 3. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 7c26eb6 AMBARI-23854 NN Federation wizard is stuck on step 3.
(ababiichuk)
7c26eb6 is described below
commit 7c26eb609db14c04f8842d6929e90bef37460b5a
Author: ababiichuk
AuthorDate: Tue May 15 20:10:24 2018 +0300
AMBARI-23854 NN Federation wizard is stuck on step 3. (ababiichuk)
---
.../app/controllers/main/admin/federation/step3_controller.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
index b9270cc..50dd211 100644
--- a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
@@ -84,7 +84,7 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
onLoad: function () {
if (this.get('isConfigsLoaded') &&
App.router.get('clusterController.isHDFSNameSpacesLoaded')) {
- var federationConfig = $.extend(true, {},
require('data/configs/wizards/federation_properties').federationConfig);
+ var federationConfig = $.extend(true, {},
require('data/configs/wizards/federation_properties').federationConfig);
if (App.get('hasNameNodeFederation')) {
federationConfig.configs =
federationConfig.configs.rejectProperty('firstRun');
}
@@ -137,7 +137,6 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
var result = [];
var configsToRemove = [];
var hdfsSiteConfigs =
this.get('serverConfigData').items.findProperty('type', 'hdfs-site').properties;
-var coreSiteConfigs =
this.get('serverConfigData').items.findProperty('type', 'core-site').properties;
if (!hdfsSiteConfigs['dfs.namenode.servicerpc-address.' +
dependencies.nameservice1 + '.nn1'] &&
!hdfsSiteConfigs['dfs.namenode.servicerpc-address.' + dependencies.nameservice1
+ '.nn2']) {
configsToRemove = configsToRemove.concat([
@@ -151,13 +150,14 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
if (App.Service.find().someProperty('serviceName', 'RANGER')) {
var hdfsRangerConfigs =
this.get('serverConfigData').items.findProperty('type',
'ranger-hdfs-security').properties;
var reponamePrefix =
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] === '{{repo_name}}' ?
dependencies.clustername + '_hadoop_' :
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] + '_';
+ var coreSiteConfigs =
this.get('serverConfigData').items.findProperty('type', 'core-site').properties;
var defaultFSNS = coreSiteConfigs['fs.defaultFS'].split('hdfs://')[1];
nameServices.forEach(function (nameService) {
configs.push(this.createRangerServiceProperty(nameService,
reponamePrefix, "ranger.tagsync.atlas.hdfs.instance." + App.get('clusterName')
+ ".nameservice." + nameService + ".ranger.service"));
+configs.push(this.createRangerServiceProperty(defaultFSNS,
reponamePrefix, "ranger.tagsync.atlas.hdfs.instance." + App.get('clusterName')
+ ".ranger.service"));
}, this);
}
-configs.push(this.createRangerServiceProperty(defaultFSNS, reponamePrefix,
"ranger.tagsync.atlas.hdfs.instance." + App.get('clusterName') +
".ranger.service"));
configs.forEach(function (config) {
if (!configsToRemove.contains(config.name)) {
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23815 NN Federation wizard: Restart Required Services should not restart JN and ZKFC. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 3e32231 AMBARI-23815 NN Federation wizard: Restart Required Services
should not restart JN and ZKFC. (ababiichuk)
3e32231 is described below
commit 3e3223134877829ebb323b49a7c1943bffedb96e
Author: ababiichuk
AuthorDate: Tue May 15 15:43:32 2018 +0300
AMBARI-23815 NN Federation wizard: Restart Required Services should not
restart JN and ZKFC. (ababiichuk)
---
ambari-web/app/controllers/main/admin/federation/step4_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ambari-web/app/controllers/main/admin/federation/step4_controller.js
b/ambari-web/app/controllers/main/admin/federation/step4_controller.js
index 1859e62..bf340f0 100644
--- a/ambari-web/app/controllers/main/admin/federation/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step4_controller.js
@@ -177,7 +177,7 @@ App.NameNodeFederationWizardStep4Controller =
App.HighAvailabilityProgressPageCo
name: 'restart.custom.filter',
sender: this,
data: {
-filter:
"HostRoles/component_name!=NAMENODE&HostRoles/component_name!=RANGER_ADMIN&HostRoles/component_name!=RANGER_USERSYNC&HostRoles/cluster_name="
+ App.get('clusterName'),
+filter:
"HostRoles/component_name!=NAMENODE&HostRoles/component_name!=JOURNALNODE&HostRoles/component_name!=ZKFC&HostRoles/component_name!=RANGER_ADMIN&HostRoles/component_name!=RANGER_USERSYNC&HostRoles/cluster_name="
+ App.get('clusterName'),
context: "Restart Required Services"
},
success: 'startPolling',
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23843 unable to differentiate b/w new added service and existing service. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 d1cb6f0 AMBARI-23843 unable to differentiate b/w new added service
and existing service. (ababiichuk)
d1cb6f0 is described below
commit d1cb6f066da447eda8049455a52a741ebbafdf7e
Author: ababiichuk
AuthorDate: Tue May 15 14:39:37 2018 +0300
AMBARI-23843 unable to differentiate b/w new added service and existing
service. (ababiichuk)
---
ambari-web/app/styles/wizard.less | 6 ++
1 file changed, 6 insertions(+)
diff --git a/ambari-web/app/styles/wizard.less
b/ambari-web/app/styles/wizard.less
index d20adfd..bb43d10 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -533,6 +533,12 @@
display: inline-block;
margin: 2px;
}
+.assigned-service {
+ background-color: @maintenance-grey;
+ &:hover {
+background-color: @maintenance-grey;
+ }
+}
.new-service {
background-color: @green;
}
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23801 Unable to add Hive Metastore from Host detail Page. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 475b113 AMBARI-23801 Unable to add Hive Metastore from Host detail
Page. (ababiichuk)
475b113 is described below
commit 475b113c7b4eca19cd4f03feb13f13531c8f25c0
Author: ababiichuk
AuthorDate: Fri May 11 15:00:15 2018 +0300
AMBARI-23801 Unable to add Hive Metastore from Host detail Page.
(ababiichuk)
---
ambari-web/app/controllers/main/host/details.js| 79 +++---
.../test/controllers/main/host/details_test.js | 76 +
2 files changed, 117 insertions(+), 38 deletions(-)
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index 72a0010..b517e61 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1159,20 +1159,16 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
* @method loadWebHCatConfigs
*/
loadWebHCatConfigs: function (data, opt, params) {
-var request = App.ajax.send({
- name: 'admin.get.all_configurations',
- sender: this,
- data: {
-webHCat: true,
-urlParams: [
- '(type=hive-site&tag=' +
data.Clusters.desired_configs['hive-site'].tag + ')',
- '(type=webhcat-site&tag=' +
data.Clusters.desired_configs['webhcat-site'].tag + ')',
- '(type=hive-env&tag=' +
data.Clusters.desired_configs['hive-env'].tag + ')',
- '(type=core-site&tag=' +
data.Clusters.desired_configs['core-site'].tag + ')'
-].join('|')
- },
- success: params.callback
-});
+const urlParams = this.getUrlParamsForConfigsRequest(data, ['hive-site',
'webhcat-site', 'hive-env', 'core-site']),
+ request = App.ajax.send({
+name: 'admin.get.all_configurations',
+sender: this,
+data: {
+ webHCat: true,
+ urlParams
+},
+success: params.callback
+ });
this.trackRequest(request);
return request;
},
@@ -1185,19 +1181,15 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
* @method loadHiveConfigs
*/
loadHiveConfigs: function (data, opt, params) {
-var request = App.ajax.send({
- name: 'admin.get.all_configurations',
- sender: this,
- data: {
-urlParams: [
- '(type=hive-site&tag=' +
data.Clusters.desired_configs['hive-site'].tag + ')',
- '(type=webhcat-site&tag=' +
data.Clusters.desired_configs['webhcat-site'].tag + ')',
- '(type=hive-env&tag=' +
data.Clusters.desired_configs['hive-env'].tag + ')',
- '(type=core-site&tag=' +
data.Clusters.desired_configs['core-site'].tag + ')'
-].join('|')
- },
- success: params.callback
-});
+const urlParams = this.getUrlParamsForConfigsRequest(data, ['hive-site',
'webhcat-site', 'hive-env', 'core-site']),
+ request = App.ajax.send({
+name: 'admin.get.all_configurations',
+sender: this,
+data: {
+ urlParams
+},
+success: params.callback
+ });
this.trackRequest(request);
return request;
},
@@ -1406,17 +1398,15 @@ App.MainHostDetailsController =
Em.Controller.extend(App.SupportClientConfigsDow
* @method loadRangerConfigs
*/
loadRangerConfigs: function (data, opt, params) {
-var request = App.ajax.send({
- name: 'admin.get.all_configurations',
- sender: this,
- data: {
-urlParams: '(type=core-site&tag=' +
data.Clusters.desired_configs['core-site'].tag + ')|' +
-'(type=hdfs-site&tag=' +
data.Clusters.desired_configs['hdfs-site'].tag + ')|' +
-'(type=kms-env&tag=' + data.Clusters.desired_configs['kms-env'].tag +
')|' +
-'(type=kms-site&tag=' + data.Clusters.desired_configs['kms-site'].tag
+ ')'
- },
- success: params.callback
-});
+const urlParams = this.getUrlParamsForConfigsRequest(data, ['core-site',
'hdfs-site', 'kms-env', 'kms-site']),
+ request = App.ajax.send({
+name: 'admin.get.all_configurations',
+sender: this,
+data: {
+
[ambari] branch trunk updated: [AMBARI-23757] - [Logsearch UI] Component filter 'All' not refreshing logs after selecting an individual component
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 e0b6824 [AMBARI-23757] - [Logsearch UI] Component filter 'All' not
refreshing logs after selecting an individual component
e0b6824 is described below
commit e0b682420559de568275e382bbd70d60f3c3f7f1
Author: Istvan Tobias
AuthorDate: Thu May 10 21:53:18 2018 +0200
[AMBARI-23757] - [Logsearch UI] Component filter 'All' not refreshing logs
after selecting an individual component
---
.../filter-button/filter-button.component.ts | 43 +++---
.../menu-button/menu-button.component.html | 2 +-
.../menu-button/menu-button.component.ts | 19 +++---
.../dropdown-button/dropdown-button.component.ts | 41 -
.../dropdown-list/dropdown-list.component.ts | 42 +++--
5 files changed, 96 insertions(+), 51 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
index ffe5440..c5e0c2c 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts
@@ -55,28 +55,43 @@ export class FilterButtonComponent extends
MenuButtonComponent implements Contro
}
}
- updateSelection(item: ListItem): void {
-if (this.isMultipleChoice) {
- const itemIndex = this.subItems.findIndex((option: ListItem): boolean =>
{
-return this.utils.isEqual(option.value, item.value);
- });
- if (itemIndex > -1) {
-this.subItems[itemIndex].isChecked = item.isChecked;
-this.selection = this.subItems.filter((option: ListItem): boolean =>
option.isChecked);
+ updateSelection(updatedItem: ListItem | ListItem[]): void {
+if (updatedItem) {
+ const items: ListItem[] = Array.isArray(updatedItem) ? updatedItem :
[updatedItem];
+ if (this.isMultipleChoice) {
+items.forEach((item: ListItem) => {
+ if (this.subItems && this.subItems.length) {
+const itemToUpdate: ListItem = this.subItems.find((option:
ListItem) => this.utils.isEqual(option.value, item.value));
+if (itemToUpdate) {
+ itemToUpdate.isChecked = item.isChecked;
+}
+ }
+});
+ } else {
+const selectedItem: ListItem = items.find((item: ListItem) =>
item.isChecked);
+this.subItems.forEach((item: ListItem) => {
+ item.isChecked = !!selectedItem && this.utils.isEqual(item.value,
selectedItem.value);
+});
}
-} else if (!this.utils.isEqual(this.selection[0], item)) {
- this.selection = [item];
+} else {
+ this.subItems.forEach((item: ListItem) => item.isChecked = false);
+ this.selection = [];
}
+const checkedItems = this.subItems.filter((option: ListItem): boolean =>
option.isChecked);
+this.selection = checkedItems;
+this.selectItem.emit(checkedItems.map((option: ListItem): any =>
option.value));
+this.dropdownList.doItemsCheck();
}
writeValue(items: ListItem[]) {
if (items && items.length) {
- items.forEach((item) => {
-this.updateSelection({
+ const listItems: ListItem[] = items.map((item: ListItem) => {
+return {
...item,
- isChecked: true
-});
+isChecked: true
+};
});
+ this.updateSelection(listItems);
}
}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html
index 27c..7061def 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html
@@ -27,6 +27,6 @@
(selectedItemChange)="onDropdownItemChange($event)"
[isMultipleChoice]="isMultipleChoice"
[additionalLabelComponentSetter]="additionalLabelComponentSetter"
[ngClass]="'dropdown-menu' + (isRightAlign ? ' dropdown-menu-right' :
'') + (listClass ? ' ' + listClass : '')"
- [useLocalFilter]="useDropDownLocalFilter"
+ [useLocalFilter]="useDropDownLocalFilter" #dropdownList
>
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.ts
b/ambari-logsearch/ambari-logsear
[ambari] branch trunk updated: AMBARI-23810 Alerts icon is absent in service page if no alerts present. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 3d95ddd AMBARI-23810 Alerts icon is absent in service page if no
alerts present. (ababiichuk)
3d95ddd is described below
commit 3d95ddd1a160715145434230ab5793999131aa0a
Author: ababiichuk
AuthorDate: Thu May 10 18:13:16 2018 +0300
AMBARI-23810 Alerts icon is absent in service page if no alerts present.
(ababiichuk)
---
ambari-web/app/styles/alerts.less | 5 -
ambari-web/app/styles/application.less | 5 +
ambari-web/app/templates/main/service/info/summary.hbs | 10 --
ambari-web/app/views/main/service/info/summary.js | 4
ambari-web/test/views/main/service/info/summary_test.js | 4
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ambari-web/app/styles/alerts.less
b/ambari-web/app/styles/alerts.less
index a3fdf6d..c1b84b5 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -365,7 +365,7 @@
}
.service-block .summary-box-header {
- .alerts-crit-count, .alerts-warn-count, .no-alerts-label {
+ .alerts-crit-count, .alerts-warn-count, .no-alerts-label, .alerts-none-count
{
padding: 3px 5px;
font-size: 10px;
border-radius: 50%;
@@ -411,6 +411,9 @@
.label.alerts-warn-count {
background: @health-status-orange;
}
+.label.alerts-none-count {
+ background: @top-nav-ops-count-bg-color;
+}
.label.no-alerts-label {
background: @health-status-green;
}
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 99ccc8a..0c6d524 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -448,6 +448,11 @@ table.diff {
cursor: pointer;
}
+.alerts-none-count {
+ margin-left: 0;
+ cursor: pointer;
+}
+
.health-status-HEALTHY, .health-status-LIVE, .health-status-STARTING,
.health-status-started, .health-status-starting {
color: @health-status-green;
}
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs
b/ambari-web/app/templates/main/service/info/summary.hbs
index 39c70f5..c100fca 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -57,12 +57,10 @@
{{#if view.hasAlertDefinitions}}
-{{#if view.alertsCount}}
-
-
-{{view.alertsCount}}
-
-{{/if}}
+
+
+ {{view.alertsCount}}
+
{{/if}}
diff --git a/ambari-web/app/views/main/service/info/summary.js
b/ambari-web/app/views/main/service/info/summary.js
index df7dc91..8ebfb92 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -353,8 +353,12 @@ App.MainServiceInfoSummaryView = Em.View.extend({
alertsCount: Em.computed.alias('controller.content.alertsCount'),
+ hasNoAlerts: Em.computed.equal('alertsCount', 0),
+
hasCriticalAlerts: Em.computed.alias('controller.content.hasCriticalAlerts'),
+ hasNonCriticalAlertsOnly: Em.computed.and('!hasNoAlerts',
'!hasCriticalAlerts'),
+
/**
* Define if service has alert definitions defined
* @type {Boolean}
diff --git a/ambari-web/test/views/main/service/info/summary_test.js
b/ambari-web/test/views/main/service/info/summary_test.js
index 20ec3dd..03ec08b 100644
--- a/ambari-web/test/views/main/service/info/summary_test.js
+++ b/ambari-web/test/views/main/service/info/summary_test.js
@@ -44,6 +44,10 @@ describe('App.MainServiceInfoSummaryView', function() {
App.TestAliases.testAsComputedAlias(view, 'hasCriticalAlerts',
'controller.content.hasCriticalAlerts', 'boolean');
+ App.TestAliases.testAsComputedEqual(view, 'hasNoAlerts', 'alertsCount', 0);
+
+ App.TestAliases.testAsComputedAnd(view, 'hasNonCriticalAlertsOnly',
['!hasNoAlerts', '!hasCriticalAlerts']);
+
describe('#servers', function () {
it('services shouldn\'t have servers except FLUME and ZOOKEEPER', function
() {
expect(view.get('servers')).to.be.empty;
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23809 Identical sets of capacity scheduler properties are displayed as unequal ones in configs comparison view. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 aefd00a AMBARI-23809 Identical sets of capacity scheduler properties
are displayed as unequal ones in configs comparison view. (ababiichuk)
aefd00a is described below
commit aefd00ac5c1e119afee6ccd39a5284600e794b98
Author: ababiichuk
AuthorDate: Thu May 10 17:03:36 2018 +0300
AMBARI-23809 Identical sets of capacity scheduler properties are displayed
as unequal ones in configs comparison view. (ababiichuk)
---
ambari-web/app/mappers/configs/stack_config_properties_mapper.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ambari-web/app/mappers/configs/stack_config_properties_mapper.js
b/ambari-web/app/mappers/configs/stack_config_properties_mapper.js
index 153907c..ec9d550 100644
--- a/ambari-web/app/mappers/configs/stack_config_properties_mapper.js
+++ b/ambari-web/app/mappers/configs/stack_config_properties_mapper.js
@@ -147,6 +147,9 @@ App.stackConfigPropertiesMapper =
App.QuickDataMapper.create({
staticConfigInfo.description =
App.config.getDescription(staticConfigInfo.description,
staticConfigInfo.displayType);
staticConfigInfo.name = JSON.parse('"' + staticConfigInfo.name +
'"');
staticConfigInfo.isUserProperty = false;
+ if (Em.isNone(staticConfigInfo.index)) {
+staticConfigInfo.index = Infinity;
+ }
App.configsCollection.add(staticConfigInfo);
}, this);
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23759 [Logsearch UI] Log graph gets filled with log level icons on clicking inside the graph
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 9457384 AMBARI-23759 [Logsearch UI] Log graph gets filled with log
level icons on clicking inside the graph
9457384 is described below
commit 94573842ed1985b8036df990963f98e7b448cb1a
Author: Istvan Tobias
AuthorDate: Thu May 10 13:41:49 2018 +0200
AMBARI-23759 [Logsearch UI] Log graph gets filled with log level icons on
clicking inside the graph
---
.../components/graph/time-graph.component.ts | 24
.../audit-logs-entries.component.spec.ts | 6 +++-
.../audit-logs-table.component.spec.ts | 6 +++-
.../cluster-filter.component.spec.ts | 6 +++-
.../context-menu/context-menu.component.spec.ts| 6 +++-
.../filters-panel/filters-panel.component.spec.ts | 8 --
.../log-context/log-context.component.spec.ts | 6 +++-
.../logs-container.component.spec.ts | 6 +++-
.../time-range-picker.component.spec.ts| 6 +++-
.../components/top-menu/top-menu.component.spec.ts | 6 +++-
.../dropdown-button.component.spec.ts | 8 --
.../dropdown-list/dropdown-list.component.spec.ts | 6 +++-
.../filter-dropdown.component.spec.ts | 6 +++-
.../services/component-generator.service.spec.ts | 6 +++-
.../app/services/history-manager.service.spec.ts | 8 --
.../app/services/logs-container.service.spec.ts| 6 +++-
.../src/app/services/logs-container.service.ts | 33 +++---
.../ambari-logsearch-web/src/assets/i18n/en.json | 2 ++
18 files changed, 121 insertions(+), 34 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.ts
index 381c9cf..a20ac36 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.ts
@@ -32,6 +32,13 @@ export class TimeGraphComponent extends GraphComponent
implements OnInit {
@Input()
historyStartEndTimeFormat: string = ', DD, ';
+ @Input()
+ defaultChartTimeGap: ChartTimeGap = {
+value: 1,
+unit: 'h',
+label: 'filter.timeRange.1hr'
+ };
+
@Output()
selectArea: EventEmitter = new EventEmitter();
@@ -155,7 +162,7 @@ export class TimeGraphComponent extends GraphComponent
implements OnInit {
* Simply reset the time gap property to null.
*/
protected resetChartTimeGap(): void {
-this.chartTimeGap = null;
+this.chartTimeGap = this.defaultChartTimeGap;
}
/**
@@ -164,7 +171,10 @@ export class TimeGraphComponent extends GraphComponent
implements OnInit {
* @param {Date} endDate
*/
protected setChartTimeGap(startDate: Date, endDate: Date): void {
-this.chartTimeGap = this.getTimeGap(startDate, endDate);
+const gap: ChartTimeGap = this.getTimeGap(startDate, endDate);
+if (gap.value > 0) {
+ this.chartTimeGap = gap;
+}
}
protected getTimeRangeByXRanges(startX: number, endX: number): [number,
number] {
@@ -234,10 +244,12 @@ export class TimeGraphComponent extends GraphComponent
implements OnInit {
const dragAreaDetails = this.dragArea.node().getBBox();
const startX = Math.max(0, dragAreaDetails.x);
const endX = Math.min(this.width, dragAreaDetails.x +
dragAreaDetails.width);
-const dateRange: [number, number] = this.getTimeRangeByXRanges(startX,
endX);
-this.selectArea.emit(dateRange);
-this.dragArea.remove();
-this.setChartTimeGap(new Date(dateRange[0]), new Date(dateRange[1]));
+if (endX !== startX) {
+ const dateRange: [number, number] =
this.getTimeRangeByXRanges(startX, endX);
+ this.selectArea.emit(dateRange);
+ this.dragArea.remove();
+ this.setChartTimeGap(new Date(dateRange[0]), new Date(dateRange[1]));
+}
})
);
d3.selectAll(`svg#${this.svgId} .value, svg#${this.svgId}
.axis`).call(d3.drag().on('start', (): void => {
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-entries/audit-logs-entries.component.spec.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-entries/audit-logs-entries.component.spec.ts
index 5f65c28..51d1fda 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-entries/audit-logs-entries.component.spec.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-entries/audit-logs-entries.component.spec.ts
@@ -44,6 +44,8 @@ import {RouterTestingModule} from '
[ambari] branch trunk updated: [AMBARI-23779] - [Log Search UI] limitation for number of URL paramater value length
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 1b6a473 [AMBARI-23779] - [Log Search UI] limitation for number of URL
paramater value length
1b6a473 is described below
commit 1b6a473241a9648664f550233b3c3e2d43d0a300
Author: Istvan Tobias
AuthorDate: Wed May 9 11:56:21 2018 +0200
[AMBARI-23779] - [Log Search UI] limitation for number of URL paramater
value length
---
.../src/app/services/http-client.service.ts| 46 +-
.../src/app/services/mock-api-data.service.ts | 34 +-
.../src/mockdata/mock-data-common.ts | 118 +-
.../src/mockdata/mock-data-get.ts | 68 +-
.../src/mockdata/mock-data-post.ts | 1649 +++-
5 files changed, 1806 insertions(+), 109 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
index 8c222e0..19a12ab 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts
@@ -104,6 +104,17 @@ export class HttpClientService extends Http {
super(backend, defaultOptions);
}
+ /**
+ * The goal here is to check if the given real api url should be always POST
or not.\
+ * See https://issues.apache.org/jira/browse/AMBARI-23779
+ * @param {string} url The full url for the api end point.
+ * @returns {boolean}
+ */
+ private shouldTurnGetToPost(url: string): boolean {
+const subUrl = url.replace(this.apiPrefix, '');
+return /^(audit|service)/.test(subUrl);
+ }
+
private generateUrlString(url: string, urlVariables?:
HomogeneousObject): string {
const preset = this.endPoints[url];
let generatedUrl: string;
@@ -153,23 +164,50 @@ export class HttpClientService extends Http {
request(url: string | Request, options?: RequestOptionsArgs):
Observable {
const handleResponseError = (error) => {
- let handled: boolean = false;
+ let handled = false;
if (this.unauthorizedStatuses.indexOf(error.status) > -1) {
this.appState.setParameter('isAuthorized', false);
handled = true;
}
return handled;
};
-const req: Observable = super.request(this.generateUrl(url),
options).first()
+return super.request(this.generateUrl(url), options).first()
.map(response => response)
.catch((error: any) => {
return handleResponseError(error) ? Observable.of(error) :
Observable.throw(error);
});
-return req;
}
get(url: string, params?: HomogeneousObject, urlVariables?:
HomogeneousObject): Observable {
-return super.get(this.generateUrlString(url, urlVariables),
this.generateOptions(url, params));
+const generatedUrl: string = this.generateUrlString(url, urlVariables);
+let response$: Observable;
+const options = this.generateOptions(url, params);
+if (this.shouldTurnGetToPost(generatedUrl)) {
+ let body = (options && options.params) || params || {};
+ if (body instanceof URLSearchParams) {
+const paramsMap = Array.from(body.paramsMap);
+body = paramsMap.reduce((current, param) => {
+ const [key, value] = param;
+ return {
+...current,
+[key]: Array.isArray(value) && value.length === 1 ? value[0] :
value
+ };
+}, {});
+ } else if (typeof body === 'string') {
+body = body.split('&').reduce((current, param): {[key: string]: any}
=> {
+ const pair = param.split('=');
+ return {
+...current,
+[pair[0]]: decodeURIComponent(pair[1])
+ };
+}, {});
+ }
+ options.params = {};
+ response$ = super.post(generatedUrl, body, options);
+} else {
+ response$ = super.get(this.generateUrlString(url, urlVariables),
this.generateOptions(url, params));
+}
+return response$;
}
put(url: string, body: any, params?: HomogeneousObject,
urlVariables?: HomogeneousObject): Observable {
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
index b1dc6cf..92707d0 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
@@ -22,8 +22,8 @@ import {Observable} from 'rxjs/Observable';
import {Subscriber} from 'rxjs/Subscriber';
import 'rxjs/add/operator/delay';
import * as moment from 'mom
[ambari] branch trunk updated: AMBARI-23789 Regenerate keytabs on single host should be an experimental feature. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 e54a87a AMBARI-23789 Regenerate keytabs on single host should be an
experimental feature. (ababiichuk)
e54a87a is described below
commit e54a87a65d0cf62a5535f13cab8c8ec3b9beb599
Author: ababiichuk
AuthorDate: Tue May 8 14:23:40 2018 +0300
AMBARI-23789 Regenerate keytabs on single host should be an experimental
feature. (ababiichuk)
---
ambari-web/app/config.js | 3 ++-
ambari-web/app/views/main/host/details.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 8dbbde3..c5bf5f0 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -89,7 +89,8 @@ App.supports = {
enabledWizardForHostOrderedUpgrade: true,
manageJournalNode: true,
enableToggleKerberos: true,
- enableAddDeleteServices: true
+ enableAddDeleteServices: true,
+ regenerateKeytabsOnSingleHost: false
};
if (App.enableExperimental) {
diff --git a/ambari-web/app/views/main/host/details.js
b/ambari-web/app/views/main/host/details.js
index 2cf4f42..610360a 100644
--- a/ambari-web/app/views/main/host/details.js
+++ b/ambari-web/app/views/main/host/details.js
@@ -80,7 +80,7 @@ App.MainHostDetailsView = Em.View.extend({
label: this.t('passiveState.turn' + onOff)
});
}
-if (App.get('isKerberosEnabled')){
+if (App.get('isKerberosEnabled') &&
App.get('supports.regenerateKeytabsOnSingleHost')){
var actionMap = App.HostComponentActionMap.getMap(this);
result.push(actionMap.REGENERATE_KEYTAB_FILE_OPERATIONS);
}
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23758 Filter dropdown components not displayed properly
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 c77399a AMBARI-23758 Filter dropdown components not displayed properly
c77399a is described below
commit c77399a4f85a2ba7cd525ff8ff6783df65375f86
Author: Istvan Tobias
AuthorDate: Mon May 7 20:43:24 2018 +0200
AMBARI-23758 Filter dropdown components not displayed properly
---
.../src/app/components/app.component.less | 6 +-
.../logs-container/logs-container.component.less | 1 -
.../main-container/main-container.component.less | 21 -
.../main-container/main-container.component.ts | 3 +-
.../src/assets/images/ambari-logo.png | Bin 0 -> 2779 bytes
.../ambari-logsearch-web/src/styles.less | 5 +-
.../src/vendor/css/bootstrap-logsearch.min.css | 2 +-
.../src/vendor/css/fonts/Roboto-Bold-webfont.eot | Bin 0 -> 36098 bytes
.../src/vendor/css/fonts/Roboto-Bold-webfont.svg | 607 +
.../src/vendor/css/fonts/Roboto-Bold-webfont.ttf | Bin 0 -> 35912 bytes
.../src/vendor/css/fonts/Roboto-Bold-webfont.woff | Bin 0 -> 21320 bytes
.../src/vendor/js/bootstrap-logsearch.min.js | 4 +-
12 files changed, 619 insertions(+), 30 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
index 2e1a0c6..1bce404 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
@@ -16,7 +16,6 @@
*/
@import '../modules/shared/main';
-
:host {
background-color: @main-background-color; // TODO implement actual color
display: flex;
@@ -34,11 +33,14 @@
h1 {
align-items: center;
align-self: stretch;
+ background: lighten(@navbar-background-color, 5%)
url('/resources/assets/images/ambari-logo.png') no-repeat;
+ background-position: .5em center;
+ background-size: 25px;
background-color: lighten(@navbar-background-color, 5%);
display: flex;
+ font-size: 20px;
margin: 0 2em 0 0;
padding: 0 2em;
- text-transform: uppercase;
&.full-flex-width {
flex-basis: 100%;
}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
index 68a29ff..9ce88b0 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
@@ -20,7 +20,6 @@
:host {
display: block;
- overflow: hidden;
.tabs-container, .auto-refresh-message {
background-color: @filters-panel-background-color;
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.less
deleted file mode 100644
index 54680ee..000
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.less
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-:host {
- overflow-x: hidden;
-}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts
index 5aaeb52..cd0f1be 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts
@@ -22,8 +22,7 @@ import {Subscription} from 'rxjs/Subscription';
@Component({
selector:
[ambari] branch trunk updated: AMBARI-23687 Log Search UI: the UI does not load the initial data on logs screen loading
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 63979c7 AMBARI-23687 Log Search UI: the UI does not load the initial
data on logs screen loading
63979c7 is described below
commit 63979c7423851cf2dacf5d338bb8096a270ebeb5
Author: Istvan Tobias
AuthorDate: Mon May 7 10:14:37 2018 +0200
AMBARI-23687 Log Search UI: the UI does not load the initial data on logs
screen loading
---
.../components/graph/time-graph.component.less | 2 +-
.../src/app/components/app.component.html | 4 +-
.../src/app/components/app.component.less | 7 ++
.../cluster-filter/cluster-filter.component.ts | 21 +++-
.../logs-container/logs-container.component.ts | 1 +
.../dropdown-button/dropdown-button.component.ts | 14 ++-
.../dropdown-list/dropdown-list.component.html | 50 ++
.../app/modules/shipper/services/shipper.guard.ts | 20 ++--
.../src/app/services/logs-container.service.ts | 106 +++--
9 files changed, 134 insertions(+), 91 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.less
index d9952c6..af72943 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/time-graph.component.less
@@ -18,7 +18,7 @@
@import '../../../modules/shared/mixins';
:host {
- background: #ECECEC; // TODO add style according to actual design
+ background: #FFF; // TODO add style according to actual design
/deep/ svg {
cursor: crosshair;
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
index 574ce61..e190d3b 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.html
@@ -16,9 +16,9 @@
-->
-
+
{{'common.title' | translate}}
-
+
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
index 26b39fb..2e1a0c6 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/app.component.less
@@ -30,8 +30,10 @@
background-color: @navbar-background-color;
color: #fff;
.stretch-flex;
+align-items: center;
h1 {
align-items: center;
+ align-self: stretch;
background-color: lighten(@navbar-background-color, 5%);
display: flex;
margin: 0 2em 0 0;
@@ -50,5 +52,10 @@
margin-left: auto;
margin-right: 5em;
}
+&:not(.authorized) {
+ h1 {
+margin: 0;
+ }
+}
}
}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
index de766a0..df5e99d 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
@@ -102,14 +102,25 @@ export class ClusterFilterComponent implements OnInit,
OnDestroy {
let clusterSelection =
this.routingUtilsService.getParamFromActivatedRouteSnapshot(routeSnapshot,
'cluster');
if (clusterSelection) {
clusterSelection = this.useMultiSelection.getValue() ?
clusterSelection.split(/[,;]/) : clusterSelection;
+ if (Array.isArray(clusterSelection)) {
+clusterSelection = clusterSelection.map(
+ (clusterName: string) =>
Object.assign(this.utilsService.getListItemFromString(clusterName), {
+isChecked: true
+ })
+);
+ } else {
+clusterSelection =
Object.assign(this.utilsService.getListItemFromString(clusterSelection), {
+ isChecked: true
+});
+ }
this.appStateService.getParameter('clustersDataState')
.filter((state: DataAvailabilityValues) => state ===
DataAvailabilityValues.AVAILABLE)
.first()
.subscribe(() => {
-
this.filterDropdown.updateSelection(Object.assign(this.utilsService.getListItemFromString(clusterSelection),
{
-isChecked: true
- }));
+ this.filterDropdown.updateSelection(clusterSelection);
});
+} else {
+ this
[ambari] branch trunk updated: AMBARI-23768 Icon for "start demo ldap" is missing. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 115f746 AMBARI-23768 Icon for "start demo ldap" is missing.
(ababiichuk)
115f746 is described below
commit 115f746034ce598757721285e776f82ab0b56324
Author: ababiichuk
AuthorDate: Fri May 4 19:22:22 2018 +0300
AMBARI-23768 Icon for "start demo ldap" is missing. (ababiichuk)
---
ambari-web/app/models/host_component.js | 2 +-
ambari-web/test/views/main/service/item_test.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/models/host_component.js
b/ambari-web/app/models/host_component.js
index aea98ef..a4a477a 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -426,7 +426,7 @@ App.HostComponentActionMap = {
customCommand: 'STARTDEMOLDAP',
context:
Em.I18n.t('services.service.actions.run.startLdapKnox.context'),
label: Em.I18n.t('services.service.actions.run.startLdapKnox.context'),
-cssClass: 'glyphicon glyphicon-play-sign',
+cssClass: 'icon icon-play-sign',
disabled: false
},
STOPDEMOLDAP: {
diff --git a/ambari-web/test/views/main/service/item_test.js
b/ambari-web/test/views/main/service/item_test.js
index f2ea9f4..a992090 100644
--- a/ambari-web/test/views/main/service/item_test.js
+++ b/ambari-web/test/views/main/service/item_test.js
@@ -425,7 +425,7 @@ describe('App.MainServiceItemView', function () {
{"action": "restartAllHostComponents", "context": "KNOX", "label":
"Restart All", "cssClass": "glyphicon glyphicon-time", "disabled": false},
{"action": "runSmokeTest", "label": "Run Service Check",
"cssClass": "glyphicon glyphicon-thumbs-up", "disabled": false},
{"action": "turnOnOffPassive", "context": "Turn On Maintenance
Mode for Knox", "label": "Turn On Maintenance Mode", "cssClass": "icon-medkit",
"disabled": false},
-{"action": "startLdapKnox", "customCommand": "STARTDEMOLDAP",
"context": "Start Demo LDAP", "label": "Start Demo LDAP", "cssClass":
"glyphicon glyphicon-play-sign", "disabled": false},
+{"action": "startLdapKnox", "customCommand": "STARTDEMOLDAP",
"context": "Start Demo LDAP", "label": "Start Demo LDAP", "cssClass": "icon
icon-play-sign", "disabled": false},
{"action": "stopLdapKnox", "customCommand": "STOPDEMOLDAP",
"context": "Stop Demo LDAP", "label": "Stop Demo LDAP", "cssClass": "glyphicon
glyphicon-stop", "disabled": false},
{"action": "downloadClientConfigs", "label": "Download Client
Configs", "cssClass": "glyphicon glyphicon-download-alt", "isHidden": true,
"disabled": false, "hasSubmenu": false, "submenuOptions": []}
]
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: [AMBARI-23748] - [Logsearch UI] Logout button does not navigate user to login/logged out page
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 b674486 [AMBARI-23748] - [Logsearch UI] Logout button does not
navigate user to login/logged out page
b674486 is described below
commit b674486ef961243530bccc549ec16a8329a6c3f5
Author: Istvan Tobias
AuthorDate: Fri May 4 00:38:16 2018 +0200
[AMBARI-23748] - [Logsearch UI] Logout button does not navigate user to
login/logged out page
---
.../ambari-logsearch-web/src/app/app-routing.module.ts| 4 +++-
ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts | 4 +++-
.../src/app/services/auth-guard.service.ts| 2 +-
.../src/app/services/auth.service.spec.ts | 11 ++-
.../ambari-logsearch-web/src/app/services/auth.service.ts | 9 +++--
.../{auth-guard.service.ts => login-screen-guard.service.ts} | 11 +--
6 files changed, 29 insertions(+), 12 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
index 5fb281b..9a51050 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
@@ -23,13 +23,15 @@ import {LoginFormComponent} from
'@app/components/login-form/login-form.componen
import {AuthGuardService} from '@app/services/auth-guard.service';
import {TabGuard} from '@app/services/tab.guard';
import {LogsBreadcrumbsResolverService} from
'@app/services/logs-breadcrumbs-resolver.service';
+import {LoginScreenGuardService} from
'@app/services/login-screen-guard.service';
const appRoutes: Routes = [{
path: 'login',
component: LoginFormComponent,
data: {
breadcrumbs: 'login.title'
-}
+},
+canActivate: [LoginScreenGuardService]
}, {
path: 'logs/:activeTab',
component: LogsContainerComponent,
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index 8db8dea..b1121d5 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -114,6 +114,7 @@ import {TabGuard} from '@app/services/tab.guard';
import {LogsBreadcrumbsResolverService} from
'@app/services/logs-breadcrumbs-resolver.service';
import {LogsFilteringUtilsService} from
'@app/services/logs-filtering-utils.service';
import {LogsStateService} from '@app/services/storage/logs-state.service';
+import {LoginScreenGuardService} from
'@app/services/login-screen-guard.service';
export function getXHRBackend(
injector: Injector, browser: BrowserXhr, xsrf: XSRFStrategy, options:
ResponseOptions
@@ -239,7 +240,8 @@ export function getXHRBackend(
HistoryManagerService,
ClusterSelectionService,
LogsFilteringUtilsService,
-LogsStateService
+LogsStateService,
+LoginScreenGuardService
],
bootstrap: [AppComponent],
entryComponents: [
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/services/auth-guard.service.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/services/auth-guard.service.ts
index c940ce6..8b56239 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/services/auth-guard.service.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/services/auth-guard.service.ts
@@ -23,7 +23,7 @@ import {Observable} from 'rxjs/Observable';
import {AuthService} from '@app/services/auth.service';
/**
- * This service meant to be a single place where the authorization should
happen.
+ * This guard goal is to prevent to display screens where authorization needs.
*/
@Injectable()
export class AuthGuardService implements CanActivate {
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.spec.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.spec.ts
index c033052..74a7125 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.spec.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.spec.ts
@@ -27,6 +27,8 @@ import {AppStateService, appState} from
'@app/services/storage/app-state.service
import {AuthService} from '@app/services/auth.service';
import {HttpClientService} from '@app/services/http-client.service';
import {RouterTestingModule} from '@angular/router/testing';
+import {Routes} from '@angular/router';
+import {Component} from '@angular/core';
describe('AuthService', () => {
@
[ambari] branch trunk updated: AMBARI-23739 Namespace names are converted to uppercase after selecting from dropdown. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 751df8d AMBARI-23739 Namespace names are converted to uppercase after
selecting from dropdown. (ababiichuk)
751df8d is described below
commit 751df8dc973f8359e2b77265243e8c5dadeaf88e
Author: ababiichuk
AuthorDate: Wed May 2 16:25:58 2018 +0300
AMBARI-23739 Namespace names are converted to uppercase after selecting
from dropdown. (ababiichuk)
---
ambari-web/app/templates/main/dashboard/widgets.hbs| 14 --
ambari-web/app/templates/main/service/info/metrics.hbs | 4 ++--
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ambari-web/app/templates/main/dashboard/widgets.hbs
b/ambari-web/app/templates/main/dashboard/widgets.hbs
index f77c3dd..34d028c 100644
--- a/ambari-web/app/templates/main/dashboard/widgets.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets.hbs
@@ -60,13 +60,15 @@
{{group.title}}
{{#if group.subGroups.length}}
-
+
- {{#if group.activeSubGroup}}
-{{group.activeSubGroup.title}}
- {{else}}
-{{t common.all}}
- {{/if}}
+
+{{#if group.activeSubGroup}}
+ {{group.activeSubGroup.title}}
+{{else}}
+ {{t common.all}}
+{{/if}}
+
diff --git a/ambari-web/app/templates/main/service/info/metrics.hbs
b/ambari-web/app/templates/main/service/info/metrics.hbs
index 97b93d5..3afecc3 100644
--- a/ambari-web/app/templates/main/service/info/metrics.hbs
+++ b/ambari-web/app/templates/main/service/info/metrics.hbs
@@ -100,9 +100,9 @@
{{#if controller.selectedNSWidgetLayout}}
{{t
dashboard.widgets.nameSpace}}
-
+
-{{controller.selectedNSWidgetLayout.displayName}}
+{{controller.selectedNSWidgetLayout.displayName}}
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23728 Group HDFS components into the components section of the ambari service summary page. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 1ab8001 AMBARI-23728 Group HDFS components into the components
section of the ambari service summary page. (ababiichuk)
1ab8001 is described below
commit 1ab8001adf30a50bfe76c661d2ae0a66780285cd
Author: ababiichuk
AuthorDate: Wed May 2 16:03:24 2018 +0300
AMBARI-23728 Group HDFS components into the components section of the
ambari service summary page. (ababiichuk)
---
ambari-web/app/assets/test/tests.js| 1 +
.../main/service/info/summary/hdfs/slaves.hbs | 141 +
.../main/service/info/summary/hdfs/widgets.hbs | 4 +
.../service/info/summary/master_components.hbs | 7 +-
.../app/templates/main/service/services/hdfs.hbs | 128 +--
ambari-web/app/views.js| 1 +
.../main/service/info/components_list_view.js | 3 +
ambari-web/app/views/main/service/info/summary.js | 3 +-
.../views/main/service/info/summary/hdfs/slaves.js | 63 +
.../main/service/info/summary/hdfs/widgets.js | 5 +
ambari-web/app/views/main/service/services/hdfs.js | 41 +-
.../main/service/info/summary/hdfs/slaves_test.js | 79
.../test/views/main/service/services/hdfs_test.js | 40 --
13 files changed, 311 insertions(+), 205 deletions(-)
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index 8da6044..482f046 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -353,6 +353,7 @@ var files = [
'test/views/main/service/info/component_list_view_test',
'test/views/main/service/info/metrics/ambari_metrics/regionserver_base_test',
'test/views/main/service/info/metrics/flume/flume_agent_metrics_section_test',
+ 'test/views/main/service/info/summary/hdfs/slaves_test',
'test/views/main/service/services/hdfs_test',
'test/views/main/service/services/hbase_test',
'test/views/main/service/services/ranger_test',
diff --git a/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
b/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
new file mode 100644
index 000..5ce4cc9
--- /dev/null
+++ b/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
@@ -0,0 +1,141 @@
+{{!
+* 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.
+}}
+
+
+
+{{#if view.showTitle}}
+ {{t dashboard.services.hdfs.summary.components}}
+{{/if}}
+
+
+{{! Data Nodes }}
+{{#if view.isDataNodeCreated}}
+
+
+ {{#if App.router.clusterController.isServiceContentFullyLoaded}}
+
+ {{#view App.ComponentLiveTextView
liveComponentsBinding="view.service.dataNodesStarted"
totalComponentsBinding="view.service.dataNodesTotal"}}
+{{view.liveComponents}}/{{view.totalComponents}}
+ {{/view}}
+
+{{t common.started}}
+ {{else}}
+{{t common.loading.eclipses}}
+ {{/if}}
+
+
+ {{t
dashboard.services.hdfs.datanodes}}
+
+
+{{/if}}
+{{! JournalNodes }}
+{{#if view.isJournalNodeCreated}}
+
+
+ {{#if App.router.clusterController.isComponentsStateLoaded}}
+
+ {{#view App.ComponentLiveTextView
liveComponentsBinding="view.journalNodesLive"
totalComponentsBinding="view.journalNodesTotal"}}
+{{view.liveComponents}}/{{view.totalComponents}}
+ {{/view}}
+
+ {{t common.live}}
+ {{else}}
+{{t common.loading.eclipses}}
+ {{/if}}
+
+
+ {{t
dashboard.services.hdfs.journalnodes}}
+
+
+{{/if}}
+{{! NFS Gateway }}
+{{#if view.isNfsInStack}}
+
+
+ {{#if App.router.clusterController.isServiceContentFu
[ambari] branch trunk updated: AMBARI-23730 When Spark2 is selected in left pane, Spark also gets selected along with it. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 cab7384 AMBARI-23730 When Spark2 is selected in left pane, Spark also
gets selected along with it. (ababiichuk)
cab7384 is described below
commit cab73841d296042d549509b419de83ed1d4358fe
Author: ababiichuk
AuthorDate: Mon Apr 30 17:38:55 2018 +0300
AMBARI-23730 When Spark2 is selected in left pane, Spark also gets selected
along with it. (ababiichuk)
---
ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 6102bc3..1059ab3 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -86,10 +86,14 @@ $(document).ready(function () {
function popStateHandler() {
var path = window.location.pathname + window.location.hash;
+if (path[path.length - 1] !== '/') {
+ path += '/';
+}
$navigationContainer.find('li a').each(function (index, link) {
var $link = $(link);
var href = $link.attr('data-href') || $link.attr('href');
- if (path.indexOf(href) !== -1 && ['', '#'].indexOf(href) === -1) {
+ var hrefWithSlash = href == null || href[href.length - 1] === '/' ?
href : href + '/';
+ if (path.indexOf(hrefWithSlash) !== -1 && ['', '#'].indexOf(href)
=== -1) {
$link.parent().addClass('active');
} else {
$link.parent().removeClass('active');
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23721 Adding and deleting widgets of NameNode section on dashboard isn't persisted. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 dd04600 AMBARI-23721 Adding and deleting widgets of NameNode section
on dashboard isn't persisted. (ababiichuk)
dd04600 is described below
commit dd046007be89c1c7ad8ccda9e2621ed4fa6bd070
Author: ababiichuk
AuthorDate: Fri Apr 27 21:20:09 2018 +0300
AMBARI-23721 Adding and deleting widgets of NameNode section on dashboard
isn't persisted. (ababiichuk)
---
ambari-web/app/views/main/dashboard/widgets.js | 44 +-
.../test/views/main/dashboard/widget_test.js | 22 +++
2 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/ambari-web/app/views/main/dashboard/widgets.js
b/ambari-web/app/views/main/dashboard/widgets.js
index 64412f3..3fcee73 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -209,11 +209,51 @@ App.MainDashboardWidgetsView =
Em.View.extend(App.Persist, App.LocalStorage, App
}
else {
newSettings.threshold = userPreferences.threshold;
- newSettings.groups = userPreferences.groups;
this.get('allWidgets').forEach(widget => {
-let key = widget.get('isVisible') ? 'visible' : 'hidden';
+const key = widget.get('isVisible') ? 'visible' : 'hidden';
newSettings[key].push(widget.get('id'));
});
+ this.get('widgetGroups').forEach(group => {
+const groupName = group.get('name');
+if (!newSettings.groups[groupName]) {
+ newSettings.groups[groupName] = {};
+}
+group.get('allWidgets').forEach(widgetsSubGroup => {
+ const subGroupName = widgetsSubGroup.get('subGroupName'),
+widgets = widgetsSubGroup.get('widgets'),
+subGroupSettings = {
+ visible: [],
+ hidden: [],
+ threshold: {}
+};
+ newSettings.groups[groupName][subGroupName] = subGroupSettings;
+ widgets.forEach(widget => {
+const key = widget.get('isVisible') ? 'visible' : 'hidden',
+ threshold = widget.get('threshold'),
+ widgetId = widget.get('id'),
+ id = parseInt(widgetId);
+if (subGroupName === '*') {
+ const regExp = new
RegExp(`\\d+\\-${groupName}\\-([\\W\\w]+)\\-\\*`),
+regExpMatch = widgetId.match(regExp),
+subGroup = regExpMatch && regExpMatch[1];
+ if (subGroup) {
+subGroupSettings[key].push({
+ id,
+ subGroup
+});
+$.extend(true, subGroupSettings.threshold, {
+ [subGroup]: {
+[id]: threshold
+ }
+});
+ }
+} else {
+ subGroupSettings[key].push(id);
+ subGroupSettings.threshold[id] = threshold;
+}
+ });
+});
+ });
}
this.set('userPreferences', newSettings);
this.setDBProperty(this.get('persistKey'), newSettings);
diff --git a/ambari-web/test/views/main/dashboard/widget_test.js
b/ambari-web/test/views/main/dashboard/widget_test.js
index 8a28d19..f63ec00 100644
--- a/ambari-web/test/views/main/dashboard/widget_test.js
+++ b/ambari-web/test/views/main/dashboard/widget_test.js
@@ -136,14 +136,22 @@ describe('App.DashboardWidgetView', function () {
describe('#deleteWidget()', function() {
beforeEach(function() {
- view.get('parentView').set('allWidgets', [Em.Object.create({id: 1,
isVisible: true})]);
- view.set('widget.id', 1);
- view.set('parentView.userPreferences', {
-visible: [1],
-hidden: [],
-threshold: [],
-groups: {}
+ view.get('parentView').setProperties({
+allWidgets: [
+ Em.Object.create({
+id: 1,
+isVisible: true
+ })
+],
+userPreferences: {
+ visible: [1],
+ hidden: [],
+ threshold: [],
+ groups: {}
+},
+widgetGroups: []
});
+ view.set('widget.id', 1);
view.deleteWidget();
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23716 Kafka Quick Links Shows all Views links. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 14c55d3 AMBARI-23716 Kafka Quick Links Shows all Views links.
(ababiichuk)
14c55d3 is described below
commit 14c55d316969e430b9bfcfa8f9b8e17032d7
Author: ababiichuk
AuthorDate: Fri Apr 27 13:57:26 2018 +0300
AMBARI-23716 Kafka Quick Links Shows all Views links. (ababiichuk)
---
.../app/templates/main/service/info/summary.hbs | 21 +++--
ambari-web/app/views/main/service/info/summary.js | 12 +++-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs
b/ambari-web/app/templates/main/service/info/summary.hbs
index abf458f..39c70f5 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -128,20 +128,21 @@
{{/if}}
{{/view}}
-
+ {{! TODO implement display of views related to the current service}}
+
diff --git a/ambari-web/app/views/main/service/info/summary.js
b/ambari-web/app/views/main/service/info/summary.js
index dd8f9dd..35f0486 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -63,12 +63,14 @@ App.MainServiceInfoSummaryView = Em.View.extend({
*/
serviceSummaryView: null,
- /**
- * @type {App.ViewInstance}
- */
- views: function () {
+
+ // TODO implement filtering of views related to current service
+ ///**
+ // * @type {App.ViewInstance}
+ // */
+ /*views: function () {
return App.router.get('loggedIn') ?
App.router.get('mainViewsController.visibleAmbariViews') : [];
- }.property('App.router.mainViewsController.visibleAmbariViews.[]',
'App.router.loggedIn'),
+ }.property('App.router.mainViewsController.visibleAmbariViews.[]',
'App.router.loggedIn'),*/
/**
* @property {Object} serviceCustomViewsMap - custom views to embed
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23705 Need better xpaths for quicklinks when multiple namespaces are present. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 cbf69a8 AMBARI-23705 Need better xpaths for quicklinks when multiple
namespaces are present. (ababiichuk)
cbf69a8 is described below
commit cbf69a8b3066c0a4ecbdf21e753ed1eb22494a3e
Author: ababiichuk
AuthorDate: Thu Apr 26 16:49:54 2018 +0300
AMBARI-23705 Need better xpaths for quicklinks when multiple namespaces are
present. (ababiichuk)
---
ambari-web/app/styles/application.less | 2 +-
.../app/templates/main/service/info/summary.hbs| 24 --
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 96bfd7b..7ea0f2e 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1231,7 +1231,7 @@ a.services-menu-blocks{
margin-top: 10px;
}
.quick-links-block {
-.panel-body > a{
+.panel-body a {
display: block;
margin-bottom: 5px;
}
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs
b/ambari-web/app/templates/main/service/info/summary.hbs
index f92a74d..abf458f 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -90,18 +90,20 @@
{{#if view.quickLinksArray}}
{{#each group in view.quickLinksArray}}
- {{#if group.title}}
-
- {{group.title}}
-
- {{/if}}
- {{#each quickLinks in group.links}}
-{{quickLinks.publicHostNameLabel}}
-{{#each quickLinks}}
- {{label}}
+
+{{#if group.title}}
+
+{{group.title}}
+
+{{/if}}
+{{#each quickLinks in group.links}}
+ {{quickLinks.publicHostNameLabel}}
+ {{#each quickLinks}}
+{{label}}
+ {{/each}}
{{/each}}
- {{/each}}
+
{{/each}}
{{else}}
{{#if view.quickLinks}}
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23686 HDFS metrics page: list of namespaces is misaligned. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 a9c8b07 AMBARI-23686 HDFS metrics page: list of namespaces is
misaligned. (ababiichuk)
a9c8b07 is described below
commit a9c8b07181811395abda05cd1ecb523a9ced45ee
Author: ababiichuk
AuthorDate: Wed Apr 25 16:05:12 2018 +0300
AMBARI-23686 HDFS metrics page: list of namespaces is misaligned.
(ababiichuk)
---
.../app/styles/enhanced_service_dashboard.less | 6 ++
.../app/templates/main/service/info/metrics.hbs| 23 +-
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index 533ef3d..617d69a 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -25,6 +25,12 @@
clear: both;
+ .widgets-group-select-wrapper {
+margin-left: 21px;
+margin-top: 25px;
+position: relative;
+ }
+
.service-widgets-box {
padding: 10px 1.1% 10px 1.1%;
}
diff --git a/ambari-web/app/templates/main/service/info/metrics.hbs
b/ambari-web/app/templates/main/service/info/metrics.hbs
index 94139e2..97b93d5 100644
--- a/ambari-web/app/templates/main/service/info/metrics.hbs
+++ b/ambari-web/app/templates/main/service/info/metrics.hbs
@@ -98,16 +98,21 @@
{{#if controller.isHDFSFederatedSummary}}
{{#if controller.selectedNSWidgetLayout}}
-
+
{{t
dashboard.widgets.nameSpace}}
-
- {{controller.selectedNSWidgetLayout.displayName}}
-
-
- {{#each option in controller.activeNSWidgetLayouts}}
-{{option.displayName}}
- {{/each}}
-
+
+
+{{controller.selectedNSWidgetLayout.displayName}}
+
+
+
+{{#each option in controller.activeNSWidgetLayouts}}
+
+{{option.displayName}}
+
+{{/each}}
+
+
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23662 Log Search UI: subscription error on route changing
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 b6b1361 AMBARI-23662 Log Search UI: subscription error on route
changing
b6b1361 is described below
commit b6b13615d0de44bb08fba2cab21836844edc036f
Author: Istvan Tobias
AuthorDate: Wed Apr 25 18:15:01 2018 +0200
AMBARI-23662 Log Search UI: subscription error on route changing
---
.../src/app/app-routing.module.ts | 4 +--
.../components/breadrumbs/breadcrumbs.component.ts | 19 +++-
.../cluster-filter/cluster-filter.component.ts | 18 ---
.../logs-container/logs-container.component.ts | 18 ++-
.../components/search-box/search-box.component.ts | 26 +++-
.../src/app/modules/shared/shared.module.ts| 3 +-
.../shipper-configuration.component.ts | 13
...ipper-service-configuration-form.component.html | 10 +++---
...shipper-service-configuration-form.component.ts | 36 --
.../shipper/directives/validator.directive.ts | 3 +-
.../app/modules/shipper/services/shipper.guard.ts | 36 ++
.../app/modules/shipper/shipper-routing.module.ts | 5 ++-
.../src/app/services/auth.service.ts | 10 +++---
.../app/services/logs-filtering-utils.service.ts | 2 +-
.../src/app/services/tab.guard.ts | 5 +--
.../ambari-logsearch-web/src/assets/i18n/en.json | 4 +++
16 files changed, 141 insertions(+), 71 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
index ed8cfb7..5fb281b 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app-routing.module.ts
@@ -45,8 +45,8 @@ const appRoutes: Routes = [{
path: 'logs',
component: LogsContainerComponent,
data: {
- multiClusterFilter: true,
- breadcrumbs: 'logs.title'
+ breadcrumbs: 'logs.title',
+ multiClusterFilter: true
},
canActivate: [AuthGuardService, TabGuard]
}, {
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.ts
index 99e394c..839a02c 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/breadrumbs/breadcrumbs.component.ts
@@ -18,6 +18,9 @@
import {Component, Input, OnDestroy, OnInit} from '@angular/core';
import {Subscription} from 'rxjs/Subscription';
import {ActivatedRouteSnapshot, NavigationEnd, Router, RoutesRecognized} from
'@angular/router';
+import {Title} from '@angular/platform-browser';
+import {TranslateService} from '@ngx-translate/core';
+import {Observable} from 'rxjs/Observable';
export interface BreadCrumb {
text: string;
@@ -38,7 +41,11 @@ export class BreadcrumbsComponent implements OnInit,
OnDestroy {
@Input()
addRootFirst: boolean = true;
- constructor(private router: Router) { }
+ constructor(
+private router: Router,
+private titleService: Title,
+private translateService: TranslateService
+ ) { }
ngOnInit() {
this.subscriptions.push(
@@ -76,8 +83,18 @@ export class BreadcrumbsComponent implements OnInit,
OnDestroy {
return breadcrumbs;
}
+ setPageTite(pageTitle) {
+Observable.combineLatest(
+ this.translateService.get('common.title'),
+ pageTitle ? this.translateService.get(pageTitle) : Observable.of('')
+).first().subscribe(([commonTitle, pageTite]) => {
+ this.titleService.setTitle(pageTitle ? `${commonTitle} - ${pageTite}` :
commonTitle);
+});
+ }
+
onNavigationEnd = (): void => {
this.crumbs =
this.getCrumbsFromRouterStateSnapshot(this.router.routerState.snapshot.root);
+this.setPageTite(this.crumbs[this.crumbs.length - 1].text);
}
}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
index d9b64a1..de766a0 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/cluster-filter/cluster-filter.component.ts
@@ -27,6 +27,8 @@ import {ClusterSelectionService} from
'@app/services/storage/cluster-selection.s
import {BehaviorSubject} from 'rxjs/BehaviorSubject';
import {FilterDropdownComponent} from
[ambari] branch trunk updated: AMBARI-23670 UI Styling Is Incorrect On Upgrade Repositories Page. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 c342120 AMBARI-23670 UI Styling Is Incorrect On Upgrade Repositories
Page. (ababiichuk)
c342120 is described below
commit c34212027a41f01e4e292d4c742053c663176639
Author: aBabiichuk
AuthorDate: Tue Apr 24 18:11:17 2018 +0300
AMBARI-23670 UI Styling Is Incorrect On Upgrade Repositories Page.
(ababiichuk)
---
ambari-web/app/styles/stack_versions.less | 73
.../main/admin/stack_upgrade/upgrade_history.hbs | 8 +--
.../admin/stack_upgrade/upgrade_version_column.hbs | 34 +
.../main/admin/stack_upgrade/versions.hbs | 4 +-
.../stack_upgrade/upgrade_version_box_view.js | 80 --
.../stack_upgrade/upgrade_version_column_view.js | 9 +++
.../main/admin/stack_upgrade/versions_view.js | 10 ++-
7 files changed, 130 insertions(+), 88 deletions(-)
diff --git a/ambari-web/app/styles/stack_versions.less
b/ambari-web/app/styles/stack_versions.less
index 60950ea..e40484d 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -18,6 +18,7 @@
@import 'common.less';
@left-menu-table-z-index: 999;
+@left-menu-table-margin-top: 150px;
@version-line-height: 20px;
#advancedRepoAccordion{
@@ -162,7 +163,10 @@
}
.left-menu-table {
padding: 10px 0;
-margin-top: 142px;
+margin-top: @left-menu-table-margin-top;
+&.has-special-type-repo-version {
+ margin-top: @left-menu-table-margin-top + @version-line-height;
+}
.border-extended-table {
width: 100%;
position: relative;
@@ -269,7 +273,7 @@
}
.patch-icon {
text-align: center;
- color: #ff4500;
+ color: @health-status-orange;
height: @version-line-height;
font-size: 14px;
margin: 18px 0px -18px 1px;
@@ -306,11 +310,16 @@
padding: 5px;
margin-bottom: 0;
}
-.version-column-display-type{
+.version-column-repository-name {
+ text-align: center;
+ font-size: 12px;
+ color: #888;
+}
+.version-column-display-type {
text-align: center;
height: @version-line-height;
margin-bottom: 0;
- color: #ff4500;
+ color: @health-status-orange;
}
.version-column-show-details {
text-align: center;
@@ -326,26 +335,24 @@
margin: 5px 0 15px 0;
line-height: @version-line-height;
height: 35px;
- .label-wrapper{
-display: inline-block;
-position: relative;
-.label-success {
- line-height: 30px;
-}
-.dropdown-toggle{
- background: none;
- height: auto;
- padding: 8px 8px;
- background: none;
- border:none;
- outline:none;
- box-shadow: none;
- position: absolute;
- right: 0;
- top: 0;
- color: #fff;
- &:hover, &:active, &:focus{
-color: #fff;
+ .label-wrapper {
+.btn {
+ cursor: auto;
+ text-transform: none;
+ .state-label-text {
+cursor: text;
+ }
+ &.btn-primary {
+background-color: @bootstrap-success;
+border-color: @bootstrap-success;
+ }
+ &.dropdown-toggle {
+cursor: pointer;
+padding-right: 8px;
+padding-left: 8px;
+ }
+ &:active {
+box-shadow: none;
}
}
}
@@ -814,7 +821,8 @@
}
.accordion-group {
border-right: none;
-padding-left:20px;
+padding-left: 20px;
+overflow-x: visible;
}
.accordion-heading {
background-color: transparent;
@@ -828,12 +836,19 @@
cursor: pointer;
}
.accordion-body {
+width: 400%;
min-width: 400px;
-.accordion-inner{
- padding-top:20px;
- .label{
+.accordion-inner {
+ padding-top: 20px;
+ .label {
padding: 5px 15px;
-&.available{
+&.label-from {
+ margin-left: 8px;
+}
+&.label-to {
+ margin-left: -8px;
+}
+&.available {
background-color: #468847;
}
}
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
index fce7171..b035524 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
@@ -78,19 +78,19 @@
{{#each service in item.services}}
-
+
[ambari] branch trunk updated: [AMBARI-23648] - Log Search UI: Various fixes for Shipper Configuration
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 f9429ae [AMBARI-23648] - Log Search UI: Various fixes for Shipper
Configuration
f9429ae is described below
commit f9429ae6868beb3cd51659cda4ce5c1f5741fea4
Author: Istvan Tobias
AuthorDate: Sat Apr 21 13:37:22 2018 +0200
[AMBARI-23648] - Log Search UI: Various fixes for Shipper Configuration
---
.../ambari-logsearch-web/src/app/app.module.ts | 4 +-
.../log-index-filter.component.html| 4 --
.../src/app/modules/shared/notifications.less | 1 -
.../shared/services/notification.service.ts| 19 ++--
.../shipper-configuration.component.less | 4 ++
.../shipper-configuration.component.ts | 8 ++-
...ipper-service-configuration-form.component.html | 7 ++-
...shipper-service-configuration-form.component.ts | 28 ---
.../shipper/directives/validator.directive.ts | 17 ++-
.../app/modules/shipper/services/shipper.guard.ts | 57 ++
.../app/modules/shipper/shipper-routing.module.ts | 5 +-
.../src/app/modules/shipper/shipper.module.ts | 4 +-
.../ambari-logsearch-web/src/assets/i18n/en.json | 13 ++---
13 files changed, 138 insertions(+), 33 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index b0612fe..8db8dea 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -24,11 +24,11 @@ import {InMemoryBackendService} from
'angular-in-memory-web-api';
import {TypeaheadModule, TooltipModule} from 'ngx-bootstrap';
import {TranslateModule, TranslateLoader} from '@ngx-translate/core';
import {StoreModule} from '@ngrx/store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import {StoreDevtoolsModule} from '@ngrx/store-devtools';
import {MomentModule} from 'angular2-moment';
import {MomentTimezoneModule} from 'angular-moment-timezone';
import {NgStringPipesModule} from 'angular-pipes';
-import { SimpleNotificationsModule } from 'angular2-notifications';
+import {SimpleNotificationsModule} from 'angular2-notifications';
import {environment} from '@envs/environment';
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/components/log-index-filter/log-index-filter.component.html
b/ambari-logsearch/ambari-logsearch-web/src/app/components/log-index-filter/log-index-filter.component.html
index 50d7742..5137275 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/components/log-index-filter/log-index-filter.component.html
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/components/log-index-filter/log-index-filter.component.html
@@ -69,10 +69,6 @@
{{'logIndexFilter.hostname' |
translate}}
-
-
{{'logIndexFilter.expiryDate' |
translate}}
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/notifications.less
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/notifications.less
index e9f4fd9..7a0a045 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/notifications.less
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/notifications.less
@@ -56,7 +56,6 @@
.sn-content {
font-size: @notification-content-font-size;
padding: 0;
-white-space: pre-wrap;
}
.sn-progress-loader {
height: 2px;
diff --git
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/services/notification.service.ts
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/services/notification.service.ts
index b149e38..df6ca2a 100644
---
a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/services/notification.service.ts
+++
b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/services/notification.service.ts
@@ -40,6 +40,14 @@ export const notificationIcons: Icons = {
};
Object.assign(defaultIcons, notificationIcons);
+export const messageTemplate = `
+
+ {{title}}
+ {{message}}
+ {{icon}}
+
+`;
+
@Injectable()
export class NotificationService {
@@ -60,11 +68,12 @@ export class NotificationService {
...config
});
}
-return this.notificationService[method](
- this.translateService.instant(title),
- this.translateService.instant(message),
- {...config, icon: notificationIcons[method] || notificationIcons['info']}
-);
+const icon = notificationIcons[method] || notificationIcons['info'];
+con
[ambari] branch trunk updated: AMBARI-23658 No widgets displayed on dashboard after adding third NameNode namespace. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 4b22a9b AMBARI-23658 No widgets displayed on dashboard after adding
third NameNode namespace. (ababiichuk)
4b22a9b is described below
commit 4b22a9b1642097bcaec1f69b1d7cc30fcea7f508
Author: ababiichuk
AuthorDate: Mon Apr 23 13:42:51 2018 +0300
AMBARI-23658 No widgets displayed on dashboard after adding third NameNode
namespace. (ababiichuk)
---
ambari-web/app/views/main/dashboard/widgets.js | 4
1 file changed, 4 insertions(+)
diff --git a/ambari-web/app/views/main/dashboard/widgets.js
b/ambari-web/app/views/main/dashboard/widgets.js
index a412fbb..64412f3 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -547,6 +547,10 @@ App.MainDashboardWidgetsView = Em.View.extend(App.Persist,
App.LocalStorage, App
subGroup
});
}
+if (!preferences.threshold[subGroup]) {
+ isChanged = true;
+ preferences.threshold[subGroup] =
defaultPreferences.groups[groupName]['*'].threshold[subGroup];
+}
});
}
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23656 NameNode namespaces aren't sorted by name. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 abb0a05 AMBARI-23656 NameNode namespaces aren't sorted by name.
(ababiichuk)
abb0a05 is described below
commit abb0a05a104ceb534b2866c508dee38b7caf2737
Author: ababiichuk
AuthorDate: Mon Apr 23 13:03:03 2018 +0300
AMBARI-23656 NameNode namespaces aren't sorted by name. (ababiichuk)
---
ambari-web/app/models/service/hdfs.js | 2 +-
ambari-web/app/views/main/service/info/summary.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/models/service/hdfs.js
b/ambari-web/app/models/service/hdfs.js
index 2a27dd6..f63cf6c 100644
--- a/ambari-web/app/models/service/hdfs.js
+++ b/ambari-web/app/models/service/hdfs.js
@@ -119,7 +119,7 @@ App.HDFSService = App.Service.extend({
}
}
});
-return result;
+return result.sortProperty('name');
}.property('hostComponents.length',
'App.router.clusterController.isHDFSNameSpacesLoaded')
});
diff --git a/ambari-web/app/views/main/service/info/summary.js
b/ambari-web/app/views/main/service/info/summary.js
index a501e1d..dd8f9dd 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -473,7 +473,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({
}
}
});
-return groups;
+return groups.sortProperty('name');
default:
return [
{
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23633 Missing tooltip/indicator for unsupported services in Versions page when HDP-3.0 VDF is registered. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 82243a3 AMBARI-23633 Missing tooltip/indicator for unsupported
services in Versions page when HDP-3.0 VDF is registered. (ababiichuk)
82243a3 is described below
commit 82243a300ad3e1ae911d8333bbc354c53bb00e08
Author: ababiichuk
AuthorDate: Fri Apr 20 14:37:42 2018 +0300
AMBARI-23633 Missing tooltip/indicator for unsupported services in Versions
page when HDP-3.0 VDF is registered. (ababiichuk)
---
ambari-web/app/messages.js | 1 +
ambari-web/app/styles/stack_versions.less | 23 +++---
.../admin/stack_upgrade/upgrade_version_column.hbs | 2 +-
.../stack_upgrade/upgrade_version_column_view.js | 27 +-
4 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 9f1e4ca..c781aec 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1842,6 +1842,7 @@ Em.I18n.translations = {
'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be
paused. Try again later.",
'admin.stackVersions.version.service.notUpgradable': "The version of this
service included in this repository is already installed in the cluster.",
+ 'admin.stackVersions.version.service.notSupported': "This service is
unsupported in the current version of the stack.",
'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade
Options",
'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You
are about to perform an upgrade to {0}.",
diff --git a/ambari-web/app/styles/stack_versions.less
b/ambari-web/app/styles/stack_versions.less
index b218141..60950ea 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -17,6 +17,9 @@
*/
@import 'common.less';
+@left-menu-table-z-index: 999;
+@version-line-height: 20px;
+
#advancedRepoAccordion{
.panel-heading {
background-color: #f0f0f0;
@@ -163,7 +166,7 @@
.border-extended-table {
width: 100%;
position: relative;
- z-index: 999;
+ z-index: @left-menu-table-z-index;
background: transparent;
td.service-display-name {
border-top: 1px solid #d2d9dd;
@@ -244,8 +247,8 @@
color: #000;
text-align: center;
font-weight: 500;
- font-size: 20px;
- line-height: 20px;
+ font-size: @version-line-height;
+ line-height: @version-line-height;
padding: 5px 5px 0 5px;
margin-bottom: 0;
span {
@@ -254,7 +257,7 @@
.pull-right .not-active {
font-size: 15px;
color: #0088cc;
-line-height: 20px;
+line-height: @version-line-height;
}
}
.repository-name {
@@ -267,7 +270,7 @@
.patch-icon {
text-align: center;
color: #ff4500;
- height: 20px;
+ height: @version-line-height;
font-size: 14px;
margin: 18px 0px -18px 1px;
padding: 1px;
@@ -305,7 +308,7 @@
}
.version-column-display-type{
text-align: center;
- height: 20px;
+ height: @version-line-height;
margin-bottom: 0;
color: #ff4500;
}
@@ -321,7 +324,7 @@
}
.state {
margin: 5px 0 15px 0;
- line-height: 20px;
+ line-height: @version-line-height;
height: 35px;
.label-wrapper{
display: inline-block;
@@ -352,6 +355,7 @@
}
.open .dropdown-menu {
min-width: 90px;
+z-index: @left-menu-table-z-index + 2;
}
}
.state.installing {
@@ -363,7 +367,7 @@
padding-bottom: 4px;
margin-top: -5px;
.service-version-info {
-line-height: 20px;
+line-height: @version-line-height;
margin-bottom: 9px;
padding-top: 6px;
text-align: center;
@@ -378,6 +382,9 @@
}
div.version-column {
.not-upgradable {
+ position: absolute;
+ z-index: @left-menu-table-z-index + 1;
+ line-height: @version-line-height;
padding-left: 10px;
margin-right: -20px;
cursor: pointer;
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index bfeae65..de0c197 100644
---
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -114,7 +114,7 @@
{{service.latestVersion}}
{{#if service.notUpgradable}}
-
+
{{/if}}
{{/each}}
diff --git
a/a
[ambari] branch trunk updated: AMBARI-23615 Header missing in Step2 Select hosts page in NN Federation Wizard. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 94872ba AMBARI-23615 Header missing in Step2 Select hosts page in NN
Federation Wizard. (ababiichuk)
94872ba is described below
commit 94872baffa4861453a8ac68dd9591f47994a944b
Author: ababiichuk
AuthorDate: Thu Apr 19 18:57:14 2018 +0300
AMBARI-23615 Header missing in Step2 Select hosts page in NN Federation
Wizard. (ababiichuk)
---
ambari-web/app/messages.js | 1 +
ambari-web/app/views/main/admin/federation/step2_view.js | 2 ++
2 files changed, 3 insertions(+)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index dce6f2b..b699e0d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1681,6 +1681,7 @@ Em.I18n.translations = {
'admin.nameNodeFederation.wizard.step1.nameserviceid.existing':'Existing
Nameservice ID',
'admin.nameNodeFederation.wizard.step1.nameserviceid.error':'Must consist of
letters, numbers, and hyphens. Cannot begin or end with a hyphen.',
'admin.nameNodeFederation.wizard.step2.header': 'Select Hosts',
+ 'admin.nameNodeFederation.wizard.step2.body': 'Select hosts running the
NameNodes for {0}',
'admin.nameNodeFederation.wizard.step3.header': 'Review',
'admin.nameNodeFederation.wizard.step3.confirm.config.body': '' +
'Review Configuration Changes.' +
diff --git a/ambari-web/app/views/main/admin/federation/step2_view.js
b/ambari-web/app/views/main/admin/federation/step2_view.js
index af68025..fd9442c 100644
--- a/ambari-web/app/views/main/admin/federation/step2_view.js
+++ b/ambari-web/app/views/main/admin/federation/step2_view.js
@@ -20,4 +20,6 @@
var App = require('app');
App.NameNodeFederationWizardStep2View = App.AssignMasterComponentsView.extend({
+ title: Em.I18n.t('admin.nameNodeFederation.wizard.step2.header'),
+ alertMessage:
Em.computed.i18nFormat('admin.nameNodeFederation.wizard.step2.body',
'controller.content.nameServiceId')
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23624 Additional realm config change not working. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 8c03401 AMBARI-23624 Additional realm config change not working.
(ababiichuk)
8c03401 is described below
commit 8c034016d87135602dfc29e8139334cc4b20ee92
Author: ababiichuk
AuthorDate: Thu Apr 19 17:02:00 2018 +0300
AMBARI-23624 Additional realm config change not working. (ababiichuk)
---
ambari-web/app/controllers/main/admin/kerberos.js | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js
b/ambari-web/app/controllers/main/admin/kerberos.js
index 1b94758..c559398 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -562,7 +562,8 @@ App.MainAdminKerberosController =
App.KerberosWizardStep4Controller.extend({
artifact_data: kerberosDescriptor
}
},
-success: '_updateConfigs'
+success: '_updateConfigs',
+error: 'createKerberosDescriptor'
});
};
this.updateKerberosDescriptor(kerberosDescriptor, configs);
@@ -575,6 +576,21 @@ App.MainAdminKerberosController =
App.KerberosWizardStep4Controller.extend({
}
},
+ createKerberosDescriptor: function (requestData, ajaxOptions, error, opt,
params) {
+if (requestData && requestData.status === 404) {
+ const {artifactName, data} = params;
+ App.ajax.send({
+name: 'admin.kerberos.cluster.artifact.create',
+sender: self,
+data: {
+ artifactName,
+ data
+},
+success: '_updateConfigs'
+ });
+}
+ },
+
/**
* List of the warnings regarding specific services before
enabling/disabling Kerberos.
*
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23614 Move NameNode wizard is stuck on Review step after enabling federation. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk 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 d34a5a7 AMBARI-23614 Move NameNode wizard is stuck on Review step
after enabling federation. (ababiichuk)
d34a5a7 is described below
commit d34a5a72b5b42b0f643cf2077c82120df7a988a6
Author: ababiichuk
AuthorDate: Wed Apr 18 19:57:25 2018 +0300
AMBARI-23614 Move NameNode wizard is stuck on Review step after enabling
federation. (ababiichuk)
---
.../main/service/reassign/step3_controller.js | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git
a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index d994aaf..65ccce9 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -543,8 +543,22 @@ App.ReassignMasterWizardStep3Controller =
Em.Controller.extend({
_getNnInitializerSettings: function (configs) {
var ret = {};
if (App.get('isHaEnabled')) {
- ret.namespaceId = configs['hdfs-site']['dfs.nameservices'];
- ret.suffix = (configs['hdfs-site']['dfs.namenode.http-address.' +
ret.namespaceId + '.nn1'].indexOf(this.get('content.reassignHosts.source')) !=
-1) ? 'nn1' : 'nn2';
+ const configsObject = configs['hdfs-site'],
+nameSpaces = configsObject['dfs.nameservices'].split(','),
+nameSpacesCount = nameSpaces.length,
+propertyNames = Object.keys(configsObject);
+ for (let i = 0; i < nameSpacesCount; i++) {
+const nameSpace = nameSpaces[i],
+ propertyNameStart = `dfs.namenode.http-address.${nameSpace}.`,
+ httpAddressPropertiesNames = propertyNames.filter(propertyName =>
propertyName.startsWith(propertyNameStart)),
+ matchingPropertyName = httpAddressPropertiesNames.find(propertyName
=>
configsObject[propertyName].startsWith(this.get('content.reassignHosts.source')));
+if (matchingPropertyName) {
+ const nameSpaceMatch = matchingPropertyName.match(new
RegExp(`${propertyNameStart}(\\w+)`));
+ ret.namespaceId = nameSpace;
+ ret.suffix = nameSpaceMatch && nameSpaceMatch[1];
+ break;
+}
+ }
}
return ret;
},
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
