This is an automated email from the ASF dual-hosted git repository.
ishanbha 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 264347c [AMBARI-24107] Ranger & Atlas initial install require
additional properties to be explicitly configured in the UI.
264347c is described below
commit 264347cdaf5a23ecb32a30f16f5fda25f9152fb5
Author: Ishan Bhatt <[email protected]>
AuthorDate: Thu Jun 14 12:34:08 2018 -0700
[AMBARI-24107] Ranger & Atlas initial install require additional properties
to be explicitly configured in the UI.
---
ambari-web/app/controllers/wizard/step4_controller.js | 4 +++-
ambari-web/app/controllers/wizard/step7_controller.js | 14 +++++++++++++-
ambari-web/app/messages.js | 8 ++++++--
ambari-web/test/controllers/wizard/step4_test.js | 6 +++---
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js
b/ambari-web/app/controllers/wizard/step4_controller.js
index ec57cac..d0bf657 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -195,7 +195,9 @@ App.WizardStep4Controller = Em.ArrayController.extend({
this.serviceValidation(callback, 'RANGER', 'rangerCheck');
this.serviceValidation(callback, 'ATLAS', 'atlasCheck');
}
- this.dependentServiceValidation('ATLAS', 'AMBARI_INFRA_SOLR',
'ambariInfraCheck', callback);
+ this.dependentServiceValidation('RANGER', 'AMBARI_INFRA_SOLR',
'ambariRangerInfraCheck', callback);
+ this.dependentServiceValidation('ATLAS', 'AMBARI_INFRA_SOLR',
'ambariAtlasInfraCheck', callback);
+ this.dependentServiceValidation('ATLAS', 'HBASE', 'ambariAtlasHbaseCheck',
callback);
this.dependentServiceValidation('LOGSEARCH', 'AMBARI_INFRA_SOLR',
'ambariLogsearchCheck', callback);
this.rangerValidation(callback);
this.sparkValidation(callback);
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 204d4be..8acdaf8 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -590,10 +590,16 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
}
var rangerService = App.StackService.find().findProperty('serviceName',
'RANGER');
- var isRangerServicePresent = rangerService &&
(rangerService.get('isInstalled') || rangerService.get('isSelected'));
+ const isRangerServicePresent = rangerService &&
(rangerService.get('isInstalled') || rangerService.get('isSelected'));
+ var infraSolrService = App.StackService.find().findProperty('serviceName',
'AMBARI_INFRA_SOLR');
+ const isInfraSolrPresent = infraSolrService &&
(infraSolrService.get('isInstalled') || infraSolrService.get('isSelected'));
if(isRangerServicePresent && (this.get('wizardController.name') ===
'installerController' || this.get('wizardController.name') ===
'addServiceController')) {
this.setRangerPluginsEnabled(serviceConfigs);
+ if (isInfraSolrPresent) {
+ this.setSolrCloudOn(serviceConfigs);
+ }
}
+
this.set('stepConfigs', serviceConfigs);
this.set('stepConfigsCreated', true);
this.updateConfigAttributesFromThemes();
@@ -656,6 +662,12 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
});
},
+ setSolrCloudOn: function(stepConfigs) {
+ var rangerServiceConfigs = stepConfigs.findProperty('serviceName',
'RANGER').get('configs');
+ var solrCloudEnabledProperty = rangerServiceConfigs.findProperty('name',
'is_solrCloud_enabled');
+ Em.set(solrCloudEnabledProperty, 'value', 'true');
+ },
+
/**
*
* Makes installed service's configs resulting into component actions
(add/delete) non editable on Add Service Wizard
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index edf43f7..4686e66 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -902,8 +902,12 @@ Em.I18n.translations = {
'installer.step4.limitedFunctionality.popup.header':'Limited Functionality
Warning',
'installer.step4.ambariMetricsCheck.popup.header': 'Ambari Metrics',
'installer.step4.ambariMetricsCheck.popup.body':'Ambari Metrics collects
metrics from the cluster and makes them available to Ambari. If you do not
install Ambari Metrics service, metrics will not be accessible from Ambari.
Are you sure you want to proceed without Ambari Metrics?',
- 'installer.step4.ambariInfraCheck.popup.header': 'Ambari Infra',
- 'installer.step4.ambariInfraCheck.popup.body':'Since Ambari Infra is not
selected, you must supply your own Solr to make Atlas work. Are you sure you
want to proceed?',
+ 'installer.step4.ambariRangerInfraCheck.popup.header': 'Infra Solr',
+ 'installer.step4.ambariRangerInfraCheck.popup.body':'In order for Ranger to
work, Solr is required. Either select Infra Solr to be added to the cluster, or
ensure you configure your own during the Customize Services step.',
+ 'installer.step4.ambariAtlasInfraCheck.popup.header': 'Infra Solr',
+ 'installer.step4.ambariAtlasInfraCheck.popup.body':'In order for Atlas to
work, Solr is required. Either select Infra Solr to be added to the cluster, or
ensure you configure your own during the Customize Services step.',
+ 'installer.step4.ambariAtlasHbaseCheck.popup.header': 'HBase',
+ 'installer.step4.ambariAtlasHbaseCheck.popup.body':'In order for Atlas to
work, HBase is required. Either select HBase to be added to the cluster, or
ensure you configure your own during the Customize Services step.',
'installer.step4.ambariLogsearchCheck.popup.header': 'Ambari Logsearch',
'installer.step4.ambariLogsearchCheck.popup.body':'Since Ambari Infra is not
selected, you must supply your own Solr to make Log Search work. Are you sure
you want to proceed?',
'installer.step4.smartSenseCheck.popup.header': 'Apache SmartSense',
diff --git a/ambari-web/test/controllers/wizard/step4_test.js
b/ambari-web/test/controllers/wizard/step4_test.js
index c2248e9..247e316 100644
--- a/ambari-web/test/controllers/wizard/step4_test.js
+++ b/ambari-web/test/controllers/wizard/step4_test.js
@@ -338,7 +338,7 @@ describe('App.WizardStep4Controller', function () {
},
{
services: ['RANGER'],
- errorsExpected: ['ambariMetricsCheck', 'smartSenseCheck',
'atlasCheck', 'rangerRequirements']
+ errorsExpected: ['ambariMetricsCheck', 'smartSenseCheck',
'atlasCheck', 'ambariRangerInfraCheck', 'rangerRequirements']
},
{
services: ['SMARTSENSE'],
@@ -346,7 +346,7 @@ describe('App.WizardStep4Controller', function () {
},
{
services: ['ATLAS', 'AMBARI_METRICS', 'SMARTSENSE'],
- errorsExpected: ['rangerCheck', 'ambariInfraCheck', ]
+ errorsExpected: ['rangerCheck', 'ambariAtlasInfraCheck',
'ambariAtlasHbaseCheck']
},
{
services: ['LOGSEARCH', 'AMBARI_METRICS', 'SMARTSENSE'],
@@ -354,7 +354,7 @@ describe('App.WizardStep4Controller', function () {
},
{
services: ['ATLAS', 'AMBARI_METRICS', 'SMARTSENSE', 'RANGER'],
- errorsExpected: ['ambariInfraCheck', 'rangerRequirements']
+ errorsExpected: ['ambariRangerInfraCheck', 'ambariAtlasInfraCheck',
'ambariAtlasHbaseCheck', 'rangerRequirements']
},
],
controllerNames = ['installerController', 'addServiceController'],
--
To stop receiving notification emails like this one, please contact
[email protected].
