You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/09/18 13:28:08 UTC
[1/4] ambari git commit: AMBARI-13142 UI configs clean up.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 1ad65df0b -> 8867b3685
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/controllers/wizard/step8_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js
index f1784e3..0eb3ed5 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -758,70 +758,6 @@ describe('App.WizardStep8Controller', function () {
});
});
- describe('#loadConfigs', function () {
- beforeEach(function () {
- sinon.stub(App.config, 'excludeUnsupportedConfigs', Em.K);
- sinon.stub(installerStep8Controller, 'loadUiSideConfigs', Em.K);
- });
- afterEach(function () {
- App.config.excludeUnsupportedConfigs.restore();
- installerStep8Controller.loadUiSideConfigs.restore();
- });
- it('should stringify serviceConfigProperties', function () {
- var serviceConfigProperties = [
- {name: 'oozie_hostname', value: true},
- {name: 'oozie_existing_oracle_host', value: true},
- {name: 'hive_database', value: false},
- {name: 'oozie_database', value: false}
- ];
- var services = Em.A([
- Em.Object.create({serviceName: 's1'}),
- Em.Object.create({serviceName: 's2'}),
- Em.Object.create({serviceName: 's3'})
- ]);
- var content = Em.Object.create({
- services: services,
- serviceConfigProperties: serviceConfigProperties
- });
- installerStep8Controller.set('content', content);
- installerStep8Controller.set('configs', Em.A([]));
- installerStep8Controller.loadConfigs();
- var expected = [
- {'name': 'oozie_hostname', 'value': 'true'},
- {'name': 'oozie_existing_oracle_host', 'value': 'true'},
- {'name': 'hive_database', 'value': 'false'},
- {'name': 'oozie_database', 'value': 'false'}
- ];
- expect(JSON.parse(JSON.stringify(serviceConfigProperties))).to.eql(expected);
- });
- });
-
- describe('#configMapping', function () {
- it('should object with isOverridable', function () {
- var configMapping = [
- {foreignKey: null, templateName: 't1', value: 'v1', name: 'c1', filename: 'f1'},
- {foreignKey: null, templateName: 't2', value: 'v2', name: 'c2', filename: 'f2'},
- {foreignKey: null, templateName: 't3', value: 'v3', name: 'c3', filename: 'f2'},
- {foreignKey: null, templateName: 't4', value: 'v4', name: 'c4', filename: 'f1'}
- ];
- installerStep8Controller.set(configMapping);
- var result = {
- "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
- "templateName": [
- "proxyuser_group"
- ],
- "foreignKey": [
- "hive_user"
- ],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- };
-
- expect(installerStep8Controller.get('configMapping')[0]).to.eql(result);
- });
- });
-
describe('#loadStep', function () {
beforeEach(function () {
sinon.stub(installerStep8Controller, 'clearStep', Em.K);
@@ -870,180 +806,6 @@ describe('App.WizardStep8Controller', function () {
});
});
- describe('#removeHiveConfigs', function () {
- Em.A([
- {
- globals: [
- {name: 'hive_database', value: 'New MySQL Database'},
- {name: 'hive_database_type', value: 'mysql'},
- {name: 'hive_ambari_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database', 'hive_master_hosts']),
- m: 'hive_database: New MySQL Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'hive_database', value: 'New PostgreSQL Database'},
- {name: 'hive_database_type', value: 'postgresql'},
- {name: 'hive_ambari_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database', 'hive_master_hosts']),
- m: 'hive_database: New PostgreSQL Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'hive_database', value: 'Existing MySQL Database'},
- {name: 'hive_database_type', value: 'mysql'},
- {name: 'hive_existing_mysql_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database', 'hive_master_hosts']),
- m: 'hive_database: Existing MySQL Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'hive_database', value: 'Existing MSSQL Server database with SQL authentication'},
- {name: 'hive_database_type', value: 'mssql_server'},
- {name: 'hive_existing_mssql_server_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database', 'hive_master_hosts']),
- m: 'hive_database: Existing MSSQL Server Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'hive_database', value: 'Existing MSSQL Server database with integrated authentication'},
- {name: 'hive_database_type', value: 'mssql_server2'},
- {name: 'hive_existing_mssql_server_2_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database', 'hive_master_hosts']),
- m: 'hive_database: Existing MSSQL Server database with integrated authentication',
- host: 'h1'
- },
- {
- globals: [
- {name: 'hive_database', value: 'Existing PostgreSQL Database'},
- {name: 'hive_database_type', value: 'postgresql'},
- {name: 'hive_existing_postgresql_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_mysql_database', 'hive_master_hosts']),
- m: 'hive_database: Existing PostgreSQL Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'hive_database', value: 'Existing Oracle Database'},
- {name: 'hive_database_type', value: 'oracle'},
- {name: 'hive_existing_oracle_host', value: 'h1'},
- {name: 'hive_hostname', value: 'h2'}
- ],
- removed: Em.A(['hive_ambari_database', 'hive_existing_mysql_database', 'hive_existing_postgresql_database', 'hive_master_hosts']),
- m: 'hive_database: Existing Oracle Database',
- host: 'h1'
- }
- ]).forEach(function (test) {
- it(test.m, function () {
- test.removed.forEach(function (c) {
- test.globals.pushObject({name: c})
- });
- var configs = installerStep8Controller.removeHiveConfigs(test.globals);
- test.removed.forEach(function(name) {
- expect(Em.isNone(configs.findProperty('name', name))).to.equal(true);
- });
- expect(configs.findProperty('name', 'hive_hostname').value).to.equal(test.host);
- });
- });
- });
-
- describe('#removeOozieConfigs', function () {
- Em.A([
- {
- globals: [
- {name: 'oozie_database', value: 'New Derby Database'},
- {name: 'oozie_ambari_host', value: 'h1'},
- {name: 'oozie_hostname', value: 'h2'}
- ],
- removed: Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_existing_oracle_database',
- 'oozie_existing_postgresql_database']),
- m: 'oozie_database: New Derby Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'oozie_database', value: 'Existing MySQL Database'},
- {name: 'oozie_existing_mysql_host', value: 'h1'},
- {name: 'oozie_hostname', value: 'h2'}
- ],
- removed: Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_derby_database',
- 'oozie_existing_postgresql_database']),
- m: 'oozie_database: Existing MySQL Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'oozie_database', value: 'Existing PostgreSQL Database'},
- {name: 'oozie_existing_postgresql_host', value: 'h1'},
- {name: 'oozie_hostname', value: 'h2'}
- ],
- removed: Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_existing_mysql_database']),
- m: 'oozie_database: Existing PostgreSQL Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'oozie_database', value: 'Existing MSSQL Server database with SQL authentication'},
- {name: 'oozie_existing_mssql_server_host', value: 'h1'},
- {name: 'oozie_hostname', value: 'h2'}
- ],
- removed: Em.A(['oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mysql_database']),
- m: 'oozie_database: Existing MSSQL with SQL authentication Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'oozie_database', value: 'Existing MSSQL Server database with integrated authentication'},
- {name: 'oozie_existing_mssql_server_2_host', value: 'h1'},
- {name: 'oozie_hostname', value: 'h2'}
- ],
- removed: Em.A(['oozie_existing_mssql_server_database', 'oozie_existing_oracle_database', 'oozie_existing_mysql_database']),
- m: 'oozie_database: Existing MSSQL with integrated authentication Database',
- host: 'h1'
- },
- {
- globals: [
- {name: 'oozie_database', value: 'Existing Oracle Database'},
- {name: 'oozie_existing_oracle_host', value: 'h1'},
- {name: 'oozie_hostname', value: 'h2'}
- ],
- removed: Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_derby_database',
- 'oozie_existing_postgresql_database']),
- m: 'oozie_database: Existing Oracle Database',
- host: 'h1'
- }
- ]).forEach(function (test) {
- it(test.m, function () {
- test.removed.forEach(function (c) {
- if (!test.globals.findProperty('name', c)) {
- test.globals.pushObject({name: c})
- }
- });
- var configs = installerStep8Controller.removeOozieConfigs(test.globals);
- test.removed.forEach(function(name) {
- expect(Em.isNone(configs.findProperty('name', name))).to.equal(true);
- });
- expect(configs.findProperty('name', 'oozie_hostname').value).to.equal(test.host);
- });
- });
- });
-
describe('#getRegisteredHosts', function() {
Em.A([
{
@@ -1646,41 +1408,6 @@ describe('App.WizardStep8Controller', function () {
});
});
- describe('#loadUiSideConfigs', function() {
- beforeEach(function() {
- sinon.stub(App.config, 'setConfigValue', Em.K);
- sinon.stub(installerStep8Controller, 'get').withArgs('content.serviceConfigProperties').returns([
- { name: 'c9', filename: 'f3'}
- ]);
- });
- afterEach(function() {
- App.config.setConfigValue.restore();
- installerStep8Controller.get.restore();
- });
-
- it('configs with foreignKey', function() {
- var configMapping = [
- {foreignKey: 'fk1', templateName: 't5', value: 'v5', name: 'c5', filename: 'f1'},
- {foreignKey: 'fk2', templateName: 't6', value: 'v6', name: 'c6', filename: 'f1'},
- {foreignKey: 'fk3', templateName: 't7', value: 'v7', name: 'c7', filename: 'f2'},
- {foreignKey: 'fk4', templateName: 't8', value: 'v8', name: 'c8', filename: 'f2'},
- {foreignKey: 'fk5', templateName: 't9', value: 'v9', name: 'c9', filename: 'f3'}
- ];
- var uiConfigs = installerStep8Controller.loadUiSideConfigs(configMapping);
- // should ignore one config that was saved in contentServiceConfigProperties
- expect(uiConfigs.length).to.equal(configMapping.length - 1);
- expect(uiConfigs.findProperty('name', 'c9')).to.be.undefined;
- expect(uiConfigs.everyProperty('id', 'site property')).to.be.true;
- uiConfigs.forEach(function(c, index) {
- if (Em.isNone(configMapping[index].foreignKey))
- expect(c.overrides).to.be.an.array;
- expect(c.value).to.equal(configMapping[index].value);
- expect(c.name).to.equal(configMapping[index].name);
- expect(c.filename).to.equal(configMapping[index].filename);
- });
- });
- });
-
describe('Queued requests', function() {
beforeEach(function() {
@@ -1998,69 +1725,6 @@ describe('App.WizardStep8Controller', function () {
});
- describe("#resolveProxyuserDependecies()", function() {
- it("No core-site configs", function() {
- expect(installerStep8Controller.resolveProxyuserDependecies([], [])).to.be.empty;
- });
- it("Only proxyuser group config", function() {
- var configs = [{
- name: 'proxyuser_group'
- }];
- installerStep8Controller.set('configs', [{
- name: 'proxyuser_group',
- value: 'val1'
- }]);
- expect(installerStep8Controller.resolveProxyuserDependecies(configs, [])).to.be.empty;
- });
- it("Property should be added", function() {
- var configs = [
- {
- name: 'proxyuser_group'
- },
- {
- name: 'hadoop.proxyuser.user.hosts',
- value: 'val2'
- }
- ];
- installerStep8Controller.set('configs', [{
- name: 'proxyuser_group',
- value: 'val1'
- }]);
- expect(installerStep8Controller.resolveProxyuserDependecies(configs, [])).to.be.eql({
- 'hadoop.proxyuser.user.hosts': 'val2',
- 'proxyuser_group': 'val1'
- });
- });
- it("Property should be skipped", function() {
- var configs = [
- {
- name: 'proxyuser_group'
- },
- {
- name: 'hadoop.proxyuser.user.hosts',
- value: 'val2'
- }
- ];
- installerStep8Controller.set('configs', [
- {
- name: 'proxyuser_group',
- value: 'val1'
- },
- {
- name: 'user1',
- value: 'user'
- }
- ]);
- installerStep8Controller.set('optionalCoreSiteConfigs', [
- {
- serviceName: 'S1',
- user: 'user1'
- }
- ]);
- expect(installerStep8Controller.resolveProxyuserDependecies(configs, [])).to.be.empty;
- });
- });
-
describe('#isAllClusterDeleteRequestsCompleted', function () {
it('should depend on completed cluster delete requests number', function () {
installerStep8Controller.setProperties({
@@ -2192,12 +1856,6 @@ describe('App.WizardStep8Controller', function () {
title: 'Installer, no configs to update'
},
{
- controllerName: 'installerController',
- notExecuted: ['createAdditionalClientComponents'],
- fileNamesToUpdate: [''],
- title: 'Installer, some configs to be updated'
- },
- {
controllerName: 'addHostController',
notExecuted: ['updateConfigurations', 'createConfigurations', 'applyConfigurationsToCluster', 'createAdditionalClientComponents'],
title: 'Add Host Wizard'
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/mock_data_setup/configs_mock_data.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mock_data_setup/configs_mock_data.js b/ambari-web/test/mock_data_setup/configs_mock_data.js
index 6c50628..741b04d 100644
--- a/ambari-web/test/mock_data_setup/configs_mock_data.js
+++ b/ambari-web/test/mock_data_setup/configs_mock_data.js
@@ -237,7 +237,6 @@ module.exports = {
"description":"desc",
"isSecureConfig":false,
"category":"General",
- "id":"site property",
"displayName":"storm.zookeeper.servers"
},
{
@@ -249,7 +248,6 @@ module.exports = {
"isOverridable":true,
"showLabel":true,
"serviceName":"STORM",
- "id":"site property",
"displayType":"advanced",
"displayName":"single_line_property",
"category":"AdvancedStormSite"
@@ -263,7 +261,6 @@ module.exports = {
"isOverridable":true,
"showLabel":true,
"serviceName":"STORM",
- "id":"site property",
"displayType":"multiLine",
"displayName":"multi_line_property",
"category":"AdvancedStormSite"
@@ -278,7 +275,6 @@ module.exports = {
"showLabel":true,
"serviceName":"STORM",
"isVisible":false,
- "id":"puppet var",
"displayName":null,
"options":null
},
@@ -299,7 +295,6 @@ module.exports = {
"index":1,
"isSecureConfig":false,
"category":"DataNode",
- "id":"site property",
"displayName":"DataNode directories"
},
{
@@ -319,7 +314,6 @@ module.exports = {
"description":"desc",
"isSecureConfig":false,
"category":"AdvancedHDFSLog4j",
- "id":"site property",
"displayName":"content"
},
{
@@ -339,7 +333,6 @@ module.exports = {
"description":"desc",
"isSecureConfig":false,
"category":"AdvancedHDFSLog4j",
- "id":"site property",
"displayName":"content"
},
{
@@ -359,7 +352,6 @@ module.exports = {
"description":"Storm log directory",
"isSecureConfig":false,
"category":"General",
- "id":"puppet var",
"displayName":"storm_log_dir"
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/models/configs/objects/service_config_property_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/configs/objects/service_config_property_test.js b/ambari-web/test/models/configs/objects/service_config_property_test.js
index 3ec078b..ef1b4ce 100644
--- a/ambari-web/test/models/configs/objects/service_config_property_test.js
+++ b/ambari-web/test/models/configs/objects/service_config_property_test.js
@@ -185,7 +185,6 @@ var serviceConfigProperty,
},
{
initial: {
- id: 'puppet var',
value: '',
savedValue: 'default',
recommendedValue: 'recommended'
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/utils/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index 0210de6..4f0fa21 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -25,40 +25,6 @@ var modelSetup = setups.configs;
describe('App.config', function () {
- var loadServiceSpecificConfigs = function(context, serviceName) {
- context.configGroups = modelSetup.setupConfigGroupsObject(serviceName);
- context.advancedConfigs = modelSetup.setupAdvancedConfigsObject();
- context.tags = modelSetup.setupServiceConfigTagsObject(serviceName);
- context.result = App.config.mergePreDefinedWithLoaded(context.configGroups, context.advancedConfigs, context.tags, App.Service.find().findProperty('id', serviceName).get('serviceName'));
- };
-
- var loadAllServicesConfigs = function(context, serviceNames) {
- context.configGroups = modelSetup.setupConfigGroupsObject();
- };
-
- var loadServiceModelsData = function(serviceNames) {
- serviceNames.forEach(function(serviceName) {
- App.store.load(App.Service, {
- id: serviceName,
- service_name: serviceName
- });
- });
- };
-
- describe('#handleSpecialProperties', function () {
- var config = {};
- it('value should be transformed to "1024" from "1024m"', function () {
- config = {
- displayType: 'int',
- value: '1024m',
- savedValue: '1024m'
- };
- App.config.handleSpecialProperties(config);
- expect(config.value).to.equal('1024');
- expect(config.savedValue).to.equal('1024');
- });
- });
-
describe('#fileConfigsIntoTextarea', function () {
var filename = 'capacity-scheduler.xml';
var configs = [
@@ -449,35 +415,6 @@ describe('App.config', function () {
});
- describe('#replaceConfigValues', function () {
-
- var cases = [
- {
- name: 'name',
- express: '<templateName[0]>',
- value: '<templateName[0]>',
- globValue: 'v',
- expected: 'v',
- title: 'default case'
- },
- {
- name: 'templeton.hive.properties',
- express: '<templateName[0]>',
- value: 'hive.matestore.uris=<templateName[0]>',
- globValue: 'thrift://h0:9933,thrift://h1:9933,thrift://h2:9933',
- expected: 'hive.matestore.uris=thrift://h0:9933\\,thrift://h1:9933\\,thrift://h2:9933',
- title: 'should escape commas for templeton.hive.properties'
- }
- ];
-
- cases.forEach(function (item) {
- it(item.title, function () {
- expect(App.config.replaceConfigValues(item.name, item.express, item.value, item.globValue)).to.equal(item.expected);
- });
- });
-
- });
-
describe('#advancedConfigIdentityData', function () {
var configs = [
@@ -631,148 +568,6 @@ describe('App.config', function () {
});
- describe('#setConfigValue', function () {
-
- Em.A([
- {
- mappedConfigs: [
- {
- name: 'falcon_user',
- value: 'fu'
- }
- ],
- allConfigs: [],
- m: 'in mapped, value used',
- e: {
- _name: 'hadoop.proxyuser.fu.groups',
- value: 'fu',
- noMatchSoSkipThisConfig: false
- }
- },
- {
- mappedConfigs: [],
- allConfigs: [
- {
- name: 'falcon_user',
- value: 'fu'
- }
- ],
- m: 'in all, value used',
- e: {
- _name: 'hadoop.proxyuser.fu.groups',
- value: 'fu',
- noMatchSoSkipThisConfig: false
- }
- },
- {
- mappedConfigs: [],
- allConfigs: [
- {
- name: 'falcon_user',
- value: '',
- recommendedValue: 'fu'
- }
- ],
- m: 'in all, default value used',
- e: {
- _name: 'hadoop.proxyuser.fu.groups',
- value: 'fu',
- noMatchSoSkipThisConfig: false
- }
- },
- {
- mappedConfigs: [],
- allConfigs: [],
- m: 'not found',
- e: {
- _name: 'hadoop.proxyuser.<foreignKey[0]>.groups',
- value: '<foreignKey[0]>',
- noMatchSoSkipThisConfig: true
- }
- }
- ]).forEach(function (test) {
- it(test.m, function () {
- var config = {
- name: "hadoop.proxyuser.<foreignKey[0]>.groups",
- templateName: ["proxyuser_group"],
- foreignKey: ["falcon_user"],
- noMatchSoSkipThisConfig: false,
- value: "<foreignKey[0]>"
- };
- App.config.setConfigValue(test.mappedConfigs, test.allConfigs, config);
- expect(config.value).to.equal(test.e.value);
- if(test.e.noMatchSoSkipThisConfig) {
- expect(Em.isNone(config._name)).to.be.true;
- }
- else {
- expect(config._name).to.equal(test.e._name);
- }
- expect(config.noMatchSoSkipThisConfig).to.equal(test.e.noMatchSoSkipThisConfig);
- });
-
- Em.A([
- {
- mappedConfigs: [],
- allConfigs: [
- {
- name: 'falcon_user',
- value: 'fu'
- },
- {
- name: 'proxyuser_group',
- value: 'pg'
- }
- ],
- m: 'in all, template in all',
- e: {
- _name: 'hadoop.proxyuser.fu.groups',
- value: 'fupg'
- }
- },
- {
- mappedConfigs: [
- {
- name: 'falcon_user',
- value: 'fu'
- },
- {
- name: 'proxyuser_group',
- value: 'pg'
- }
- ],
- allConfigs: [],
- m: 'in mapped, template in mapped',
- e: {
- _name: 'hadoop.proxyuser.fu.groups',
- value: 'fupg'
- }
- },
- {
- mappedConfigs: [],
- allConfigs: [],
- m: 'not found (template not found too)',
- e: {
- _name: 'hadoop.proxyuser.<foreignKey[0]>.groups',
- value: null
- }
- }
- ]).forEach(function (test) {
- it(test.m, function () {
- var config = {
- name: "hadoop.proxyuser.<foreignKey[0]>.groups",
- templateName: ["proxyuser_group"],
- foreignKey: ["falcon_user"],
- noMatchSoSkipThisConfig: false,
- value: "<foreignKey[0]><templateName[0]>"
- };
- App.config.setConfigValue(test.mappedConfigs, test.allConfigs, config);
- });
- });
-
- });
-
- });
-
describe('#shouldSupportFinal', function () {
var cases = [
@@ -1198,9 +993,6 @@ describe('App.config', function () {
sinon.stub(App.config, 'getIsSecure', function() {
return false;
});
- sinon.stub(App.config, 'getDefaultIsShowLabel', function() {
- return true;
- });
sinon.stub(App.config, 'shouldSupportFinal', function() {
return true;
});
@@ -1211,7 +1003,6 @@ describe('App.config', function () {
App.config.getDefaultDisplayType.restore();
App.config.getDefaultCategory.restore();
App.config.getIsSecure.restore();
- App.config.getDefaultIsShowLabel.restore();
App.config.shouldSupportFinal.restore();
});
@@ -1238,7 +1029,6 @@ describe('App.config', function () {
isUserProperty: false,
isRequired: true,
group: null,
- id: 'site property',
isRequiredByAgent: true,
isReconfigurable: true,
unit: null,
@@ -1258,7 +1048,6 @@ describe('App.config', function () {
expect(App.config.getDefaultDisplayType.calledWith('pName', 'pFileName', '')).to.be.true;
expect(App.config.getDefaultCategory.calledWith(true, 'pFileName')).to.be.true;
expect(App.config.getIsSecure.calledWith('pName')).to.be.true;
- expect(App.config.getDefaultIsShowLabel.calledWith('pName', 'pFileName')).to.be.true;
expect(App.config.shouldSupportFinal.calledWith('pServiceName', 'pFileName')).to.be.true;
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/utils/configs/config_property_helper_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/configs/config_property_helper_test.js b/ambari-web/test/utils/configs/config_property_helper_test.js
index 228cfdc..960e4c3 100644
--- a/ambari-web/test/utils/configs/config_property_helper_test.js
+++ b/ambari-web/test/utils/configs/config_property_helper_test.js
@@ -344,7 +344,7 @@ describe('configPropertyHelper', function () {
name: 'kafka.ganglia.metrics.host',
value: 'localhost'
});
- configPropertyHelper.initialValue(serviceConfigProperty, item.localDB);
+ configPropertyHelper.initialValue(serviceConfigProperty, item.localDB, []);
expect(serviceConfigProperty.get('value')).to.equal(item.expected);
});
});
@@ -361,7 +361,7 @@ describe('configPropertyHelper', function () {
value: item.receivedValue,
options: item.options
});
- configPropertyHelper.initialValue(serviceConfigProperty, {});
+ configPropertyHelper.initialValue(serviceConfigProperty, {}, []);
expect(serviceConfigProperty.get('value')).to.equal(item.value);
expect(serviceConfigProperty.get('options').findProperty('displayName', 'New MySQL Database').hidden).to.equal(item.hidden);
App.get.restore();
@@ -385,7 +385,7 @@ describe('configPropertyHelper', function () {
};
}
}
- });
+ }, []);
expect(serviceConfigProperty.get('value')).to.equal(item.value);
expect(serviceConfigProperty.get('recommendedValue')).to.equal(item.recommendedValue);
});
@@ -394,13 +394,13 @@ describe('configPropertyHelper', function () {
it(cases['hivemetastore_host'].title, function () {
serviceConfigProperty.set('name', 'hivemetastore_host');
- configPropertyHelper.initialValue(serviceConfigProperty, cases['hivemetastore_host'].localDB);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['hivemetastore_host'].localDB, []);
expect(serviceConfigProperty.get('value')).to.eql(cases['hivemetastore_host'].value);
});
it(cases['hive_master_hosts'].title, function () {
serviceConfigProperty.set('name', 'hive_master_hosts');
- configPropertyHelper.initialValue(serviceConfigProperty, cases['hive_master_hosts'].localDB);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['hive_master_hosts'].localDB, []);
expect(serviceConfigProperty.get('value')).to.equal(cases['hive_master_hosts'].value);
});
@@ -409,7 +409,7 @@ describe('configPropertyHelper', function () {
name: 'hive.metastore.uris',
recommendedValue: cases['hive.metastore.uris'].recommendedValue
});
- configPropertyHelper.initialValue(serviceConfigProperty, cases['hive.metastore.uris'].localDB, cases['hive.metastore.uris'].dependencies);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['hive.metastore.uris'].localDB, [{name:'hive.metastore.uris', recommendedValue:cases['hive.metastore.uris'].dependencies['hive.metastore.uris'], filename: 'hive-site.xml'}]);
expect(serviceConfigProperty.get('value')).to.equal(cases['hive.metastore.uris'].value);
expect(serviceConfigProperty.get('recommendedValue')).to.equal(cases['hive.metastore.uris'].value);
});
@@ -420,7 +420,7 @@ describe('configPropertyHelper', function () {
recommendedValue: cases['templeton.hive.properties'].recommendedValue,
value: cases['templeton.hive.properties'].recommendedValue
});
- configPropertyHelper.initialValue(serviceConfigProperty, cases['templeton.hive.properties'].localDB, cases['templeton.hive.properties'].dependencies);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['templeton.hive.properties'].localDB, [{name:'hive.metastore.uris', recommendedValue:cases['templeton.hive.properties'].dependencies['hive.metastore.uris'], filename: 'hive-site.xml'}]);
expect(serviceConfigProperty.get('value')).to.equal(cases['templeton.hive.properties'].value);
expect(serviceConfigProperty.get('recommendedValue')).to.equal(cases['templeton.hive.properties'].value);
});
@@ -430,20 +430,20 @@ describe('configPropertyHelper', function () {
name: 'yarn.resourcemanager.zk-address',
recommendedValue: cases['yarn.resourcemanager.zk-address'].recommendedValue
});
- configPropertyHelper.initialValue(serviceConfigProperty, cases['yarn.resourcemanager.zk-address'].localDB, cases['yarn.resourcemanager.zk-address'].dependencies);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['yarn.resourcemanager.zk-address'].localDB, [{name:'clientPort', recommendedValue:cases['yarn.resourcemanager.zk-address'].dependencies['clientPort'], filename: 'zoo.cfg.xml'}]);
expect(serviceConfigProperty.get('value')).to.equal(cases['yarn.resourcemanager.zk-address'].value);
expect(serviceConfigProperty.get('recommendedValue')).to.equal(cases['yarn.resourcemanager.zk-address'].value);
});
it(cases['oozieserver_host'].title, function () {
serviceConfigProperty.set('name', 'oozieserver_host');
- configPropertyHelper.initialValue(serviceConfigProperty, cases['oozieserver_host'].localDB);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['oozieserver_host'].localDB, []);
expect(serviceConfigProperty.get('value')).to.eql(cases['oozieserver_host'].value);
});
it(cases['knox_gateway_host'].title, function () {
serviceConfigProperty.set('name', 'knox_gateway_host');
- configPropertyHelper.initialValue(serviceConfigProperty, cases['knox_gateway_host'].localDB);
+ configPropertyHelper.initialValue(serviceConfigProperty, cases['knox_gateway_host'].localDB, []);
expect(serviceConfigProperty.get('value')).to.eql(cases['knox_gateway_host'].value);
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index e0b2409..f9ec764 100644
--- a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++ b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -263,7 +263,6 @@ describe('App.ServiceConfigsByCategoryView', function () {
displayType: 'advanced',
isSecureConfig: true,
category: 'c0',
- id: 'site property',
serviceName: 's0',
savedValue: null,
supportsFinal: true,
@@ -292,7 +291,6 @@ describe('App.ServiceConfigsByCategoryView', function () {
displayType: 'multiLine',
isSecureConfig: false,
category: 'c1',
- id: 'site property',
serviceName: 's1',
savedValue: null,
supportsFinal: false,
@@ -334,7 +332,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
view.createProperty(item.propertyObj);
expect(view.get('serviceConfigs').filterProperty('name', item.propertyObj.name)).to.have.length(1);
expect(view.get('serviceConfigs').findProperty('name', item.propertyObj.name).getProperties([
- 'name', 'displayName', 'value', 'displayType', 'isSecureConfig', 'category', 'id', 'serviceName', 'savedValue',
+ 'name', 'displayName', 'value', 'displayType', 'isSecureConfig', 'category', 'serviceName', 'savedValue',
'supportsFinal', 'filename', 'isUserProperty', 'isNotSaved', 'isRequired', 'group', 'isOverridable'
])).to.eql(item.result);
});
[2/4] ambari git commit: AMBARI-13142 UI configs clean up.
(ababiichuk)
Posted by ab...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/data/HDP2/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js
deleted file mode 100644
index 2eab405d..0000000
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ /dev/null
@@ -1,158 +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.
- */
-
-var App = require('app');
-var configs = [
-/**********************************************core-site***************************************/
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
- "templateName": ["proxyuser_group"],
- "foreignKey": ["hive_user"],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
- "templateName": ["hive_master_hosts"],
- "foreignKey": ["hive_user"],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
- "templateName": [],
- "foreignKey": ["oozie_user"],
- "value": "*",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
- "templateName": ["oozieserver_host"],
- "foreignKey": ["oozie_user"],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
- "templateName": ["proxyuser_group"],
- "foreignKey": ["webhcat_user"],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
- "templateName": ["hive_master_hosts"],
- "foreignKey": ["webhcat_user"],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
- "templateName": ["proxyuser_group"],
- "foreignKey": ["falcon_user"],
- "value": "<templateName[0]>",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
- "templateName": [],
- "foreignKey": ["falcon_user"],
- "value": "*",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
- "templateName": [],
- "foreignKey": ["hdfs_user"],
- "value": "*",
- "filename": "core-site.xml",
- "isOverridable": true
- },
- {
- "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
- "templateName": [],
- "foreignKey": ["hdfs_user"],
- "value": "*",
- "filename": "core-site.xml",
- "isOverridable": true
- },
-/**********************************Oozie******************************/
-
- {
- "name": "oozie.service.ProxyUserService.proxyuser.<foreignKey[0]>.groups",
- "templateName": [],
- "foreignKey": ["falcon_user"],
- "value": "*",
- "filename": "oozie-site.xml",
- "isOverridable": true,
- "serviceName": "OOZIE"
- },
- {
- "name": "oozie.service.ProxyUserService.proxyuser.<foreignKey[0]>.hosts",
- "templateName": [],
- "foreignKey": ["falcon_user"],
- "value": "*",
- "filename": "oozie-site.xml",
- "isOverridable": true,
- "serviceName": "OOZIE"
- }
-];
-
-/**
- * Configs consists of 2 types: Computed values, which cannot be modified by user
- * and overridable values, which user can modify. We provide interface how to get all of this
- * configs separately
- * @type {Object}
- */
-module.exports = {
-
- checkPrecondition: function () {
- return configs.filter(function (config) {
- return ((!config.precondition) || (config.precondition()));
- });
- },
- all: function (skipPreconditionCheck) {
- if (skipPreconditionCheck) {
- return configs.slice(0);
- } else {
- return this.checkPrecondition().slice(0);
- }
- },
- overridable: function (skipPreconditionCheck) {
- if (skipPreconditionCheck) {
- return configs.filterProperty('foreignKey');
- } else {
- return this.checkPrecondition().filterProperty('foreignKey');
- }
- },
- computed: function (skipPreconditionCheck) {
- if (skipPreconditionCheck) {
- return configs.filterProperty('foreignKey', null);
- } else {
- return this.checkPrecondition().filterProperty('foreignKey', null);
- }
- }
-};
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/data/HDP2/ha_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/ha_properties.js b/ambari-web/app/data/HDP2/ha_properties.js
index a8a24b1..dbbf81e 100644
--- a/ambari-web/app/data/HDP2/ha_properties.js
+++ b/ambari-web/app/data/HDP2/ha_properties.js
@@ -30,7 +30,6 @@ module.exports =
configs: [
/**********************************************HDFS***************************************/
{
- "id": "site property",
"name": "dfs.journalnode.edits.dir",
"displayName": "dfs.journalnode.edits.dir",
"description": "The Directory where the JournalNode will store its local state.",
@@ -43,7 +42,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "fs.defaultFS",
"displayName": "fs.defaultFS",
"description": "The default path prefix used by the Hadoop FS client when none is given.",
@@ -55,7 +53,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "ha.zookeeper.quorum",
"displayName": "ha.zookeeper.quorum",
"isReconfigurable": false,
@@ -67,7 +64,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.nameservices",
"displayName": "dfs.nameservices",
"description": "Comma-separated list of nameservices.",
@@ -79,7 +75,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.ha.namenodes.${dfs.nameservices}",
"displayName": "dfs.ha.namenodes.${dfs.nameservices}",
"description": "The prefix for a given nameservice, contains a comma-separated list of namenodes for a given nameservice.",
@@ -91,7 +86,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.rpc-address.${dfs.nameservices}.nn1",
"displayName": "dfs.namenode.rpc-address.${dfs.nameservices}.nn1",
"description": "RPC address that handles all clients requests for nn1.",
@@ -103,7 +97,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.rpc-address.${dfs.nameservices}.nn2",
"displayName": "dfs.namenode.rpc-address.${dfs.nameservices}.nn2",
"description": "RPC address that handles all clients requests for nn2.",
@@ -115,7 +108,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.http-address.${dfs.nameservices}.nn1",
"displayName": "dfs.namenode.http-address.${dfs.nameservices}.nn1",
"description": "The fully-qualified HTTP address for nn1 NameNode.",
@@ -127,7 +119,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.http-address.${dfs.nameservices}.nn2",
"displayName": "dfs.namenode.http-address.${dfs.nameservices}.nn2",
"description": "The fully-qualified HTTP address for nn2 NameNode.",
@@ -139,7 +130,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.https-address.${dfs.nameservices}.nn1",
"displayName": "dfs.namenode.https-address.${dfs.nameservices}.nn1",
"description": "The fully-qualified HTTP address for nn1 NameNode.",
@@ -151,7 +141,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.https-address.${dfs.nameservices}.nn2",
"displayName": "dfs.namenode.https-address.${dfs.nameservices}.nn2",
"description": "The fully-qualified HTTP address for nn2 NameNode.",
@@ -163,7 +152,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.client.failover.proxy.provider.${dfs.nameservices}",
"displayName": "dfs.client.failover.proxy.provider.${dfs.nameservices}",
"description": "The Java class that HDFS clients use to contact the Active NameNode.",
@@ -175,7 +163,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.shared.edits.dir",
"displayName": "dfs.namenode.shared.edits.dir",
"description": " The URI which identifies the group of JNs where the NameNodes will write/read edits.",
@@ -187,7 +174,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.ha.fencing.methods",
"displayName": "dfs.ha.fencing.methods",
"description": "A list of scripts or Java classes which will be used to fence the Active NameNode during a failover.",
@@ -199,7 +185,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.ha.automatic-failover.enabled",
"displayName": "dfs.ha.automatic-failover.enabled",
"description": "Enable Automatic failover.",
@@ -212,7 +197,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "dfs.namenode.safemode.threshold-pct",
"displayName": "dfs.namenode.safemode.threshold-pct",
"description": "Specifies the percentage of blocks that should satisfy\n the minimal replication requirement defined by dfs.namenode.replication.min.\n Values less than or equal to 0 mean not to start in safe mode.\n Values greater than 1 will make safe mode permanent.\n ",
@@ -224,7 +208,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "hbase.rootdir",
"displayName": "hbase.rootdir",
"description": "The directory shared by region servers and into which HBase persists.",
@@ -236,7 +219,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "instance.volumes",
"displayName": "instance.volumes",
"isReconfigurable": false,
@@ -247,7 +229,6 @@ module.exports =
"serviceName": 'MISC'
},
{
- "id": "site property",
"name": "instance.volumes.replacements",
"displayName": "instance.volumes.replacements",
"isReconfigurable": false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/data/HDP2/rm_ha_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/rm_ha_properties.js b/ambari-web/app/data/HDP2/rm_ha_properties.js
index 3ec106a..59bb24b 100644
--- a/ambari-web/app/data/HDP2/rm_ha_properties.js
+++ b/ambari-web/app/data/HDP2/rm_ha_properties.js
@@ -28,7 +28,6 @@ module.exports =
configs: [
/**********************************************HDFS***************************************/
{
- "id": "site property",
"name": "yarn.resourcemanager.ha.enabled",
"displayName": "yarn.resourcemanager.ha.enabled",
"isReconfigurable": false,
@@ -40,7 +39,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.ha.rm-ids",
"displayName": "yarn.resourcemanager.ha.rm-ids",
"isReconfigurable": false,
@@ -51,7 +49,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.hostname.rm1",
"displayName": "yarn.resourcemanager.hostname.rm1",
"isReconfigurable": false,
@@ -63,7 +60,6 @@ module.exports =
},
{
- "id": "site property",
"name": "yarn.resourcemanager.webapp.address.rm1",
"displayName": "yarn.resourcemanager.webapp.address.rm1",
"isReconfigurable": false,
@@ -74,7 +70,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.webapp.address.rm2",
"displayName": "yarn.resourcemanager.webapp.address.rm2",
"isReconfigurable": false,
@@ -85,7 +80,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.webapp.https.address.rm1",
"displayName": "yarn.resourcemanager.webapp.https.address.rm1",
"isReconfigurable": false,
@@ -96,7 +90,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.webapp.https.address.rm2",
"displayName": "yarn.resourcemanager.webapp.https.address.rm2",
"isReconfigurable": false,
@@ -108,7 +101,6 @@ module.exports =
},
{
- "id": "site property",
"name": "yarn.resourcemanager.hostname.rm2",
"displayName": "yarn.resourcemanager.hostname.rm2",
"isReconfigurable": false,
@@ -119,7 +111,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.recovery.enabled",
"displayName": "yarn.resourcemanager.recovery.enabled",
"isReconfigurable": false,
@@ -131,7 +122,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.store.class",
"displayName": "yarn.resourcemanager.store.class",
"isReconfigurable": false,
@@ -142,7 +132,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.zk-address",
"displayName": "yarn.resourcemanager.zk-address",
"isReconfigurable": false,
@@ -153,7 +142,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.cluster-id",
"displayName": "yarn.resourcemanager.cluster-id",
"isReconfigurable": false,
@@ -164,7 +152,6 @@ module.exports =
serviceName: 'MISC'
},
{
- "id": "site property",
"name": "yarn.resourcemanager.ha.automatic-failover.zk-base-path",
"displayName": "yarn.resourcemanager.ha.automatic-failover.zk-base-path",
"isReconfigurable": false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index d641c81..60f949a 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -55,7 +55,6 @@ var hdp2properties = [
},
{
"name": "dfs.datanode.failed.volumes.tolerated",
- "displayType": "int",
"category": "DATANODE",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -102,7 +101,6 @@ var hdp2properties = [
},
{
"name": "nfs.exports.allowed.hosts",
- "displayType": "string",
"category": "NFS_GATEWAY",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -267,13 +265,6 @@ var hdp2properties = [
"filename": "hadoop-env.xml",
"category": "Advanced hadoop-env"
},
- {
- "name": "hadoop_root_logger",
- "displayType": "string",
- "serviceName": "HDFS",
- "filename": "hadoop-env.xml",
- "category": "Advanced hadoop-env"
- },
/**********************************************YARN***************************************/
{
@@ -724,12 +715,6 @@ var hdp2properties = [
"index": 4
},
{
- "name": "hive.server2.tez.default.queues",
- "serviceName": "HIVE",
- "filename": "hive-site.xml",
- "category": "Advanced hive-site"
- },
- {
"name": "hive.server2.thrift.port",
"displayType": "int",
"category": "Advanced hive-site",
@@ -1100,24 +1085,6 @@ var hdp2properties = [
"index": 5
},
{
- "name": "hbase.coprocessor.region.classes",
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.coprocessor.master.classes",
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.coprocessor.regionserver.classes",
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
"name": "hbase.zookeeper.quorum",
"displayType": "multiLine",
"serviceName": "HBASE",
@@ -1813,49 +1780,15 @@ var hdp2properties = [
/**********************************************webhcat-site***************************************/
{
- "name": "templeton.hive.archive",
- "serviceName": "HIVE",
- "filename": "webhcat-site.xml",
- "category": "Advanced webhcat-site"
- },
- {
- "name": "templeton.pig.archive",
- "serviceName": "HIVE",
- "filename": "webhcat-site.xml",
- "category": "Advanced webhcat-site"
- },
- {
"name": "templeton.zookeeper.hosts",
"displayType": "multiLine",
"serviceName": "HIVE",
"filename": "webhcat-site.xml",
"category": "Advanced webhcat-site"
},
-/**********************************************pig.properties*****************************************/
- {
- "name": "content",
- "category": "Advanced pig-properties",
- "serviceName": "PIG",
- "filename": "pig-properties.xml"
- },
/**********************************************KNOX*****************************************/
{
- "name": "content",
- "displayType": "content",
- "serviceName": "KNOX",
- "filename": "topology.xml",
- "category": "Advanced topology"
- },
-
- {
- "name": "content",
- "displayType": "content",
- "serviceName": "KNOX",
- "filename": "users-ldif.xml",
- "category": "Advanced users-ldif"
- },
- {
"name": "knox_gateway_host",
"displayName": "Knox Gateway host",
"value": "",
@@ -2611,26 +2544,12 @@ var hdp2properties = [
"category": "Advanced falcon-env"
},
{
- "name": "falcon.embeddedmq",
- "displayType": "string",
- "serviceName": "FALCON",
- "filename": "falcon-env.xml",
- "category": "Advanced falcon-env"
- },
- {
"name": "falcon.embeddedmq.data",
"displayType": "directory",
"serviceName": "FALCON",
"filename": "falcon-env.xml",
"category": "Advanced falcon-env"
},
- {
- "name": "falcon.emeddedmq.port",
- "displayType": "string",
- "serviceName": "FALCON",
- "filename": "falcon-env.xml",
- "category": "Advanced falcon-env"
- },
/**********************************************STORM***************************************/
{
"name": "storm_log_dir",
@@ -2838,7 +2757,6 @@ var hdp2properties = [
/************************************************AMBARI_METRICS******************************************/
{
"name": "timeline.metrics.service.operation.mode",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "General",
@@ -2846,7 +2764,6 @@ var hdp2properties = [
},
{
"name": "metrics_collector_log_dir",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-env.xml",
"category": "General",
@@ -2854,7 +2771,6 @@ var hdp2properties = [
},
{
"name": "metrics_collector_pid_dir",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-env.xml",
"category": "General",
@@ -2862,7 +2778,6 @@ var hdp2properties = [
},
{
"name": "metrics_monitor_log_dir",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-env.xml",
"category": "General",
@@ -2870,7 +2785,6 @@ var hdp2properties = [
},
{
"name": "metrics_monitor_pid_dir",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-env.xml",
"category": "General",
@@ -2894,7 +2808,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.hourly.disabled",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2918,7 +2831,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.minute.disabled",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2950,7 +2862,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.host.aggregator.hourly.disabled",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2974,7 +2885,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.host.aggregator.minute.disabled",
- "displayType": "string",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -3012,114 +2922,6 @@ var hdp2properties = [
"category": "MetricCollector",
"index": 3
},
- {
- "name": "ams.zookeeper.keytab",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "ams.zookeeper.principal",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hadoop.security.authentication",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.coprocessor.master.classes",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.coprocessor.region.classes",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.master.kerberos.principal",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.master.keytab.file",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.myclient.keytab",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.myclient.principal",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.regionserver.kerberos.principal",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.regionserver.keytab.file",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.security.authentication",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.security.authorization",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.zookeeper.property.authProvider.1",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.zookeeper.property.jaasLoginRenew",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.zookeeper.property.kerberos.removeHostFromPrincipal",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "hbase.zookeeper.property.kerberos.removeRealmFromPrincipal",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
- {
- "name": "zookeeper.znode.parent",
- "serviceName": "AMBARI_METRICS",
- "category": "Advanced ams-hbase-security-site",
- "filename": "ams-hbase-security-site.xml"
- },
/************************************************Kerberos Descriptor******************************************/
{
"name": "smokeuser_principal_name",
@@ -3335,21 +3137,18 @@ var atsProperties = [
},
{
"name": "yarn.timeline-service.webapp.address",
- "displayType": "string",
"category": "APP_TIMELINE_SERVER",
"serviceName": "YARN",
"filename": "yarn-site.xml"
},
{
"name": "yarn.timeline-service.webapp.https.address",
- "displayType": "string",
"category": "APP_TIMELINE_SERVER",
"serviceName": "YARN",
"filename": "yarn-site.xml"
},
{
"name": "yarn.timeline-service.address",
- "displayType": "string",
"category": "APP_TIMELINE_SERVER",
"serviceName": "YARN",
"filename": "yarn-site.xml"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/mixins/common/configs/configs_comparator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js
index 263e356..191a3a3 100644
--- a/ambari-web/app/mixins/common/configs/configs_comparator.js
+++ b/ambari-web/app/mixins/common/configs/configs_comparator.js
@@ -225,7 +225,7 @@ App.ConfigsComparator = Em.Mixin.create({
compareObject = App.ServiceConfigProperty.create(compareObject);
compareObject.setProperties({
isFinal: !!compareConfig.isFinal,
- value: App.config.formatOverrideValue(serviceConfig, compareConfig.value),
+ value: App.config.formatPropertyValue(serviceConfig, compareConfig.value),
compareConfigs: null,
isOriginalSCP: false
});
@@ -303,7 +303,6 @@ App.ConfigsComparator = Em.Mixin.create({
var undefinedConfig = {
description: name,
displayName: name,
- id: "site property",
isOverridable: false,
isReconfigurable: false,
isRequired: false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/mixins/common/configs/configs_saver.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js b/ambari-web/app/mixins/common/configs/configs_saver.js
index 906f9c6..aacfa75 100644
--- a/ambari-web/app/mixins/common/configs/configs_saver.js
+++ b/ambari-web/app/mixins/common/configs/configs_saver.js
@@ -331,8 +331,6 @@ App.ConfigsSaverMixin = Em.Mixin.create({
* @method saveSiteConfigs
*/
saveSiteConfigs: function (configs) {
- //configs = this.setHiveHostName(configs);
- //configs = this.setOozieHostName(configs);
this.formatConfigValues(configs);
return configs;
},
@@ -350,109 +348,6 @@ App.ConfigsSaverMixin = Em.Mixin.create({
});
},
- /*********************************** 2.1 PREPARE DATABASE CONFIGS ****************************/
-
- /**
- * set hive hostnames in configs
- * @param configs
- * @private
- * @method setHiveHostName
- */
- setHiveHostName: function (configs) {
- var dbHostPropertyName = null, configsToRemove = [];
- if (configs.someProperty('name', 'hive_database')) {
- var hiveDb = configs.findProperty('name', 'hive_database');
-
- switch(hiveDb.value) {
- case 'New MySQL Database':
- case 'New PostgreSQL Database':
- dbHostPropertyName = configs.someProperty('name', 'hive_ambari_host') ? 'hive_ambari_host' : dbHostPropertyName;
- configsToRemove = ['hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'];
- break;
- case 'Existing MySQL Database':
- dbHostPropertyName = configs.someProperty('name', 'hive_existing_mysql_host') ? 'hive_existing_mysql_host' : dbHostPropertyName;
- configsToRemove = ['hive_ambari_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'];
- break;
- case 'Existing PostgreSQL Database':
- dbHostPropertyName = configs.someProperty('name', 'hive_existing_postgresql_host') ? 'hive_existing_postgresql_host' : dbHostPropertyName;
- configsToRemove = ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'];
- break;
- case 'Existing Oracle Database':
- dbHostPropertyName = configs.someProperty('name', 'hive_existing_oracle_host') ? 'hive_existing_oracle_host' : dbHostPropertyName;
- configsToRemove = ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'];
- break;
- case 'Existing MSSQL Server database with SQL authentication':
- dbHostPropertyName = configs.someProperty('name', 'hive_existing_mssql_server_host') ? 'hive_existing_mssql_server_host' : dbHostPropertyName;
- configsToRemove = ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'];
- break;
- case 'Existing MSSQL Server database with integrated authentication':
- dbHostPropertyName = configs.someProperty('name', 'hive_existing_mssql_server_2_host') ? 'hive_existing_mssql_server_2_host' : dbHostPropertyName;
- configsToRemove = ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host'];
- break;
- }
- configs = dataManipulationUtils.rejectPropertyValues(configs, 'name', configsToRemove);
- }
- if (dbHostPropertyName) {
- var hiveHostNameProperty = App.ServiceConfigProperty.create(App.config.get('preDefinedSiteProperties').findProperty('name', 'hive_hostname'));
- hiveHostNameProperty.set('value', configs.findProperty('name', dbHostPropertyName).get('value'));
- configs.pushObject(hiveHostNameProperty);
- }
- return configs;
- },
-
- /**
- * set oozie hostnames in configs
- * @param configs
- * @private
- * @method setOozieHostName
- */
- setOozieHostName: function (configs) {
- var dbHostPropertyName = null, configsToRemove = [];
- if (configs.someProperty('name', 'oozie_database')) {
- var oozieDb = configs.findProperty('name', 'oozie_database');
- switch (oozieDb.value) {
- case 'New Derby Database':
- configsToRemove = ['oozie_ambari_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'];
- break;
- case 'New MySQL Database':
- var ambariHost = configs.findProperty('name', 'oozie_ambari_host');
- if (ambariHost) {
- ambariHost.name = 'oozie_hostname';
- }
- configsToRemove = ['oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'];
- break;
- case 'Existing MySQL Database':
- dbHostPropertyName = configs.someProperty('name', 'oozie_existing_mysql_host') ? 'oozie_existing_mysql_host' : dbHostPropertyName;
- configsToRemove = ['oozie_ambari_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'];
- break;
- case 'Existing PostgreSQL Database':
- dbHostPropertyName = configs.someProperty('name', 'oozie_existing_postgresql_host') ? 'oozie_existing_postgresql_host' : dbHostPropertyName;
- configsToRemove = ['oozie_ambari_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'];
- break;
- case 'Existing Oracle Database':
- dbHostPropertyName = configs.someProperty('name', 'oozie_existing_oracle_host') ? 'oozie_existing_oracle_host' : dbHostPropertyName;
- configsToRemove = ['oozie_ambari_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_derby_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'];
- break;
- case 'Existing MSSQL Server database with SQL authentication':
- dbHostPropertyName = configs.someProperty('name', 'oozie_existing_mssql_server_host') ? 'oozie_existing_mssql_server_host' : dbHostPropertyName;
- configsToRemove = ['oozie_ambari_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'];
- break;
- case 'Existing MSSQL Server database with integrated authentication':
- dbHostPropertyName = configs.someProperty('name', 'oozie_existing_mssql_server_2_host') ? 'oozie_existing_mssql_server_2_host' : dbHostPropertyName;
- configsToRemove = ['oozie_ambari_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host'];
- break;
- }
- configs = dataManipulationUtils.rejectPropertyValues(configs, 'name', configsToRemove);
- }
-
- if (dbHostPropertyName) {
- var oozieHostNameProperty = App.ServiceConfigProperty.create(App.config.get('preDefinedSiteProperties').findProperty('name', 'oozie_hostname'));
- oozieHostNameProperty.set('value', configs.findProperty('name', dbHostPropertyName).get('value'));
- configs.pushObject(oozieHostNameProperty);
- }
- return configs;
- },
-
/*********************************** 3. GENERATING JSON TO SAVE *****************************/
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index 2c87c34..932ba2c 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -99,7 +99,6 @@ App.ServiceConfigProperty = Em.Object.extend({
filename: '',
isOriginalSCP : true, // if true, then this is original SCP instance and its value is not overridden value.
parentSCP: null, // This is the main SCP which is overridden by this. Set only when isOriginalSCP is false.
- selectedHostOptions : null, // contain array of hosts configured with overridden value
overrides : null,
overrideValues: [],
group: null, // Contain group related to this property. Set only when isOriginalSCP is false.
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index c9bc6c2..3787f9a 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -130,8 +130,6 @@ App.config = Em.Object.create({
secureConfigs: require('data/HDP2/secure_mapping'),
- configMapping: require('data/HDP2/config_mapping'),
-
customStackMapping: require('data/custom_stack_map'),
mapCustomStack: function () {
@@ -198,74 +196,6 @@ App.config = Em.Object.create({
}
},
- //configs with these filenames go to appropriate category not in Advanced
- customFileNames: ['flume-conf.xml'],
-
- /**
- * identify category by filename of config
- * @param config
- * @return {object|null}
- */
- identifyCategory: function (config) {
- var category = null,
- serviceConfigMetaData = this.get('preDefinedServiceConfigs').findProperty('serviceName', Em.get(config, 'serviceName')),
- configCategories = (serviceConfigMetaData && serviceConfigMetaData.get('configCategories')) || [];
-
- if (Em.get(config, 'filename') && Em.get(config, 'filename').contains("env")) {
- if (Em.get(config, 'category')) {
- category = configCategories.findProperty("name", Em.get(config, 'category'));
- } else {
- configCategories.forEach(function (_category) {
- if (_category.name.contains(this.getConfigTagFromFileName(Em.get(config, 'filename')))) {
- category = _category;
- }
- }, this);
- }
- } else {
- configCategories.forEach(function (_category) {
- if (_category.siteFileNames && Array.isArray(_category.siteFileNames) && _category.siteFileNames.contains(Em.get(config, 'filename'))) {
- category = _category;
- }
- });
- category = Em.isNone(category) ? configCategories.findProperty('siteFileName', this.getOriginalFileName(Em.get(config, 'filename'))) : category;
- }
- return category;
- },
-
- /**
- * additional handling for special properties such as
- * checkbox and digital which values with 'm' at the end
- * @param config
- */
- handleSpecialProperties: function (config) {
- if (Em.get(config, 'displayType') === 'int' && /\d+m$/.test(Em.get(config, 'value') )) {
- Em.set(config, 'value', Em.get(config, 'value').slice(0, Em.get(config, 'value.length') - 1));
- Em.set(config, 'savedValue', Em.get(config, 'value'));
- }
- },
-
- /**
- * calculate config properties:
- * category, filename, description
- * @param config
- * @param isAdvanced
- * @param advancedProperty
- */
- calculateConfigProperties: function (config, isAdvanced, advancedProperty) {
- if (!isAdvanced || this.get('customFileNames').contains(Em.get(config, 'filename'))) {
- var categoryMetaData = this.identifyCategory(config);
- if (categoryMetaData != null) {
- Em.set(config, 'category', categoryMetaData.get('name'));
- }
- } else {
- var configType = this.getConfigTagFromFileName(Em.get(config, 'filename'));
- Em.set(config, 'category', Em.get(config, 'category') ? Em.get(config, 'category') : 'Advanced ' + configType);
- }
- if (advancedProperty) {
- Em.set(config, 'description', Em.get(advancedProperty, 'description'));
- }
- },
-
/**
* get service for current config type
* @param {String} configType - config fileName without xml
@@ -357,12 +287,11 @@ App.config = Em.Object.create({
description: null,
category: this.getDefaultCategory(definedInStack, fileName),
isSecureConfig: this.getIsSecure(name),
- showLabel: this.getDefaultIsShowLabel(name, fileName),
+ showLabel: true,
isVisible: true,
isUserProperty: !definedInStack,
isRequired: definedInStack,
group: null,
- id: 'site property',
isRequiredByAgent: true,
isReconfigurable: true,
unit: null,
@@ -472,15 +401,6 @@ App.config = Em.Object.create({
},
/**
- *
- * @param name
- * @param fileName
- */
- getDefaultIsShowLabel: function(name, fileName) {
- return !this.isContentProperty(name, fileName) || this.isContentProperty(name, fileName, ['-env']);
- },
-
- /**
* format property value depending on displayType
* and one exception for 'kdc_type'
* @param serviceConfigProperty
@@ -527,6 +447,9 @@ App.config = Em.Object.create({
if (Em.get(serviceConfigProperty, 'name') === 'kdc_type') {
return App.router.get('mainAdminKerberosController.kdcTypesValues')[value];
}
+ if ( /^\s+$/.test("" + value)) {
+ value = " ";
+ }
return value;
},
@@ -611,9 +534,7 @@ App.config = Em.Object.create({
if (advanced.get('id')) {
configData = this.mergeStaticProperties(configData, advanced, null, ['name', 'filename']);
- var configValue = this.formatPropertyValue(advanced, advanced.get('value'));
- // for property which value is single/multiple spaces set single space as well
- configData.value = configData.recommendedValue = /^\s+$/.test("" + configValue) ? " " : configValue;
+ configData.value = configData.recommendedValue = this.formatPropertyValue(advanced, advanced.get('value'));
}
mergedConfigs.push(configData);
@@ -655,7 +576,6 @@ App.config = Em.Object.create({
this.get('preDefinedServiceConfigs').forEach(function (serviceConfig) {
var serviceName = serviceConfig.get('serviceName');
if (allSelectedServiceNames.contains(serviceName) || serviceName === 'MISC') {
- console.log('pushing ' + serviceName, serviceConfig);
if (!installedServiceNames.contains(serviceName) || serviceName === 'MISC') {
serviceConfig.set('showConfig', true);
}
@@ -666,24 +586,10 @@ App.config = Em.Object.create({
var configsByService = [];
var serviceConfigs = configs.filterProperty('serviceName', service.get('serviceName'));
serviceConfigs.forEach(function (_config) {
- _config.isOverridable = (_config.isOverridable === undefined) ? true : _config.isOverridable;
var serviceConfigProperty = App.ServiceConfigProperty.create(_config);
this.updateHostOverrides(serviceConfigProperty, _config);
if (!storedConfigs && !serviceConfigProperty.get('hasInitialValue')) {
- var hiveMetastoreUrisConfig = configs.filterProperty('filename', 'hive-site.xml').findProperty('name', 'hive.metastore.uris');
- var clientPortConfig = configs.filterProperty('filename', 'zoo.cfg.xml').findProperty('name', 'clientPort');
- var dependencies = {
- 'hive.metastore.uris': hiveMetastoreUrisConfig && hiveMetastoreUrisConfig.recommendedValue,
- 'clientPort': clientPortConfig && clientPortConfig.recommendedValue
- };
- configPropertyHelper.initialValue(serviceConfigProperty, localDB, dependencies);
- }
- if (storedConfigs && storedConfigs.filterProperty('name', _config.name).length && !!_config.filename) {
- var storedConfig = storedConfigs.filterProperty('name', _config.name).findProperty('filename', _config.filename);
- if (storedConfig) {
- serviceConfigProperty.set('recommendedValue', storedConfig.recommendedValue);
- serviceConfigProperty.set('value', storedConfig.value);
- }
+ configPropertyHelper.initialValue(serviceConfigProperty, localDB, configs);
}
this.tweakDynamicDefaults(localDB, serviceConfigProperty, _config);
serviceConfigProperty.validate();
@@ -732,11 +638,6 @@ App.config = Em.Object.create({
newSCP.set('value', overrideEntry.value);
newSCP.set('isOriginalSCP', false); // indicated this is overridden value,
newSCP.set('parentSCP', configProperty);
- var hostsArray = Ember.A([]);
- overrideEntry.hosts.forEach(function (host) {
- hostsArray.push(host);
- });
- newSCP.set('selectedHostOptions', hostsArray);
overrides.pushObject(newSCP);
});
configProperty.set('overrides', overrides);
@@ -907,12 +808,11 @@ App.config = Em.Object.create({
for (var prop in properties) {
var fileName = this.getOriginalFileName(config.type);
var serviceConfig = !!params.configKeyToConfigMap[fileName] ? params.configKeyToConfigMap[fileName][prop] : false;
- var hostOverrideValue = this.formatOverrideValue(serviceConfig, properties[prop]);
+ var hostOverrideValue = this.formatPropertyValue(serviceConfig, properties[prop]);
var hostOverrideIsFinal = !!(config.properties_attributes && config.properties_attributes.final && config.properties_attributes.final[prop]);
if (serviceConfig) {
// Value of this property is different for this host.
if (!Em.get(serviceConfig, 'overrides')) Em.set(serviceConfig, 'overrides', []);
- console.log("loadServiceConfigGroupOverridesSuccess(): [" + group + "] OVERRODE(" + serviceConfig.name + "): " + serviceConfig.value + " -> " + hostOverrideValue);
serviceConfig.overrides.pushObject({value: hostOverrideValue, group: group, isFinal: hostOverrideIsFinal});
} else {
params.serviceConfigs.push(this.createCustomGroupConfig(prop, config, group));
@@ -933,214 +833,20 @@ App.config = Em.Object.create({
* @return {Object}
**/
createCustomGroupConfig: function (propertyName, config, group, isEditable) {
- var propertyValue = config.properties[propertyName];
- var propertyObject = {
- name: propertyName,
- displayName: propertyName,
- savedValue: propertyValue,
- value: propertyValue,
- displayType: stringUtils.isSingleLine(propertyValue) ? 'advanced' : 'multiLine',
- isSecureConfig: false,
+ var propertyObject = this.createDefaultConfig(propertyName, group.get('service.serviceName'), this.getOriginalFileName(config.type), false, {
+ savedValue: config.properties[propertyName],
+ value: config.properties[propertyName],
group: group,
- id: 'site property',
- serviceName: group.get('service.serviceName'),
- filename: this.getOriginalFileName(config.type),
- isUserProperty: true,
- isVisible: true,
+ isEditable: isEditable !== false,
isOverridable: false
- };
- propertyObject.category = this.identifyCategory(propertyObject).name;
- if(isEditable == false) {
- propertyObject.isEditable = isEditable;
- }
+ });
group.set('switchGroupTextShort', Em.I18n.t('services.service.config_groups.switchGroupTextShort').format(group.get('name')));
group.set('switchGroupTextFull', Em.I18n.t('services.service.config_groups.switchGroupTextFull').format(group.get('name')));
return App.ServiceConfigProperty.create(propertyObject);
},
- /**
- * format value of override of config
- * @param serviceConfig
- * @param hostOverrideValue
- */
- formatOverrideValue: function (serviceConfig, hostOverrideValue) {
- if (serviceConfig && serviceConfig.displayType === 'int') {
- if (/\d+m$/.test(hostOverrideValue)) {
- return hostOverrideValue.slice(0, hostOverrideValue.length - 1);
- }
- } else if (serviceConfig &&
- serviceConfig.displayType === 'masterHosts' &&
- typeof hostOverrideValue === 'string') {
- try {
- var value = JSON.parse(hostOverrideValue.replace(/'/g, "\""));
- if (typeof value === 'object') {
- return value;
- }
- } catch(err) {
- console.error(err);
- }
-
- }
- return hostOverrideValue;
- },
-
- /**
- * Set all site property that are derived from other site-properties
- * Replace <foreignKey[0]>, <foreignKey[1]>, ... (in the name and value) to values from configs with names in foreignKey-array
- * Replace <templateName[0]>, <templateName[1]>, ... (in the value) to values from configs with names in templateName-array
- * Example:
- * <code>
- * config: {
- * name: "name.<foreignKey[0]>.name",
- * foreignKey: ["name1"],
- * templateName: ["name2"],
- * value: "<foreignKey[0]><templateName[0]>"
- * }
- * </code>
- * "<foreignKey[0]>" in the name will be replaced with value from config with name "name1" (this config will be found
- * in the mappedConfigs or allConfigs). New name will be set to the '_name'-property. If config with name "name1" won't
- * be found, updated config will be marked as skipped (<code>noMatchSoSkipThisConfig</code>-property is set to true)
- * "<templateName[0]>" in the value will be replace with value from config with name "name2" (it also will be found
- * in the mappedConfigs or allConfigs).
- *
- * @param {object[]} mappedConfigs
- * @param {object[]} allConfigs
- * @param {object} config
- * @method setConfigValue
- */
- setConfigValue: function (mappedConfigs, allConfigs, config) {
- var globalValue;
- if (config.value == null) {
- return;
- }
- var fkValue = config.value.match(/<(foreignKey.*?)>/g);
- var fkName = config.name.match(/<(foreignKey.*?)>/g);
- var templateValue = config.value.match(/<(templateName.*?)>/g);
-
- if (fkValue) {
- fkValue.forEach(function (_fkValue) {
-
- var index = parseInt(_fkValue.match(/\[([\d]*)(?=\])/)[1]);
- var cfk = config.foreignKey[index];
- var cFromMapped = mappedConfigs.findProperty('name', cfk);
- if (Em.isNone(cFromMapped)) {
- var cFromAll = allConfigs.findProperty('name', cfk);
- if (!Em.isNone(cFromAll)) {
- globalValue = Em.get(cFromAll, 'value') === '' ? Em.get(cFromAll, 'recommendedValue') : Em.get(cFromAll, 'value');
- config.value = config.value.replace(_fkValue, globalValue);
- }
- }
- else {
- globalValue = Em.get(cFromMapped, 'value');
- config.value = config.value.replace(_fkValue, globalValue);
- }
- });
- }
-
- // config._name - formatted name from original config name
- if (fkName) {
- fkName.forEach(function (_fkName) {
-
- var index = parseInt(_fkName.match(/\[([\d]*)(?=\])/)[1]);
- var cfk = config.foreignKey[index];
- var cFromMapped = mappedConfigs.findProperty('name', cfk);
-
- if (Em.isNone(cFromMapped)) {
- var cFromAll = allConfigs.findProperty('name', cfk);
- if (Em.isNone(cFromAll)) {
- config.noMatchSoSkipThisConfig = true;
- }
- else {
- globalValue = Em.get(cFromAll, 'value') === '' ? Em.get(cFromAll, 'recommendedValue') : Em.get(cFromAll, 'value');
- config._name = config.name.replace(_fkName, globalValue);
- }
- }
- else {
- globalValue = Em.get(cFromMapped, 'value');
- config._name = config.name.replace(_fkName, globalValue);
- }
- });
- }
-
- //For properties in the configMapping file having foreignKey and templateName properties.
- if (templateValue) {
- templateValue.forEach(function (_value) {
- var index = parseInt(_value.match(/\[([\d]*)(?=\])/)[1]);
- var cfk = config.templateName[index];
- var cFromAll = allConfigs.findProperty('name', cfk);
- if (Em.isNone(cFromAll)) {
- config.value = null;
- }
- else {
- var globalValue = Em.get(cFromAll, 'value');
- config.value = config.value.replace(_value, globalValue);
- }
- });
- }
- },
-
- /**
- * identify service name of config by its config's type
- * @param type
- * @return {string|null}
- */
- getServiceNameByConfigType: function (type) {
- var preDefinedServiceConfigs = this.get('preDefinedServiceConfigs');
- var service = preDefinedServiceConfigs.find(function (serviceConfig) {
- return !!serviceConfig.get('configTypes')[type];
- }, this);
- return service && service.get('serviceName');
- },
-
- /**
- * add user property
- * @param stored
- * @param isAdvanced
- * @param advancedConfigs
- * @return {Object}
- */
- addUserProperty: function (stored, isAdvanced, advancedConfigs) {
- var
- skipAttributeChanges = {
- displayType: ['ignore_groupsusers_create'],
- displayName: ['ignore_groupsusers_create', 'smokeuser', 'user_group', 'mapred_user', 'zk_user']
- },
- configData = {
- id: stored.id,
- name: stored.name,
- displayName: skipAttributeChanges.displayName.contains(stored.name) ?
- this.getOriginalConfigAttribute(stored, 'displayName', advancedConfigs) : stored.name,
- serviceName: stored.serviceName,
- value: stored.value,
- savedValue: stored.savedValue,
- recommendedValue: stored.recommendedValue,
- displayType: skipAttributeChanges.displayType.contains(stored.name) ?
- this.getOriginalConfigAttribute(stored, 'displayType', advancedConfigs) :
- (stringUtils.isSingleLine(stored.value) ? 'advanced' : 'multiLine'),
- filename: stored.filename,
- isUserProperty: stored.isUserProperty === true,
- hasInitialValue: !!stored.hasInitialValue,
- isOverridable: true,
- overrides: stored.overrides,
- isRequired: false,
- isVisible: stored.isVisible,
- isFinal: stored.isFinal,
- savedIsFinal: stored.savedIsFinal,
- supportsFinal: this.shouldSupportFinal(stored.serviceName, stored.filename),
- showLabel: stored.showLabel !== false,
- category: stored.category
- };
- if (stored.category == 'Users and Groups') {
- configData.index = this.getOriginalConfigAttribute(stored, 'index', advancedConfigs);
- }
- var advancedConfig = advancedConfigs.filterProperty('name', stored.name).findProperty('filename', stored.filename);
- App.get('config').calculateConfigProperties(configData, isAdvanced, advancedConfig);
- return configData;
- },
-
complexConfigsTemplate: [
{
- "id": "site property",
"name": "capacity-scheduler",
"displayName": "Capacity Scheduler",
"value": "",
@@ -1224,7 +930,6 @@ App.config = Em.Object.create({
name = _property[0];
value = (_property[1]) ? _property[1] : "";
configs.push(Em.Object.create({
- id: configsTextarea.get('id'),
name: name,
value: value,
savedValue: value,
@@ -1277,21 +982,6 @@ App.config = Em.Object.create({
},
/**
- * exclude configs that depends on services which are uninstalled
- * if config doesn't have serviceName or dependent service is installed then
- * config not excluded
- * @param {object[]} configs
- * @param {string[]} installedServices
- * @return {object[]}
- * @method excludeUnsupportedConfigs
- */
- excludeUnsupportedConfigs: function (configs, installedServices) {
- return configs.filter(function (config) {
- return !(config.serviceName && !installedServices.contains(config.serviceName));
- });
- },
-
- /**
* Generate minimal config property object used in *_properties.js files.
* Example:
* <code>
@@ -1326,23 +1016,6 @@ App.config = Em.Object.create({
},
/**
- * replace some values in config property
- * @param {string} name
- * @param {string} express
- * @param {string} value
- * @param {string} globValue
- * @return {string}
- * @private
- * @method replaceConfigValues
- */
- replaceConfigValues: function (name, express, value, globValue) {
- if (name == 'templeton.hive.properties') {
- globValue = globValue.replace(/,/g, '\\,');
- }
- return value.replace(express, globValue);
- },
-
- /**
* load cluster stack configs from server and run mapper
* @returns {$.ajax}
* @method loadConfigsFromStack
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/utils/configs/config_property_helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js
index d4ce44a..9b528dd 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -20,7 +20,14 @@ var App = require('app');
module.exports = {
- initialValue: function (configProperty, localDB, dependencies) {
+ initialValue: function (configProperty, localDB, configs) {
+ var hiveMetastoreUrisConfig = configs.filterProperty('filename', 'hive-site.xml').findProperty('name', 'hive.metastore.uris');
+ var clientPortConfig = configs.filterProperty('filename', 'zoo.cfg.xml').findProperty('name', 'clientPort');
+ var dependencies = {
+ 'hive.metastore.uris': hiveMetastoreUrisConfig && hiveMetastoreUrisConfig.recommendedValue,
+ 'clientPort': clientPortConfig && clientPortConfig.recommendedValue
+ };
+
var masterComponentHostsInDB = localDB.masterComponentHosts;
var slaveComponentHostsInDB = localDB.slaveComponentHosts;
var isOnlyFirstOneNeeded = true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index db82636..a2080d0 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -350,7 +350,6 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
displayType: stringUtils.isSingleLine(propertyObj.value) ? 'advanced' : 'multiLine',
isSecureConfig: isSecureConfig,
category: propertyObj.categoryName,
- id: 'site property',
serviceName: propertyObj.serviceName,
savedValue: null,
recommendedValue: null,
@@ -386,10 +385,9 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
var serviceName = service.get('serviceName');
var configsOfFile = service.get('configs').filterProperty('filename', siteFileName);
- var siteFileProperties = App.config.get('configMapping').all().filterProperty('filename', siteFileName);
function isDuplicatedConfigKey(name) {
- return siteFileProperties.findProperty('name', name) || configsOfFile.findProperty('name', name);
+ return configsOfFile.findProperty('name', name);
}
var serviceConfigObj = Ember.Object.create({
@@ -567,17 +565,6 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
removeProperty: function (event) {
var serviceConfigProperty = event.contexts[0];
this.get('serviceConfigs').removeObject(serviceConfigProperty);
- if (App.get('isClusterSupportsEnhancedConfigs')) {
- var deletedConfig = App.ConfigProperty.find().find(function(cp) {
- return cp.get('name') === serviceConfigProperty.get('name')
- && cp.get('fileName') === serviceConfigProperty.get('filename')
- && cp.get('isOriginalSCP');
- });
- if (deletedConfig) {
- deletedConfig.deleteRecord();
- App.store.commit();
- }
- }
// push config's file name if this config was stored on server
if (!serviceConfigProperty.get('isNotSaved')) {
var modifiedFileNames = this.get('controller.modifiedFileNames'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/controllers/main/admin/serviceAccounts_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/serviceAccounts_controller_test.js b/ambari-web/test/controllers/main/admin/serviceAccounts_controller_test.js
index ba12e00..aec7274 100644
--- a/ambari-web/test/controllers/main/admin/serviceAccounts_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/serviceAccounts_controller_test.js
@@ -186,13 +186,4 @@ describe('App.MainAdminServiceAccountsController', function () {
});
});
});
-
- describe('#setProxyUserGroupLabel()', function () {
-
- it('proxyuser_group config is absent', function () {
- var misc_configs = [];
- controller.setProxyUserGroupLabel(misc_configs);
- expect(misc_configs.findProperty('name', 'proxyuser_group')).to.be.undefined;
- });
- })
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/controllers/main/service/info/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js
index 846a438..825a00f 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -858,220 +858,6 @@ describe("App.MainServiceInfoConfigsController", function () {
});
});
- describe('#setHiveHostName', function () {
- beforeEach(function () {
- sinon.stub(App.StackService, 'find').returns([
- {
- serviceName: 'HIVE'
- },
- {
- serviceName: 'OOZIE'
- }
- ]);
- });
-
- afterEach(function () {
- App.StackService.find.restore();
- });
- Em.A([
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'New MySQL Database'}),
- Em.Object.create({name: 'hive_database_type', value: 'mysql'}),
- Em.Object.create({name: 'hive_ambari_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
- m: 'hive_database: New MySQL Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'New PostgreSQL Database'}),
- Em.Object.create({name: 'hive_database_type', value: 'mysql'}),
- Em.Object.create({name: 'hive_ambari_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
- m: 'hive_database: New PostgreSQL Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'Existing MySQL Database'}),
- Em.Object.create({name: 'hive_database_type', value: 'mysql'}),
- Em.Object.create({name: 'hive_existing_mysql_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_ambari_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
- m: 'hive_database: Existing MySQL Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'Existing PostgreSQL Database'}),
- Em.Object.create({name: 'hive_database_type', value: 'postgresql'}),
- Em.Object.create({name: 'hive_existing_postgresql_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
- m: 'hive_database: Existing PostgreSQL Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'Existing Oracle Database'}),
- Em.Object.create({name: 'hive_database_type', value: 'oracle'}),
- Em.Object.create({name: 'hive_existing_oracle_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
- m: 'hive_database: Existing Oracle Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'Existing MSSQL Server database with SQL authentication'}),
- Em.Object.create({name: 'hive_database_type', value: 'mssql'}),
- Em.Object.create({name: 'hive_existing_mssql_server_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
- m: 'hive_database: Existing MSSQL Server database with SQL authentication',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'hive_database', value: 'Existing MSSQL Server database with integrated authentication'}),
- Em.Object.create({name: 'hive_database_type', value: 'mssql'}),
- Em.Object.create({name: 'hive_existing_mssql_server_2_host', value: 'h1'}),
- Em.Object.create({name: 'hive_hostname', value: 'h2'})
- ],
- removed: ['hive_ambari_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database', 'hive_existing_oracle_host', 'hive_existing_oracle_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host'],
- m: 'hive_database: Existing MSSQL Server database with integrated authentication',
- host: 'h2'
- }
- ]).forEach(function (test) {
- it(test.m, function () {
- var configs = test.globals.slice();
- test.removed.forEach(function (c) {
- configs.pushObject(Em.Object.create({name: c}))
- });
- configs = mainServiceInfoConfigsController.setHiveHostName(configs);
- test.removed.forEach(function (name) {
- if (!Em.isNone(configs.findProperty('name', name))) console.log('!!!!', name);
- expect(Em.isNone(configs.findProperty('name', name))).to.equal(true);
- });
- expect(configs.findProperty('name', 'hive_hostname').value).to.equal(test.host);
- });
- });
-
- });
-
- describe('#setOozieHostName', function () {
- beforeEach(function () {
- sinon.stub(App.StackService, 'find').returns([
- {
- serviceName: 'HIVE'
- },
- {
- serviceName: 'OOZIE'
- }
- ]);
- });
-
- afterEach(function () {
- App.StackService.find.restore();
- });
- Em.A([
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'New Derby Database'}),
- Em.Object.create({name: 'oozie_ambari_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_ambari_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
- m: 'oozie_database: New Derby Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'New MySQL Database'}),
- Em.Object.create({name: 'oozie_ambari_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
- m: 'oozie_database: New MySQL Database',
- host: 'h1'
- },
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'Existing MySQL Database'}),
- Em.Object.create({name: 'oozie_existing_mysql_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_ambari_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
- m: 'oozie_database: Existing MySQL Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'Existing PostgreSQL Database'}),
- Em.Object.create({name: 'oozie_existing_postgresql_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_ambari_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
- m: 'oozie_database: Existing PostgreSQL Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'Existing Oracle Database'}),
- Em.Object.create({name: 'oozie_existing_oracle_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_ambari_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_derby_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
- m: 'oozie_database: Existing Oracle Database',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'Existing MSSQL Server database with SQL authentication'}),
- Em.Object.create({name: 'oozie_existing_oracle_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_ambari_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
- m: 'oozie_database: Existing MSSQL Server database with SQL authentication',
- host: 'h2'
- },
- {
- globals: [
- Em.Object.create({name: 'oozie_database', value: 'Existing MSSQL Server database with integrated authentication'}),
- Em.Object.create({name: 'oozie_existing_oracle_host', value: 'h1'}),
- Em.Object.create({name: 'oozie_hostname', value: 'h2'})
- ],
- removed: ['oozie_ambari_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host'],
- m: 'oozie_database: Existing MSSQL Server database with integrated authentication',
- host: 'h2'
- }
- ]).forEach(function (test) {
- it(test.m, function () {
- var configs = test.globals.slice();
- test.removed.forEach(function (c) {
- if (!configs.findProperty('name', c)) {
- configs.pushObject(Em.Object.create({name: c}))
- }
- });
- configs = mainServiceInfoConfigsController.setOozieHostName(configs);
- test.removed.forEach(function (name) {
- expect(Em.isNone(configs.findProperty('name', name))).to.equal(true);
- });
- expect(configs.findProperty('name', 'oozie_hostname').value).to.equal(test.host);
- });
- });
-
- });
-
describe('#errorsCount', function () {
it('should ignore configs with widgets (enhanced configs)', function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index d60dc15..99db7bf 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1954,49 +1954,6 @@ describe('App.InstallerStep7Controller', function () {
});
- describe('#restoreRecommendedConfigs', function () {
-
- var recommendationsConfigs = {
- site: {
- properties: {
- a: 'recommendedA',
- b: 'recommendedB'
- }
- }
- };
- var stepConfigs = [
- Em.Object.create({
- serviceName: 'srv',
- configs: [
- {name: 'a', value: '--', filename: 'site'},
- {name: 'b', value: '--', filename: 'Custom site'}
- ]
- })
- ];
- var serviceConfigProperties = [
- {name: 'a', value: 'valueA', filename: 'site'},
- {name: 'b', value: 'valueB', filename: 'Custom site'}
- ];
-
- beforeEach(function() {
- installerStep7Controller.reopen({
- content: {
- serviceConfigProperties: serviceConfigProperties
- },
- recommendationsConfigs: recommendationsConfigs,
- stepConfigs: stepConfigs
- });
- });
-
- it('should restore provided by user values', function () {
- installerStep7Controller.restoreRecommendedConfigs();
- var configs = installerStep7Controller.get('stepConfigs')[0].configs;
- expect(Em.get(configs.findProperty('name', 'a'), 'value')).to.equal('valueA');
- expect(Em.get(configs.findProperty('name', 'b'), 'value')).to.equal('valueB');
- });
-
- });
-
describe('#_reconfigureServicesOnNnHa', function () {
var dfsNameservices = 'some_cluster';
[3/4] ambari git commit: AMBARI-13142 UI configs clean up.
(ababiichuk)
Posted by ab...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/data/BIGTOP/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/BIGTOP/site_properties.js b/ambari-web/app/data/BIGTOP/site_properties.js
index f74f778..069388d 100644
--- a/ambari-web/app/data/BIGTOP/site_properties.js
+++ b/ambari-web/app/data/BIGTOP/site_properties.js
@@ -24,7 +24,6 @@ module.exports =
//***************************************** BIGTOP stack **************************************
/**********************************************HDFS***************************************/
{
- "id": "site property",
"name": "dfs.namenode.checkpoint.dir",
"displayName": "SecondaryNameNode Checkpoint directories",
"displayType": "directories",
@@ -35,7 +34,6 @@ module.exports =
"index": 1
},
{
- "id": "site property",
"name": "dfs.namenode.checkpoint.period",
"displayName": "HDFS Maximum Checkpoint Delay",
"displayType": "int",
@@ -46,7 +44,6 @@ module.exports =
"index": 3
},
{
- "id": "site property",
"name": "dfs.namenode.name.dir",
"displayName": "NameNode directories",
"displayType": "directories",
@@ -57,7 +54,6 @@ module.exports =
"index": 1
},
{
- "id": "site property",
"name": "dfs.webhdfs.enabled",
"displayName": "WebHDFS enabled",
"displayType": "checkbox",
@@ -68,7 +64,6 @@ module.exports =
"index": 0
},
{
- "id": "site property",
"name": "dfs.datanode.failed.volumes.tolerated",
"displayName": "DataNode volumes failure toleration",
"displayType": "int",
@@ -78,7 +73,6 @@ module.exports =
"index": 3
},
{
- "id": "site property",
"name": "dfs.datanode.data.dir.mount.file",
"displayName": "File that stores mount point for each data dir",
"description": "File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.",
@@ -91,7 +85,6 @@ module.exports =
"index": 4
},
{
- "id": "site property",
"name": "dfs.datanode.data.dir",
"displayName": "DataNode directories",
"displayType": "directories",
@@ -101,7 +94,6 @@ module.exports =
"index": 1
},
{
- "id": "site property",
"name": "dfs.datanode.data.dir.perm",
"displayName": "DataNode directories permission",
"displayType": "int",
@@ -110,7 +102,6 @@ module.exports =
"filename": "hdfs-site.xml"
},
{
- "id": "site property",
"name": "dfs.replication",
"displayName": "Block replication",
"displayType": "int",
@@ -119,7 +110,6 @@ module.exports =
"filename": "hdfs-site.xml"
},
{
- "id": "site property",
"name": "dfs.datanode.du.reserved",
"displayName": "Reserved space for HDFS",
"displayType": "int",
@@ -130,7 +120,6 @@ module.exports =
"index": 2
},
{
- "id": "site property",
"name": "dfs.client.read.shortcircuit",
"displayName": "HDFS Short-circuit read",
"displayType": "checkbox",
@@ -139,7 +128,6 @@ module.exports =
"filename": "hdfs-site.xml"
},
{
- "id": "site property",
"name": "apache_artifacts_download_url",
"displayName": "apache_artifacts_download_url",
"description": "",
@@ -152,7 +140,6 @@ module.exports =
/**********************************************YARN***************************************/
{
- "id": "site property",
"name": "yarn.acl.enable",
"displayName": "yarn.acl.enable",
"displayType": "checkbox",
@@ -161,7 +148,6 @@ module.exports =
"category": "RESOURCEMANAGER"
},
{
- "id": "site property",
"name": "yarn.admin.acl",
"displayName": "yarn.admin.acl",
"isRequired": false,
@@ -170,7 +156,6 @@ module.exports =
"category": "RESOURCEMANAGER"
},
{
- "id": "site property",
"name": "yarn.log-aggregation-enable",
"displayName": "yarn.log-aggregation-enable",
"displayType": "checkbox",
@@ -179,7 +164,6 @@ module.exports =
"category": "RESOURCEMANAGER"
},
{
- "id": "site property",
"name": "yarn.resourcemanager.scheduler.class",
"displayName": "yarn.resourcemanager.scheduler.class",
"serviceName": "YARN",
@@ -187,7 +171,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.scheduler.minimum-allocation-mb",
"displayName": "yarn.scheduler.minimum-allocation-mb",
"displayType": "int",
@@ -196,7 +179,6 @@ module.exports =
"category": "CapacityScheduler"
},
{
- "id": "site property",
"name": "yarn.scheduler.maximum-allocation-mb",
"displayName": "yarn.scheduler.maximum-allocation-mb",
"displayType": "int",
@@ -205,7 +187,6 @@ module.exports =
"category": "CapacityScheduler"
},
{
- "id": "site property",
"name": "yarn.nodemanager.resource.memory-mb",
"displayName": "yarn.nodemanager.resource.memory-mb",
"displayType": "int",
@@ -214,7 +195,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.vmem-pmem-ratio",
"displayName": "yarn.nodemanager.vmem-pmem-ratio",
"serviceName": "YARN",
@@ -222,7 +202,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.linux-container-executor.group",
"displayName": "yarn.nodemanager.linux-container-executor.group",
"serviceName": "YARN",
@@ -230,7 +209,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.log-dirs",
"displayName": "yarn.nodemanager.log-dirs",
"displayType": "directories",
@@ -239,7 +217,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.local-dirs",
"displayName": "yarn.nodemanager.local-dirs",
"displayType": "directories",
@@ -248,7 +225,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.remote-app-log-dir",
"displayName": "yarn.nodemanager.remote-app-log-dir",
"displayType": "directory",
@@ -257,7 +233,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.remote-app-log-dir-suffix",
"displayName": "yarn.nodemanager.remote-app-log-dir-suffix",
"serviceName": "YARN",
@@ -265,7 +240,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.aux-services",
"displayName": "yarn.nodemanager.aux-services",
"serviceName": "YARN",
@@ -273,7 +247,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.nodemanager.log.retain-second",
"displayName": "yarn.nodemanager.log.retain-second",
"serviceName": "YARN",
@@ -281,7 +254,6 @@ module.exports =
"category": "NODEMANAGER"
},
{
- "id": "site property",
"name": "yarn.log.server.url",
"displayName": "yarn.log.server.url",
"category": "Advanced yarn-site",
@@ -289,7 +261,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.enabled",
"displayName": "yarn.timeline-service.enabled",
"category": "APP_TIMELINE_SERVER",
@@ -298,7 +269,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.leveldb-timeline-store.path",
"displayName": "yarn.timeline-service.leveldb-timeline-store.path",
"category": "APP_TIMELINE_SERVER",
@@ -307,7 +277,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms",
"displayName": "yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms",
"displayType": "int",
@@ -316,7 +285,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.store-class",
"displayName": "yarn.timeline-service.store-class",
"category": "APP_TIMELINE_SERVER",
@@ -324,7 +292,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.ttl-enable",
"displayName": "yarn.timeline-service.ttl-enable",
"displayType": "checkbox",
@@ -333,7 +300,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.ttl-ms",
"displayName": "yarn.timeline-service.ttl-ms",
"displayType": "int",
@@ -342,7 +308,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.generic-application-history.store-class",
"displayName": "yarn.timeline-service.generic-application-history.store-class",
"category": "APP_TIMELINE_SERVER",
@@ -350,7 +315,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.webapp.address",
"displayName": "yarn.timeline-service.webapp.address",
"displayType": "string",
@@ -359,7 +323,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.webapp.https.address",
"displayName": "yarn.timeline-service.webapp.https.address",
"displayType": "string",
@@ -368,7 +331,6 @@ module.exports =
"filename": "yarn-site.xml"
},
{
- "id": "site property",
"name": "yarn.timeline-service.address",
"displayName": "yarn.timeline-service.address",
"displayType": "string",
@@ -378,7 +340,6 @@ module.exports =
},
/**********************************************MAPREDUCE2***************************************/
{
- "id": "site property",
"name": "mapreduce.map.memory.mb",
"displayName": "Default virtual memory for a job's map-task",
"displayType": "int",
@@ -388,7 +349,6 @@ module.exports =
"filename": "mapred-site.xml"
},
{
- "id": "site property",
"name": "mapreduce.reduce.memory.mb",
"displayName": "Default virtual memory for a job's reduce-task",
"displayType": "int",
@@ -398,7 +358,6 @@ module.exports =
"filename": "mapred-site.xml"
},
{
- "id": "site property",
"name": "mapreduce.task.io.sort.mb",
"displayName": "Map-side sort buffer memory",
"displayType": "int",
@@ -408,7 +367,6 @@ module.exports =
"filename": "mapred-site.xml"
},
{
- "id": "site property",
"name": "hadoop.security.auth_to_local",
"displayName": "hadoop.security.auth_to_local",
"displayType": "multiLine",
@@ -417,7 +375,6 @@ module.exports =
"category": "Advanced core-site"
},
{
- "id": "site property",
"name": "yarn.app.mapreduce.am.resource.mb",
"displayName": "yarn.app.mapreduce.am.resource.mb",
"displayType": "int",
@@ -428,7 +385,6 @@ module.exports =
/**********************************************oozie-site***************************************/
{
- "id": "site property",
"name": "oozie.db.schema.name",
"displayName": "Database Name",
"isOverridable": false,
@@ -440,7 +396,6 @@ module.exports =
"index": 4
},
{
- "id": "site property",
"name": "oozie.service.JPAService.jdbc.username",
"displayName": "Database Username",
"isOverridable": false,
@@ -451,7 +406,6 @@ module.exports =
"index": 5
},
{
- "id": "site property",
"name": "oozie.service.JPAService.jdbc.password",
"displayName": "Database Password",
"isOverridable": false,
@@ -462,7 +416,6 @@ module.exports =
"index": 6
},
{
- "id": "site property",
"name": "oozie.service.JPAService.jdbc.driver", // the default value of this property is overriden in code
"displayName": "JDBC Driver Class",
"isOverridable": false,
@@ -472,7 +425,6 @@ module.exports =
"index": 7
},
{
- "id": "site property",
"name": "oozie.service.JPAService.jdbc.url",
"displayName": "Database URL",
"isOverridable": false,
@@ -485,7 +437,6 @@ module.exports =
/**********************************************hive-site***************************************/
{
- "id": "site property",
"name": "javax.jdo.option.ConnectionDriverName", // the default value is overwritten in code
"displayName": "JDBC Driver Class",
"isOverridable": false,
@@ -495,7 +446,6 @@ module.exports =
"index": 7
},
{
- "id": "site property",
"name": "hive.heapsize",
"displayName": "Hive heap size",
"displayType": "int",
@@ -507,7 +457,6 @@ module.exports =
"index": 9
},
{
- "id": "site property",
"name": "javax.jdo.option.ConnectionUserName",
"displayName": "Database Username",
"displayType": "host",
@@ -518,7 +467,6 @@ module.exports =
"index": 5
},
{
- "id": "site property",
"name": "javax.jdo.option.ConnectionPassword",
"displayName": "Database Password",
"displayType": "password",
@@ -529,7 +477,6 @@ module.exports =
"index": 6
},
{
- "id": "site property",
"name": "javax.jdo.option.ConnectionURL",
"displayName": "Database URL",
"displayType": "advanced",
@@ -540,7 +487,6 @@ module.exports =
"index": 8
},
{
- "id": "site property",
"name": "ambari.hive.db.schema.name",
"displayName": "Database Name",
"displayType": "host",
@@ -552,7 +498,6 @@ module.exports =
"index": 4
},
{
- "id": "site property",
"name": "hive.server2.tez.default.queues",
"displayName": "hive.server2.tez.default.queues",
"isRequired": false,
@@ -560,7 +505,6 @@ module.exports =
"category": "Advanced hive-site"
},
{
- "id": "site property",
"name": "hive.server2.thrift.port",
"displayName": "Hive Server Port",
"description": "TCP port number to listen on, default 10000.",
@@ -574,7 +518,6 @@ module.exports =
"filename": "hive-site.xml"
},
{
- "id": "site property",
"name": "hive.server2.support.dynamic.service.discovery",
"displayName": "hive.server2.support.dynamic.service.discovery",
"recommendedValue": true,
@@ -583,7 +526,6 @@ module.exports =
"serviceName": "HIVE"
},
{
- "id": "site property",
"name": "hive.zookeeper.quorum",
"displayName": "hive.zookeeper.quorum",
"recommendedValue": "localhost:2181",
@@ -594,7 +536,6 @@ module.exports =
},
/**********************************************tez-site*****************************************/
{
- "id": "site property",
"name": "tez.am.resource.memory.mb",
"displayName": "tez.am.resource.memory.mb",
"displayType": "int",
@@ -602,14 +543,12 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.am.java.opts",
"displayName": "tez.am.java.opts",
"category": "General",
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.am.grouping.split-waves",
"displayName": "tez.am.grouping.split-waves",
"displayType": "float",
@@ -617,7 +556,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.am.grouping.min-size",
"displayName": "tez.am.grouping.min-size",
"displayType": "int",
@@ -625,7 +563,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.am.grouping.max-size",
"displayName": "tez.am.grouping.max-size",
"displayType": "int",
@@ -633,7 +570,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.am.log.level",
"displayName": "tez.am.log.level",
"displayType": "string",
@@ -641,7 +577,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.runtime.intermediate-input.compress.codec",
"displayName": "tez.runtime.intermediate-input.compress.codec",
"displayType": "string",
@@ -649,7 +584,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.runtime.intermediate-input.is-compressed",
"displayName": "tez.runtime.intermediate-input.is-compressed",
"displayType": "checkbox",
@@ -657,7 +591,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.runtime.intermediate-output.compress.codec",
"displayName": "tez.runtime.intermediate-output.compress.codec",
"displayType": "string",
@@ -665,7 +598,6 @@ module.exports =
"serviceName": "TEZ"
},
{
- "id": "site property",
"name": "tez.runtime.intermediate-output.should-compress",
"displayName": "tez.runtime.intermediate-output.should-compress",
"displayType": "checkbox",
@@ -675,7 +607,6 @@ module.exports =
/**********************************************hbase-site***************************************/
{
- "id": "site property",
"name": "hbase.tmp.dir",
"displayName": "HBase tmp directory",
"displayType": "directory",
@@ -684,7 +615,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.master.port",
"displayName": "HBase Master Port",
"isReconfigurable": true,
@@ -696,7 +626,6 @@ module.exports =
"category": "Advanced hbase-site"
},
{
- "id": "site property",
"name": "hbase.regionserver.global.memstore.upperLimit",
"displayName": "hbase.regionserver.global.memstore.upperLimit",
"displayType": "float",
@@ -705,7 +634,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.regionserver.global.memstore.lowerLimit",
"displayName": "hbase.regionserver.global.memstore.lowerLimit",
"displayType": "float",
@@ -714,7 +642,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.hstore.blockingStoreFiles",
"displayName": "hstore blocking storefiles",
"displayType": "int",
@@ -723,7 +650,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.hstore.compactionThreshold",
"displayName": "HBase HStore compaction threshold",
"displayType": "int",
@@ -733,7 +659,6 @@ module.exports =
"index": 0
},
{
- "id": "site property",
"name": "hfile.block.cache.size",
"displayName": "HFile block cache size ",
"displayType": "float",
@@ -743,7 +668,6 @@ module.exports =
"index": 1
},
{
- "id": "site property",
"name": "hbase.hregion.max.filesize",
"displayName": "Maximum HStoreFile Size",
"displayType": "int",
@@ -754,7 +678,6 @@ module.exports =
"index": 2
},
{
- "id": "site property",
"name": "hbase.regionserver.handler.count",
"displayName": "RegionServer Handler",
"displayType": "int",
@@ -764,7 +687,6 @@ module.exports =
"index": 2
},
{
- "id": "site property",
"name": "hbase.hregion.majorcompaction",
"displayName": "HBase Region Major Compaction",
"displayType": "int",
@@ -775,7 +697,6 @@ module.exports =
"index": 3
},
{
- "id": "site property",
"name": "hbase.hregion.memstore.block.multiplier",
"displayName": "HBase Region Block Multiplier",
"displayType": "int",
@@ -785,7 +706,6 @@ module.exports =
"index": 4
},
{
- "id": "site property",
"name": "hbase.hregion.memstore.mslab.enabled",
"displayName": "hbase.hregion.memstore.mslab.enabled",
"displayType": "checkbox",
@@ -794,7 +714,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.hregion.memstore.flush.size",
"displayName": "HBase Region Memstore Flush Size",
"displayType": "int",
@@ -805,7 +724,6 @@ module.exports =
"index": 5
},
{
- "id": "site property",
"name": "hbase.client.scanner.caching",
"displayName": "HBase Client Scanner Caching",
"displayType": "int",
@@ -816,7 +734,6 @@ module.exports =
"index": 3
},
{
- "id": "site property",
"name": "zookeeper.session.timeout",
"displayName": "Zookeeper timeout for HBase Session",
"displayType": "int",
@@ -827,7 +744,6 @@ module.exports =
"index": 4
},
{
- "id": "site property",
"name": "hbase.client.keyvalue.maxsize",
"displayName": "HBase Client Maximum key-value Size",
"displayType": "int",
@@ -838,7 +754,6 @@ module.exports =
"index": 5
},
{
- "id": "site property",
"name": "hbase.coprocessor.region.classes",
"displayName": "hbase.coprocessor.region.classes",
"category": "Advanced hbase-site",
@@ -847,7 +762,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.coprocessor.master.classes",
"displayName": "hbase.coprocessor.master.classes",
"category": "Advanced hbase-site",
@@ -856,7 +770,6 @@ module.exports =
"filename": "hbase-site.xml"
},
{
- "id": "site property",
"name": "hbase.zookeeper.quorum",
"displayName": "hbase.zookeeper.quorum",
"displayType": "multiLine",
@@ -867,7 +780,6 @@ module.exports =
/**********************************************storm-site***************************************/
{
- "id": "site property",
"name": "storm.zookeeper.root",
"displayName": "storm.zookeeper.root",
"displayType": "directory",
@@ -875,7 +787,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.local.dir",
"displayName": "storm.local.dir",
"displayType": "directory",
@@ -883,7 +794,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.zookeeper.servers",
"displayName": "storm.zookeeper.servers",
"displayType": "masterHosts",
@@ -893,7 +803,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.zookeeper.port",
"displayName": "storm.zookeeper.port",
"displayType": "int",
@@ -901,7 +810,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.zookeeper.session.timeout",
"displayName": "storm.zookeeper.session.timeout",
"displayType": "int",
@@ -909,7 +817,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.zookeeper.connection.timeout",
"displayName": "storm.zookeeper.connection.timeout",
"displayType": "int",
@@ -917,7 +824,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.zookeeper.retry.times",
"displayName": "storm.zookeeper.retry.times",
"displayType": "int",
@@ -925,7 +831,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.zookeeper.retry.interval",
"displayName": "storm.zookeeper.retry.interval",
"displayType": "int",
@@ -934,7 +839,6 @@ module.exports =
"unit": "ms"
},
{
- "id": "site property",
"name": "storm.zookeeper.retry.intervalceiling.millis",
"displayName": "storm.zookeeper.retry.intervalceiling.millis",
"displayType": "int",
@@ -943,14 +847,12 @@ module.exports =
"unit": "ms"
},
{
- "id": "site property",
"name": "storm.cluster.mode",
"displayName": "storm.cluster.mode",
"serviceName": "STORM",
"category": "General"
},
{
- "id": "site property",
"name": "storm.local.mode.zmq",
"displayName": "storm.local.mode.zmq",
"displayType": "checkbox",
@@ -958,21 +860,18 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "storm.thrift.transport",
"displayName": "storm.thrift.transport",
"serviceName": "STORM",
"category": "General"
},
{
- "id": "site property",
"name": "storm.messaging.transport",
"displayName": "storm.messaging.transport",
"serviceName": "STORM",
"category": "General"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "General",
"displayName": "storm.messaging.netty.buffer_size",
@@ -981,7 +880,6 @@ module.exports =
"unit": "bytes"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "General",
"displayName": "storm.messaging.netty.max_retries",
@@ -989,7 +887,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "General",
"displayName": "storm.messaging.netty.max_wait_ms",
@@ -998,7 +895,6 @@ module.exports =
"unit": "ms"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "General",
"displayName": "storm.messaging.netty.min_wait_ms",
@@ -1007,7 +903,6 @@ module.exports =
"unit": "ms"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "General",
"displayName": "storm.messaging.netty.server_worker_threads",
@@ -1015,7 +910,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "General",
"displayName": "storm.messaging.netty.client_worker_threads",
@@ -1023,7 +917,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"name": "nimbus.host",
"displayName": "nimbus.host",
"displayType": "masterHost",
@@ -1033,7 +926,6 @@ module.exports =
"category": "NIMBUS"
},
{
- "id": "site property",
"name": "nimbus.thrift.port",
"displayName": "nimbus.thrift.port",
"displayType": "int",
@@ -1041,7 +933,6 @@ module.exports =
"category": "NIMBUS"
},
{
- "id": "site property",
"name": "nimbus.thrift.max_buffer_size",
"displayName": "nimbus.thrift.max_buffer_size",
"displayType": "int",
@@ -1050,7 +941,6 @@ module.exports =
"unit": "bytes"
},
{
- "id": "site property",
"name": "nimbus.childopts",
"displayName": "nimbus.childopts",
"displayType": "multiLine",
@@ -1060,7 +950,6 @@ module.exports =
"filename": "storm-site.xml"
},
{
- "id": "site property",
"name": "nimbus.task.timeout.secs",
"displayName": "nimbus.task.timeout.secs",
"displayType": "int",
@@ -1069,7 +958,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.supervisor.timeout.secs",
"displayName": "nimbus.supervisor.timeout.secs",
"displayType": "int",
@@ -1078,7 +966,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.monitor.freq.secs",
"displayName": "nimbus.monitor.freq.secs",
"displayType": "int",
@@ -1087,7 +974,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.cleanup.inbox.freq.secs",
"displayName": "nimbus.cleanup.inbox.freq.secs",
"displayType": "int",
@@ -1096,7 +982,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.inbox.jar.expiration.secs",
"displayName": "nimbus.inbox.jar.expiration.secs",
"displayType": "int",
@@ -1105,7 +990,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.task.launch.secs",
"displayName": "nimbus.task.launch.secs",
"displayType": "int",
@@ -1114,7 +998,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.reassign",
"displayName": "nimbus.reassign",
"displayType": "checkbox",
@@ -1123,7 +1006,6 @@ module.exports =
"category": "NIMBUS"
},
{
- "id": "site property",
"name": "nimbus.file.copy.expiration.secs",
"displayName": "nimbus.file.copy.expiration.secs",
"displayType": "int",
@@ -1132,14 +1014,12 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"name": "nimbus.topology.validator",
"displayName": "nimbus.topology.validator",
"serviceName": "STORM",
"category": "NIMBUS"
},
{
- "id": "site property",
"name": "supervisor.slots.ports",
"displayName": "supervisor.slots.ports",
"displayType": "string",
@@ -1147,7 +1027,6 @@ module.exports =
"category": "SUPERVISOR"
},
{
- "id": "site property",
"isOverrideable": false,
"serviceName": "STORM",
"category": "SUPERVISOR",
@@ -1157,7 +1036,6 @@ module.exports =
"filename": "storm-site.xml"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "SUPERVISOR",
"displayName": "supervisor.worker.start.timeout.secs",
@@ -1166,7 +1044,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "SUPERVISOR",
"displayName": "supervisor.worker.timeout.secs",
@@ -1175,7 +1052,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "SUPERVISOR",
"displayName": "supervisor.monitor.frequency.secs",
@@ -1184,7 +1060,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "SUPERVISOR",
"displayName": "supervisor.heartbeat.frequency.secs",
@@ -1193,7 +1068,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "DRPC_SERVER",
"displayName": "drpc.port",
@@ -1201,7 +1075,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "DRPC_SERVER",
"displayName": "drpc.worker.threads",
@@ -1209,7 +1082,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "DRPC_SERVER",
"displayName": "drpc.queue.size",
@@ -1217,7 +1089,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "DRPC_SERVER",
"displayName": "drpc.invocations.port",
@@ -1225,7 +1096,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "DRPC_SERVER",
"displayName": "drpc.request.timeout.secs",
@@ -1234,7 +1104,6 @@ module.exports =
"unit": "seconds"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "DRPC_SERVER",
"displayName": "drpc.childopts",
@@ -1242,7 +1111,6 @@ module.exports =
"displayType": "string"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "STORM_UI_SERVER",
"displayName": "ui.port",
@@ -1250,7 +1118,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "STORM_UI_SERVER",
"displayName": "ui.childopts",
@@ -1260,7 +1127,6 @@ module.exports =
//@Todo: uncomment following properties when logviewer is treated as different section on storm service page
/*
{
- "id": "site property",
"serviceName": "STORM",
"category": "LogviewerServer",
"displayName": "logviewer.port",
@@ -1268,7 +1134,6 @@ module.exports =
"displayType": "int"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "LogviewerServer",
"displayName": "logviewer.childopts",
@@ -1276,7 +1141,6 @@ module.exports =
"displayType": "string"
},
{
- "id": "site property",
"serviceName": "STORM",
"category": "LogviewerServer",
"displayName": "logviewer.appender.name",
@@ -1285,7 +1149,6 @@ module.exports =
},
*/
{
- "id": "site property",
"serviceName": "STORM",
"category": "Advanced storm-site",
"displayName": "worker.childopts",
@@ -1295,7 +1158,6 @@ module.exports =
},
/*********************************************oozie-site for Falcon*****************************/
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1305,7 +1167,6 @@ module.exports =
"filename": "oozie-site.xml"
},
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1315,7 +1176,6 @@ module.exports =
"filename": "oozie-site.xml"
},
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1325,7 +1185,6 @@ module.exports =
"filename": "oozie-site.xml"
},
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1335,7 +1194,6 @@ module.exports =
"filename": "oozie-site.xml"
},
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1345,7 +1203,6 @@ module.exports =
"filename": "oozie-site.xml"
},
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1355,7 +1212,6 @@ module.exports =
"filename": "oozie-site.xml"
},
{
- "id": "site property",
"isReconfigurable": true,
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
@@ -1367,7 +1223,6 @@ module.exports =
// Runtime properties
{
- "id": "site property",
"name": "*.domain",
"displayName": "*.domain",
"category": "FalconRuntimeSite",
@@ -1376,7 +1231,6 @@ module.exports =
},
{
- "id": "site property",
"name": "*.log.cleanup.frequency.minutes.retention",
"displayName": "*.log.cleanup.frequency.minutes.retention",
"category": "FalconRuntimeSite",
@@ -1384,7 +1238,6 @@ module.exports =
"filename": "falcon-runtime.properties.xml"
},
{
- "id": "site property",
"name": "*.log.cleanup.frequency.hours.retention",
"displayName": "*.log.cleanup.frequency.hours.retention",
"category": "FalconRuntimeSite",
@@ -1392,7 +1245,6 @@ module.exports =
"filename": "falcon-runtime.properties.xml"
},
{
- "id": "site property",
"name": "*.log.cleanup.frequency.days.retention",
"displayName": "*.log.cleanup.frequency.days.retention",
"category": "FalconRuntimeSite",
@@ -1400,7 +1252,6 @@ module.exports =
"filename": "falcon-runtime.properties.xml"
},
{
- "id": "site property",
"name": "*.log.cleanup.frequency.months.retention",
"displayName": "*.log.cleanup.frequency.months.retention",
"category": "FalconRuntimeSite",
@@ -1411,7 +1262,6 @@ module.exports =
// Startup properties
{
- "id": "site property",
"name": "*.domain",
"displayName": "*.domain",
"category": "FalconStartupSite",
@@ -1419,7 +1269,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.workflow.engine.impl",
"displayName": "*.workflow.engine.impl",
"category": "FalconStartupSite",
@@ -1427,7 +1276,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.oozie.process.workflow.builder",
"displayName": "*.oozie.process.workflow.builder",
"category": "FalconStartupSite",
@@ -1435,7 +1283,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.oozie.feed.workflow.builder",
"displayName": "*.oozie.feed.workflow.builder",
"category": "FalconStartupSite",
@@ -1443,7 +1290,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.SchedulableEntityManager.impl",
"displayName": "*.SchedulableEntityManager.impl",
"category": "FalconStartupSite",
@@ -1451,7 +1297,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.ConfigSyncService.impl",
"displayName": "*.ConfigSyncService.impl",
"category": "FalconStartupSite",
@@ -1459,7 +1304,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.ProcessInstanceManager.impl",
"displayName": "*.ProcessInstanceManager.impl",
"category": "FalconStartupSite",
@@ -1467,7 +1311,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.catalog.service.impl",
"displayName": "*.catalog.service.impl",
"category": "FalconStartupSite",
@@ -1475,7 +1318,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.application.services",
"displayName": "*.application.services",
"displayType": "multiLine",
@@ -1484,7 +1326,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.configstore.listeners",
"displayName": "*.configstore.listeners",
"displayType": "multiLine",
@@ -1493,7 +1334,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.broker.impl.class",
"displayName": "*.broker.impl.class",
"category": "FalconStartupSite",
@@ -1501,7 +1341,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.shared.libs",
"displayName": "*.shared.libs",
"category": "FalconStartupSite",
@@ -1509,7 +1348,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.config.store.uri",
"displayName": "*.config.store.uri",
"category": "FalconStartupSite",
@@ -1517,7 +1355,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.system.lib.location",
"displayName": "*.system.lib.location",
"category": "FalconStartupSite",
@@ -1525,7 +1362,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.retry.recorder.path",
"displayName": "*.retry.recorder.path",
"category": "FalconStartupSite",
@@ -1533,7 +1369,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.cleanup.service.frequency",
"displayName": "*.falcon.cleanup.service.frequency",
"category": "FalconStartupSite",
@@ -1541,7 +1376,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.broker.url",
"displayName": "*.broker.url",
"category": "FalconStartupSite",
@@ -1549,7 +1383,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.broker.ttlInMins",
"displayName": "*.broker.ttlInMins",
"displayType": "int",
@@ -1558,7 +1391,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.entity.topic",
"displayName": "*.entity.topic",
"category": "FalconStartupSite",
@@ -1566,7 +1398,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.max.retry.failure.count",
"displayName": "*.max.retry.failure.count",
"displayType": "int",
@@ -1575,7 +1406,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.internal.queue.size",
"displayName": "*.internal.queue.size",
"displayType": "int",
@@ -1584,7 +1414,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.authentication.type",
"displayName": "*.falcon.authentication.type",
"category": "FalconStartupSite",
@@ -1592,7 +1421,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.http.authentication.type",
"displayName": "*.falcon.http.authentication.type",
"category": "FalconStartupSite",
@@ -1600,7 +1428,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.http.authentication.token.validity",
"displayName": "*.falcon.http.authentication.token.validity",
"displayType": "int",
@@ -1609,7 +1436,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.http.authentication.signature.secret",
"displayName": "*.falcon.http.authentication.signature.secret",
"category": "FalconStartupSite",
@@ -1617,7 +1443,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.http.authentication.simple.anonymous.allowed",
"displayName": "*.falcon.http.authentication.simple.anonymous.allowed",
"category": "FalconStartupSite",
@@ -1625,7 +1450,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.http.authentication.kerberos.name.rules",
"displayName": "*.falcon.http.authentication.kerberos.name.rules",
"category": "FalconStartupSite",
@@ -1634,7 +1458,6 @@ module.exports =
"filename": "falcon-startup.properties.xml"
},
{
- "id": "site property",
"name": "*.falcon.http.authentication.blacklisted.users",
"displayName": "*.falcon.http.authentication.blacklisted.users",
"isRequired": false,
@@ -1645,7 +1468,6 @@ module.exports =
/**********************************************webhcat-site***************************************/
{
- "id": "site property",
"name": "templeton.hive.archive",
"displayName": "templeton.hive.archive",
"isRequired": false,
@@ -1654,7 +1476,6 @@ module.exports =
"category": "Advanced webhcat-site"
},
{
- "id": "site property",
"name": "templeton.pig.archive",
"displayName": "templeton.pig.archive",
"isRequired": false,
@@ -1663,7 +1484,6 @@ module.exports =
"category": "Advanced webhcat-site"
},
{
- "id": "site property",
"name": "templeton.zookeeper.hosts",
"displayName": "templeton.zookeeper.hosts",
"displayType": "multiLine",
@@ -1673,7 +1493,6 @@ module.exports =
},
/**********************************************pig.properties*****************************************/
{
- "id": "site property",
"name": "content",
"displayName": "content",
"value": "",
@@ -1688,7 +1507,6 @@ module.exports =
},
/********************************************* flume-agent *****************************/
{
- "id": "site property",
"name": "content",
"displayName": "content",
"showLabel": false,
@@ -1699,7 +1517,6 @@ module.exports =
"filename": "flume-conf.xml"
},
{
- "id": "puppet var",
"name": "flume_conf_dir",
"displayName": "Flume Conf Dir",
"description": "Location to save configuration files",
@@ -1714,7 +1531,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "flume_log_dir",
"displayName": "Flume Log Dir",
"description": "Location to save log files",
@@ -1730,7 +1546,6 @@ module.exports =
},
/**********************************************HDFS***************************************/
{
- "id": "puppet var",
"name": "namenode_host",
"displayName": "NameNode hosts",
"value": "",
@@ -1746,7 +1561,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "namenode_heapsize",
"displayName": "NameNode Java heap size",
"description": "Initial and maximum Java heap size for NameNode (Java options -Xms and -Xmx). This also applies to the Secondary NameNode.",
@@ -1761,7 +1575,6 @@ module.exports =
"index": 2
},
{
- "id": "puppet var",
"name": "namenode_opt_newsize",
"displayName": "NameNode new generation size",
"description": "Default size of Java new generation for NameNode (Java option -XX:NewSize). This also applies to the Secondary NameNode.",
@@ -1776,7 +1589,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "namenode_opt_maxnewsize",
"displayName": "NameNode maximum new generation size",
"description": "Maximum size of Java new generation for NameNode (Java option -XX:MaxnewSize).",
@@ -1791,7 +1603,6 @@ module.exports =
"index": 4
},
{
- "id": "puppet var",
"name": "namenode_opt_permsize",
"displayName": "NameNode permanent generation size",
"description": "Default size of Java new generation for NameNode (Java option -XX:PermSize). This also applies to the Secondary NameNode.",
@@ -1806,7 +1617,6 @@ module.exports =
"index": 5
},
{
- "id": "puppet var",
"name": "namenode_opt_maxpermsize",
"displayName": "NameNode maximum permanent generation size",
"description": "Maximum size of Java permanent generation for NameNode (Java option -XX:MaxPermSize).",
@@ -1821,7 +1631,6 @@ module.exports =
"index": 6
},
{
- "id": "puppet var",
"name": "snamenode_host",
"displayName": "SNameNode host",
"value": "",
@@ -1837,7 +1646,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "datanode_hosts", //not in the schema. For UI purpose
"displayName": "DataNode hosts",
"value": "",
@@ -1854,7 +1662,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "dtnode_heapsize",
"displayName": "DataNode maximum Java heap size",
"description": "Maximum Java heap size for DataNode (Java option -Xmx)",
@@ -1868,7 +1675,6 @@ module.exports =
"index": 2
},
{
- "id": "puppet var",
"name": "hadoop_heapsize",
"displayName": "Hadoop maximum Java heap size",
"description": "Maximum Java heap size for daemons such as Balancer (Java option -Xmx)",
@@ -1882,7 +1688,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "hdfs_log_dir_prefix",
"displayName": "Hadoop Log Dir Prefix",
"description": "The parent directory for Hadoop log files. The HDFS log directory will be ${hadoop_log_dir_prefix} / ${hdfs_user} and the MapReduce log directory will be ${hadoop_log_dir_prefix} / ${mapred_user}.",
@@ -1896,7 +1701,6 @@ module.exports =
"category": "Advanced hadoop-env"
},
{
- "id": "puppet var",
"name": "hadoop_pid_dir_prefix",
"displayName": "Hadoop PID Dir Prefix",
"description": "The parent directory in which the PID files for Hadoop processes will be created. The HDFS PID directory will be ${hadoop_pid_dir_prefix} / ${hdfs_user} and the MapReduce PID directory will be ${hadoop_pid_dir_prefix} / ${mapred_user}.",
@@ -1910,7 +1714,6 @@ module.exports =
"category": "Advanced hadoop-env"
},
{
- "id": "puppet var",
"name": "hadoop_root_logger",
"displayName": "Hadoop Root Logger",
"description": "Hadoop logging options",
@@ -1925,7 +1728,6 @@ module.exports =
/**********************************************MAPREDUCE2***************************************/
{
- "id": "puppet var",
"name": "hs_host",
"displayName": "History Server",
"description": "History Server",
@@ -1940,7 +1742,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "jobhistory_heapsize",
"displayName": "History Server heap size",
"description": "History Server heap size",
@@ -1955,7 +1756,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "mapred_log_dir_prefix",
"displayName": "Mapreduce Log Dir Prefix",
"description": "",
@@ -1969,7 +1769,6 @@ module.exports =
"category": "Advanced mapred-env"
},
{
- "id": "puppet var",
"name": "mapred_pid_dir_prefix",
"displayName": "Mapreduce PID Dir Prefix",
"description": "",
@@ -1984,7 +1783,6 @@ module.exports =
},
/**********************************************YARN***************************************/
{
- "id": "puppet var",
"name": "yarn_heapsize",
"displayName": "YARN Java heap size",
"description": "Max heapsize for all YARN components",
@@ -1999,7 +1797,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "rm_host",
"displayName": "ResourceManager",
"description": "ResourceManager",
@@ -2014,7 +1811,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "resourcemanager_heapsize",
"displayName": "ResourceManager Java heap size",
"description": "Max heapsize for ResourceManager",
@@ -2029,7 +1825,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "nm_hosts",
"displayName": "NodeManager",
"description": "List of NodeManager Hosts.",
@@ -2044,7 +1839,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "nodemanager_heapsize",
"displayName": "NodeManager Java heap size",
"description": "Max heapsize for NodeManager",
@@ -2059,7 +1853,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "yarn_log_dir_prefix",
"displayName": "YARN Log Dir Prefix",
"description": "",
@@ -2073,7 +1866,6 @@ module.exports =
"category": "Advanced yarn-env"
},
{
- "id": "puppet var",
"name": "yarn_pid_dir_prefix",
"displayName": "YARN PID Dir Prefix",
"description": "",
@@ -2087,7 +1879,6 @@ module.exports =
"category": "Advanced yarn-env"
},
{
- "id": "puppet var",
"name": "min_user_id",
"displayName": "Minimum user ID for submitting job",
"isOverridable": true,
@@ -2098,7 +1889,6 @@ module.exports =
"category": "Advanced yarn-env"
},
{
- "id": "puppet var",
"name": "ats_host",
"displayName": "App Timeline Server",
"description": "Application Timeline Server Host",
@@ -2113,7 +1903,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "apptimelineserver_heapsize",
"displayName": "AppTimelineServer Java heap size",
"description": "AppTimelineServer Java heap size",
@@ -2129,7 +1918,6 @@ module.exports =
},
/**********************************************HBASE***************************************/
{
- "id": "puppet var",
"name": "hbasemaster_host",
"displayName": "HBase Master hosts",
"value": "",
@@ -2145,7 +1933,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "hbase_master_heapsize",
"displayName": "HBase Master Maximum Java heap size",
"description": "Maximum Java heap size for HBase master (Java option -Xmx)",
@@ -2160,7 +1947,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "regionserver_hosts",
"displayName": "RegionServer hosts",
"value": "",
@@ -2177,7 +1963,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "hbase_regionserver_heapsize",
"displayName": "RegionServers maximum Java heap size",
"description": "Maximum Java heap size for RegionServers (Java option -Xmx)",
@@ -2191,7 +1976,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "hbase_regionserver_xmn_max",
"displayName": "RegionServers maximum value for -Xmn",
"displayType": "int",
@@ -2203,7 +1987,6 @@ module.exports =
"index": 6
},
{
- "id": "puppet var",
"name": "hbase_regionserver_xmn_ratio",
"displayName": "RegionServers -Xmn in -Xmx ratio",
"displayType": "float",
@@ -2214,7 +1997,6 @@ module.exports =
"index": 7
},
{
- "id": "puppet var",
"name": "hbase_log_dir",
"displayName": "HBase Log Dir",
"description": "Directory for HBase logs",
@@ -2228,7 +2010,6 @@ module.exports =
"category": "Advanced hbase-env"
},
{
- "id": "puppet var",
"name": "hbase_pid_dir",
"displayName": "HBase PID Dir",
"description": "Directory in which the pid files for HBase processes will be created",
@@ -2243,7 +2024,6 @@ module.exports =
},
//***************************************** GLUSTERFS stack********************************************
{
- "id": "site property",
"name": "fs.glusterfs.impl",
"displayName": "GlusterFS fs impl",
"displayType": "string",
@@ -2252,7 +2032,6 @@ module.exports =
"category": "General"
},
{
- "id": "site property",
"name": "fs.AbstractFileSystem.glusterfs.impl",
"displayName": "GlusterFS Abstract File System Implementation",
"displayType": "string",
@@ -2262,7 +2041,6 @@ module.exports =
},
/**********************************************GLUSTERFS***************************************/
{
- "id": "puppet var",
"name": "fs_glusterfs_default_name",
"displayName": "GlusterFS default fs name 1.x Hadoop",
"description": "GlusterFS default filesystem name (glusterfs://{MasterFQDN}:9000)",
@@ -2274,7 +2052,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "glusterfs_defaultFS_name",
"displayName": "GlusterFS default fs name 2.x Hadoop",
"description": "GlusterFS default filesystem name (glusterfs:///)",
@@ -2286,7 +2063,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "hadoop_heapsize",
"displayName": "Hadoop maximum Java heap size",
"description": "Maximum Java heap size for daemons such as Balancer (Java option -Xmx)",
@@ -2300,7 +2076,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "hdfs_log_dir_prefix",
"displayName": "Hadoop Log Dir Prefix",
"description": "The parent directory for Hadoop log files. The HDFS log directory will be ${hadoop_log_dir_prefix} / ${hdfs_user} and the MapReduce log directory will be ${hadoop_log_dir_prefix} / ${mapred_user}.",
@@ -2314,7 +2089,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "hadoop_pid_dir_prefix",
"displayName": "Hadoop PID Dir Prefix",
"description": "The parent directory in which the PID files for Hadoop processes will be created. The HDFS PID directory will be ${hadoop_pid_dir_prefix} / ${hdfs_user} and the MapReduce PID directory will be ${hadoop_pid_dir_prefix} / ${mapred_user}.",
@@ -2328,7 +2102,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "namenode_heapsize",
"displayName": "Name Node Heap Size",
"description": "Name Node Heap Size, default jvm memory setting",
@@ -2342,7 +2115,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "namenode_opt_newsize",
"displayName": "NameNode new generation size",
"description": "Default size of Java new generation for NameNode (Java option -XX:NewSize). This also applies to the Secondary NameNode.",
@@ -2356,7 +2128,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "namenode_opt_maxnewsize",
"displayName": "NameNode maximum new generation size",
"description": "Maximum size of Java new generation for NameNode (Java option -XX:MaxnewSize).",
@@ -2370,7 +2141,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "namenode_opt_permsize",
"displayName": "NameNode permanent generation size",
"description": "Default size of Java permanent generation for NameNode (Java option -XX:PermSize). This also applies to the Secondary NameNode.",
@@ -2384,7 +2154,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "namenode_opt_maxpermsize",
"displayName": "NameNode maximum permanent generation size",
"description": "Maximum size of Java permanent generation for NameNode (Java option -XX:MaxPermSize).",
@@ -2398,7 +2167,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "dtnode_heapsize",
"displayName": "DataNode maximum Java heap size",
"description": "Maximum Java heap size for DataNode (Java option -Xmx)",
@@ -2411,7 +2179,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "glusterfs_user",
"displayName": "glusterfs user",
"description": "glusterfs user",
@@ -2423,7 +2190,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "namenode_host",
"displayName": "NameNode Host",
"description": "NameNode Host.",
@@ -2435,7 +2201,6 @@ module.exports =
"category": "General Hadoop"
},
{
- "id": "puppet var",
"name": "snamenode_host",
"displayName": "Secondary NameNode Host",
"description": "Secondary NameNode Host.",
@@ -2448,7 +2213,6 @@ module.exports =
},
/**********************************************HIVE***************************************/
{
- "id": "puppet var",
"name": "hivemetastore_host",
"displayName": "Hive Metastore hosts",
"value": "",
@@ -2475,7 +2239,6 @@ module.exports =
},
// for existing MySQL
{
- "id": "puppet var",
"name": "hive_existing_mysql_database",
"displayName": "Database Type",
"value": "",
@@ -2493,7 +2256,6 @@ module.exports =
},
// for existing PostgreSQL
{
- "id": "puppet var",
"name": "hive_existing_postgresql_database",
"displayName": "Database Type",
"value": "",
@@ -2511,7 +2273,6 @@ module.exports =
},
// for existing Oracle
{
- "id": "puppet var",
"name": "hive_existing_oracle_database",
"displayName": "Database Type",
"value": "",
@@ -2529,7 +2290,6 @@ module.exports =
},
// for new PostgreSQL
{
- "id": "puppet var",
"name": "hive_ambari_database",
"displayName": "Database Type",
"value": "",
@@ -2545,7 +2305,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "hive_database",
"displayName": "Hive Database",
"value": "",
@@ -2580,7 +2339,6 @@ module.exports =
"index": 2
},
{
- "id": "puppet var",
"name": "hive_hostname",
"displayName": "Database Host",
"description": "Specify the host on which the database is hosted",
@@ -2597,7 +2355,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "hive_existing_mysql_host",
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
@@ -2612,7 +2369,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "hive_existing_postgresql_host",
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
@@ -2627,7 +2383,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "hive_existing_oracle_host",
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
@@ -2642,7 +2397,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "hive_ambari_host",
"value": "",
"recommendedValue": "",
@@ -2659,7 +2413,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "hive_metastore_port",
"displayName": "Hive metastore port",
"description": "",
@@ -2673,7 +2426,6 @@ module.exports =
"category": "Advanced hive-env"
},
{
- "id": "puppet var",
"name": "hive_lib",
"displayName": "Hive library",
"description": "",
@@ -2687,7 +2439,6 @@ module.exports =
"category": "Advanced hive-env"
},
{
- "id": "puppet var",
"name": "hive_dbroot",
"displayName": "Hive db directory",
"description": "",
@@ -2701,7 +2452,6 @@ module.exports =
"category": "Advanced hive-env"
},
{
- "id": "puppet var",
"name": "hive_log_dir",
"displayName": "Hive Log Dir",
"description": "Directory for Hive log files",
@@ -2715,7 +2465,6 @@ module.exports =
"category": "Advanced hive-env"
},
{
- "id": "puppet var",
"name": "hive_pid_dir",
"displayName": "Hive PID Dir",
"description": "Directory in which the PID files for Hive processes will be created",
@@ -2730,7 +2479,6 @@ module.exports =
},
/**********************************************HIVE***************************************/
{
- "id": "puppet var",
"name": "webhcatserver_host",
"displayName": "WebHCat Server host",
"value": "",
@@ -2745,7 +2493,6 @@ module.exports =
"category": "WEBHCAT_SERVER"
},
{
- "id": "puppet var",
"name": "hcat_log_dir",
"displayName": "WebHCat Log Dir",
"description": "Directory for WebHCat log files",
@@ -2759,7 +2506,6 @@ module.exports =
"category": "Advanced webhcat-env"
},
{
- "id": "puppet var",
"name": "hcat_pid_dir",
"displayName": "WebHCat PID Dir",
"description": "Directory in which the PID files for WebHCat processes will be created",
@@ -2774,7 +2520,6 @@ module.exports =
},
/**********************************************OOZIE***************************************/
{
- "id": "puppet var",
"name": "oozieserver_host",
"displayName": "Oozie Server host",
"value": "",
@@ -2791,7 +2536,6 @@ module.exports =
},
// for existing Oracle
{
- "id": "puppet var",
"name": "oozie_existing_oracle_database",
"displayName": "Database Type",
"value": "",
@@ -2809,7 +2553,6 @@ module.exports =
},
// for existing PostgreSQL
{
- "id": "puppet var",
"name": "oozie_existing_postgresql_database",
"displayName": "Database Type",
"value": "",
@@ -2826,7 +2569,6 @@ module.exports =
},
// for new MySQL
{
- "id": "puppet var",
"name": "oozie_ambari_database",
"displayName": "Database Type",
"value": "",
@@ -2842,7 +2584,6 @@ module.exports =
},
// for current derby
{
- "id": "puppet var",
"name": "oozie_derby_database",
"displayName": "Database Type",
"value": "",
@@ -2859,7 +2600,6 @@ module.exports =
},
// for existing MySQL oozie
{
- "id": "puppet var",
"name": "oozie_existing_mysql_database",
"displayName": "Database Type",
"value": "",
@@ -2875,7 +2615,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "oozie_database",
"displayName": "Oozie Database",
"value": "",
@@ -2910,7 +2649,6 @@ module.exports =
"index": 2
},
{
- "id": "puppet var",
"name": "oozie_data_dir",
"displayName": "Oozie Data Dir",
"description": "Data directory in which the Oozie DB exists",
@@ -2925,7 +2663,6 @@ module.exports =
"index": 9
},
{
- "id": "puppet var",
"name": "oozie_hostname",
"savedValue": "",
"recommendedValue": "",
@@ -2941,7 +2678,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "oozie_existing_mysql_host",
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
@@ -2956,7 +2692,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "oozie_existing_postgresql_host",
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
@@ -2971,7 +2706,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "oozie_existing_oracle_host",
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
@@ -2986,7 +2720,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "oozie_ambari_host",
"value": "",
"recommendedValue": "",
@@ -3002,7 +2735,6 @@ module.exports =
"category": "OOZIE_SERVER"
},
{
- "id": "puppet var",
"name": "oozie_log_dir",
"displayName": "Oozie Log Dir",
"description": "Directory for oozie logs",
@@ -3016,7 +2748,6 @@ module.exports =
"category": "Advanced oozie-env"
},
{
- "id": "puppet var",
"name": "oozie_pid_dir",
"displayName": "Oozie PID Dir",
"description": "Directory in which the pid files for oozie processes will be created",
@@ -3030,7 +2761,6 @@ module.exports =
"category": "Advanced oozie-env"
},
{
- "id": "puppet var",
"name": "oozie_admin_port",
"displayName": "Oozie Server Admin Port",
"isReconfigurable": true,
@@ -3043,7 +2773,6 @@ module.exports =
},
/**********************************************ZOOKEEPER***************************************/
{
- "id": "puppet var",
"name": "zookeeperserver_hosts",
"displayName": "ZooKeeper Server hosts",
"value": "",
@@ -3060,7 +2789,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "zk_data_dir",
"displayName": "ZooKeeper directory",
"description": "Data directory for ZooKeeper",
@@ -3073,7 +2801,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "tickTime",
"displayName": "Length of single Tick",
"description": "The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper",
@@ -3088,7 +2815,6 @@ module.exports =
"index": 2
},
{
- "id": "puppet var",
"name": "initLimit",
"displayName": "Ticks to allow for sync at Init",
"description": "Amount of time, in ticks to allow followers to connect and sync to a leader",
@@ -3102,7 +2828,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "syncLimit",
"displayName": "Ticks to allow for sync at Runtime",
"description": "Amount of time, in ticks to allow followers to connect",
@@ -3116,7 +2841,6 @@ module.exports =
"index": 4
},
{
- "id": "puppet var",
"name": "clientPort",
"displayName": "Port for running ZK Server",
"description": "Port for running ZooKeeper server",
@@ -3130,7 +2854,6 @@ module.exports =
"index": 5
},
{
- "id": "puppet var",
"name": "zk_log_dir",
"displayName": "ZooKeeper Log Dir",
"description": "Directory for ZooKeeper log files",
@@ -3145,7 +2868,6 @@ module.exports =
"index": 0
},
{
- "id": "puppet var",
"name": "zk_pid_dir",
"displayName": "ZooKeeper PID Dir",
"description": "Directory in which the pid files for zookeeper processes will be created",
@@ -3161,7 +2883,6 @@ module.exports =
},
/**********************************************GANGLIA***************************************/
{
- "id": "puppet var",
"name": "ganglia_conf_dir",
"displayName": "Ganglia conf directory",
"description": "",
@@ -3176,7 +2897,6 @@ module.exports =
},
/**********************************************FALCON***************************************/
{
- "id": "puppet var",
"name": "falconserver_host",
"displayName": "Falcon Server",
"description": "The host that has been assigned to run Falcon Server",
@@ -3189,7 +2909,6 @@ module.exports =
"category": "FALCON_SERVER"
},
{
- "id": "puppet var",
"name": "falcon_port",
"displayName": "Falcon server port",
"description": "Port the Falcon Server listens on",
@@ -3203,7 +2922,6 @@ module.exports =
"category": "FALCON_SERVER"
},
{
- "id": "puppet var",
"name": "falcon_local_dir",
"displayName": "Falcon data directory",
"description": "Directory where Falcon data, such as activemq data, is stored",
@@ -3217,7 +2935,6 @@ module.exports =
"category": "FALCON_SERVER"
},
{
- "id": "puppet var",
"name": "falcon_store_uri",
"displayName": "Falcon store URI",
"description": "Directory where entity definitions are stored",
@@ -3231,7 +2948,6 @@ module.exports =
"category": "FALCON_SERVER"
},
{
- "id": "puppet var",
"name": "falcon_log_dir",
"displayName": "Falcon Log Dir",
"description": "Directory for Falcon logs",
@@ -3246,7 +2962,6 @@ module.exports =
"category": "Advanced falcon-env"
},
{
- "id": "puppet var",
"name": "falcon_pid_dir",
"displayName": "Falcon PID Dir",
"description": "Directory in which the pid files for Falcon processes will be created",
@@ -3261,7 +2976,6 @@ module.exports =
"category": "Advanced falcon-env"
},
{
- "id": "puppet var",
"name": "falcon.embeddedmq",
"displayName": "falcon.embeddedmq",
"description": "Whether embeddedmq is enabled or not.",
@@ -3276,7 +2990,6 @@ module.exports =
"category": "Advanced falcon-env"
},
{
- "id": "puppet var",
"name": "falcon.embeddedmq.data",
"displayName": "falcon.embeddedmq.data",
"description": "Directory in which embeddedmq data is stored.",
@@ -3291,7 +3004,6 @@ module.exports =
"category": "Advanced falcon-env"
},
{
- "id": "puppet var",
"name": "falcon.emeddedmq.port",
"displayName": "falcon.emeddedmq.port",
"description": "Port that embeddedmq will listen on.",
@@ -3307,7 +3019,6 @@ module.exports =
},
/**********************************************STORM***************************************/
{
- "id": "puppet var",
"name": "storm_log_dir",
"displayName": "storm_log_dir",
"description": "Storm log directory",
@@ -3321,7 +3032,6 @@ module.exports =
"category": "Advanced storm-env"
},
{
- "id": "puppet var",
"name": "storm_pid_dir",
"displayName": "storm_pid_dir",
"description": "Storm PID directory",
@@ -3335,7 +3045,6 @@ module.exports =
"category": "Advanced storm-env"
},
{
- "id": "puppet var",
"name": "stormuiserver_host",
"displayName": "Storm UI Server host",
"description": "The host that has been assigned to run Storm UI Server",
@@ -3349,7 +3058,6 @@ module.exports =
"category": "STORM_UI_SERVER"
},
{
- "id": "puppet var",
"name": "drpcserver_host",
"displayName": "DRPC Server host",
"description": "The host that has been assigned to run DRPC Server",
@@ -3363,7 +3071,6 @@ module.exports =
"category": "DRPC_SERVER"
},
{
- "id": "puppet var",
"name": "supervisor_hosts",
"displayName": "Supervisor hosts",
"description": "The host that has been assigned to run Supervisor",
@@ -3378,7 +3085,6 @@ module.exports =
"category": "SUPERVISOR"
},
{
- "id": "puppet var",
"name": "storm_rest_api_host",
"displayName": "Storm REST API host",
"description": "The host that has been assigned to run Storm REST API Server",
@@ -3394,7 +3100,6 @@ module.exports =
},
/**********************************************MISC***************************************/
{
- "id": "puppet var",
"name": "hbase_conf_dir",
"displayName": "HBase conf dir",
"description": "",
@@ -3409,7 +3114,6 @@ module.exports =
"belongsToService": []
},
{
- "id": "puppet var",
"name": "proxyuser_group",
"displayName": "Proxy group for Hive, WebHCat, Oozie and Falcon",
"description": "",
@@ -3425,7 +3129,6 @@ module.exports =
"index": 18
},
{
- "id": "puppet var",
"name": "ganglia_runtime_dir",
"displayName": "Ganglia runtime directory",
"description": "",
@@ -3439,7 +3142,6 @@ module.exports =
"belongsToService": []
},
{
- "id": "puppet var",
"name": "hdfs_user",
"displayName": "HDFS User",
"description": "User to run HDFS as",
@@ -3455,7 +3157,6 @@ module.exports =
"index": 1
},
{
- "id": "puppet var",
"name": "mapred_user",
"displayName": "MapReduce User",
"description": "User to run MapReduce as",
@@ -3471,7 +3172,6 @@ module.exports =
"index": 2
},
{
- "id": "puppet var",
"name": "yarn_user",
"displayName": "YARN User",
"description": "User to run YARN as",
@@ -3487,7 +3187,6 @@ module.exports =
"index": 3
},
{
- "id": "puppet var",
"name": "hbase_user",
"displayName": "HBase User",
"description": "User to run HBase as",
@@ -3503,7 +3202,6 @@ module.exports =
"index": 4
},
{
- "id": "puppet var",
"name": "hive_user",
"displayName": "Hive User",
"description": "User to run Hive as",
@@ -3519,7 +3217,6 @@ module.exports =
"index": 5
},
{
- "id": "puppet var",
"name": "hcat_user",
"displayName": "HCat User",
"description": "User to run HCatalog as",
@@ -3535,7 +3232,6 @@ module.exports =
"index": 6
},
{
- "id": "puppet var",
"name": "webhcat_user",
"displayName": "WebHCat User",
"description": "User to run WebHCat as",
@@ -3551,7 +3247,6 @@ module.exports =
"index": 7
},
{
- "id": "puppet var",
"name": "oozie_user",
"displayName": "Oozie User",
"description": "User to run Oozie as",
@@ -3567,7 +3262,6 @@ module.exports =
"index": 8
},
{
- "id": "puppet var",
"name": "falcon_user",
"displayName": "Falcon User",
"description": "User to run Falcon as",
@@ -3583,7 +3277,6 @@ module.exports =
"index": 10
},
{
- "id": "puppet var",
"name": "storm_user",
"displayName": "Storm User",
"description": "User to run Storm as",
@@ -3599,7 +3292,6 @@ module.exports =
"index": 9
},
{
- "id": "puppet var",
"name": "zk_user",
"displayName": "ZooKeeper User",
"description": "User to run ZooKeeper as",
@@ -3615,7 +3307,6 @@ module.exports =
"index": 11
},
{
- "id": "puppet var",
"name": "flume_user",
"displayName": "Flume User",
"description": "User to run Flume as",
@@ -3631,7 +3322,6 @@ module.exports =
"index": 12
},
{
- "id": "puppet var",
"name": "gmetad_user",
"displayName": "Ganglia User",
"description": "The user used to run Ganglia",
@@ -3647,7 +3337,6 @@ module.exports =
"index": 13
},
{
- "id": "puppet var",
"name": "gmond_user",
"displayName": "Gmond User",
"description": "The user used to run gmond for Ganglia",
@@ -3662,7 +3351,6 @@ module.exports =
"belongsToService": []
},
{
- "id": "puppet var",
"name": "tez_user",
"displayName": "Tez User",
"description": "User to run Tez as",
@@ -3678,7 +3366,6 @@ module.exports =
"index": 15
},
{
- "id": "puppet var",
"name": "sqoop_user",
"displayName": "Sqoop User",
"isReconfigurable": false,
@@ -3692,7 +3379,6 @@ module.exports =
"index": 17
},
{
- "id": "puppet var",
"name": "rrdcached_base_dir",
"displayName": "Ganglia rrdcached base directory",
"description": "Default directory for saving the rrd files on ganglia server",
@@ -3707,7 +3393,6 @@ module.exports =
"belongsToService": ["GANGLIA"]
},
{
- "id": "puppet var",
"name": "ignore_groupsusers_create",
"displayName": "Skip group modifications during install",
"displayType": "checkbox",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index 63060ea..91748f4 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -59,12 +59,6 @@ hdp22properties.push(
"category": "Advanced yarn-site"
},
{
- "name": "hadoop.registry.zk.quorum",
- "serviceName": "YARN",
- "filename": "yarn-site.xml",
- "category": "Advanced yarn-site"
- },
- {
"name": "yarn.timeline-service.leveldb-state-store.path",
"category": "APP_TIMELINE_SERVER",
"displayType": "directory",
@@ -113,18 +107,6 @@ hdp22properties.push(
"serviceName": "HDFS",
"index": 1
},
- {
- "name": "policy_user",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS"
- },
- {
- "name": "REPOSITORY_CONFIG_USERNAME",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS"
- },
/*********RANGER FOR HIVE************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
@@ -227,18 +209,6 @@ hdp22properties.push(
"serviceName": "STORM",
"index": 1
},
- {
- "name": "policy_user",
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM"
- },
- {
- "name": "REPOSITORY_CONFIG_USERNAME",
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM"
- },
/*********RANGER FOR KNOX************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
@@ -263,31 +233,6 @@ hdp22properties.push(
"serviceName": "KNOX",
"index": 1
},
- {
- "name": "policy_user",
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX"
- },
- {
- "name": "REPOSITORY_CONFIG_USERNAME",
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX"
- },
- /**********************************************SPARK***************************************/
- {
- "name": "spark.driver.extraJavaOptions",
- "category": "Advanced spark-defaults",
- "serviceName": "SPARK",
- "filename": "spark-defaults.xml"
- },
- {
- "name": "spark.yarn.am.extraJavaOptions",
- "category": "Advanced spark-defaults",
- "serviceName": "SPARK",
- "filename": "spark-defaults.xml"
- },
/**********************************************RANGER***************************************/
{
"name": "ranger_admin_password",
@@ -488,86 +433,6 @@ hdp22properties.push(
"serviceName": "RANGER",
"filename": "admin-properties.xml",
"category": "ADSettings"
- },
- {
- "name": "common.name.for.certificate",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS",
- "filename": "ranger-hdfs-plugin-properties.xml"
- },
- {
- "name": "hadoop.rpc.protection",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS",
- "filename": "ranger-hdfs-plugin-properties.xml"
- },
- {
- "name": "common.name.for.certificate",
- "serviceName": "HIVE",
- "filename": "ranger-hive-plugin-properties.xml"
- },
- {
- "name": "common.name.for.certificate",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE",
- "filename": "ranger-hbase-plugin-properties.xml"
- },
- {
- "name": "common.name.for.certificate",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX",
- "filename": "ranger-knox-plugin-properties.xml"
- },
- {
- "name": "common.name.for.certificate",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM",
- "filename": "ranger-storm-plugin-properties.xml"
- },
- {
- "name": "SYNC_LDAP_USER_SEARCH_FILTER",
- "category": "Advanced usersync-properties",
- "serviceName": "RANGER",
- "filename": "usersync-properties.xml"
- },
- {
- "name": "hbase.bucketcache.ioengine",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
- },
- {
- "name": "hbase.bucketcache.size",
- "displayType": "int",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
- },
- {
- "name": "hbase.bucketcache.percentage.in.combinedcache",
- "displayType": "float",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
- },
- {
- "name": "hbase_max_direct_memory_size",
- "displayType": "int",
- "serviceName": "HBASE",
- "filename": "hbase-env.xml",
- "category": "Advanced hbase-env"
- },
- {
- "name": "hbase.region.server.rpc.scheduler.factory.class",
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.rpc.controllerfactory.class",
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
}
);
[4/4] ambari git commit: AMBARI-13142 UI configs clean up.
(ababiichuk)
Posted by ab...@apache.org.
AMBARI-13142 UI configs clean up. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8867b368
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8867b368
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8867b368
Branch: refs/heads/trunk
Commit: 8867b3685820b2f293b749de919766137f230f23
Parents: 1ad65df
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Sep 18 14:24:46 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Sep 18 14:24:46 2015 +0300
----------------------------------------------------------------------
.../main/admin/serviceAccounts_controller.js | 19 -
.../controllers/main/service/info/configs.js | 63 +---
.../app/controllers/wizard/step7_controller.js | 51 +--
.../app/controllers/wizard/step8_controller.js | 214 +----------
ambari-web/app/data/BIGTOP/site_properties.js | 315 -----------------
ambari-web/app/data/HDP2.2/site_properties.js | 135 -------
ambari-web/app/data/HDP2/config_mapping.js | 158 ---------
ambari-web/app/data/HDP2/ha_properties.js | 19 -
ambari-web/app/data/HDP2/rm_ha_properties.js | 13 -
ambari-web/app/data/HDP2/site_properties.js | 201 -----------
.../mixins/common/configs/configs_comparator.js | 3 +-
.../app/mixins/common/configs/configs_saver.js | 105 ------
.../configs/objects/service_config_property.js | 1 -
ambari-web/app/utils/config.js | 351 +------------------
.../app/utils/configs/config_property_helper.js | 9 +-
.../configs/service_configs_by_category_view.js | 15 +-
.../admin/serviceAccounts_controller_test.js | 9 -
.../main/service/info/config_test.js | 214 -----------
.../test/controllers/wizard/step7_test.js | 43 ---
.../test/controllers/wizard/step8_test.js | 342 ------------------
.../test/mock_data_setup/configs_mock_data.js | 8 -
.../objects/service_config_property_test.js | 1 -
ambari-web/test/utils/config_test.js | 211 -----------
.../configs/config_property_helper_test.js | 20 +-
.../service_configs_by_category_view_test.js | 4 +-
25 files changed, 46 insertions(+), 2478 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
index 645d7f4..8f7f48c 100644
--- a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
+++ b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
@@ -158,24 +158,5 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
} else {
return arrayToSort;
}
- },
- /**
- * set displayName of "proxyuser_group" depending on stack version
- * @param misc_configs
- */
- setProxyUserGroupLabel: function (misc_configs) {
- var proxyUserGroup = misc_configs.findProperty('name', 'proxyuser_group');
- //stack, with version lower than 2.1, doesn't have Falcon service
- if (proxyUserGroup) {
- var proxyServices = ['HIVE', 'OOZIE', 'FALCON'];
- var services = Em.A([]);
- proxyServices.forEach(function (serviceName) {
- var stackService = App.StackService.find(serviceName);
- if (stackService) {
- services.push(stackService.get('displayName'));
- }
- }, this);
- proxyUserGroup.set('displayName', "Proxy group for " + stringUtils.getFormattedStringFromArray(services));
- }
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 6e31216..a560767 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -449,7 +449,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
for (var prop in config.properties) {
var fileName = App.config.getOriginalFileName(config.type);
var serviceConfig = allConfigs.filterProperty('name', prop).findProperty('filename', fileName);
- var value = App.config.formatOverrideValue(serviceConfig, config.properties[prop]);
+ var value = App.config.formatPropertyValue(serviceConfig, config.properties[prop]);
var isFinal = !!(config.properties_attributes && config.properties_attributes.final && config.properties_attributes.final[prop]);
if (serviceConfig) {
@@ -474,66 +474,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
},
/**
- * @param serviceConfig
- * @private
- * @method checkDatabaseProperties
- */
- checkDatabaseProperties: function (serviceConfig) {
- this.hideHiveDatabaseProperties(serviceConfig.configs);
- this.hideOozieDatabaseProperties(serviceConfig.configs);
- },
-
- /**
- * @param configs
- * @private
- * @method hideHiveDatabaseProperties
- */
- hideHiveDatabaseProperties: function (configs) {
- if (!['HIVE'].contains(this.get('content.serviceName'))) return;
- var property = configs.findProperty('name', 'hive_hostname');
- if (property) property.set('isVisible', false);
-
- if (configs.someProperty('name', 'hive_database')) {
- var hiveDb = configs.findProperty('name', 'hive_database');
- if (hiveDb.value === 'Existing MSSQL Server database with integrated authentication') {
- configs.findProperty('name', 'javax.jdo.option.ConnectionUserName').setProperties({
- isVisible: false,
- isRequired: false
- });
- configs.findProperty('name', 'javax.jdo.option.ConnectionPassword').setProperties({
- isVisible: false,
- isRequired: false
- });
- }
- }
- },
-
- /**
- * @param configs
- * @private
- * @method hideOozieDatabaseProperties
- */
- hideOozieDatabaseProperties: function (configs) {
- if (!['OOZIE'].contains(this.get('content.serviceName'))) return;
- var property = configs.findProperty('name', 'oozie_hostname');
- if (property) property.set('isVisible', false);
-
- if (configs.someProperty('name', 'oozie_database')) {
- var oozieDb = configs.findProperty('name', 'oozie_database');
- if (oozieDb.value === 'Existing MSSQL Server database with integrated authentication') {
- configs.findProperty('name', 'oozie.service.JPAService.jdbc.username').setProperties({
- isVisible: false,
- isRequired: false
- });
- configs.findProperty('name', 'oozie.service.JPAService.jdbc.password').setProperties({
- isVisible: false,
- isRequired: false
- });
- }
- }
- },
-
- /**
* @param allConfigs
* @private
* @method onLoadOverrides
@@ -569,7 +509,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
}
this.set('selectedService', selectedService);
this.checkOverrideProperty(selectedService);
- //this.checkDatabaseProperties(selectedService);
if (!App.Service.find().someProperty('serviceName', 'RANGER')) {
App.config.removeRangerConfigs(this.get('stepConfigs'));
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 90bef77..47f272e 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -676,31 +676,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
}
this.set('hash', this.getHash());
},
- /**
- * After user navigates back to step7, values for depended configs should be set to values set by user and not to default values
- * @method restoreRecommendedConfigs
- */
- restoreRecommendedConfigs: function () {
- var recommendationsConfigs = this.get('recommendationsConfigs') || {};
- var serviceConfigProperties = this.get('content.serviceConfigProperties') || [];
- var stepConfigs = this.get('stepConfigs');
- Em.keys(recommendationsConfigs).forEach(function (file) {
- (Em.keys(recommendationsConfigs[file].properties).concat(Em.keys(recommendationsConfigs[file].property_attributes || {}))).forEach(function (configName) {
- stepConfigs.forEach(function (stepConfig) {
- stepConfig.get('configs').filterProperty('name', configName).forEach(function (configProperty) {
- if (Em.get(configProperty, 'filename').contains(file)) {
- var scps = serviceConfigProperties.filterProperty('name', configName).filter(function (cp) {
- return Em.get(cp, 'filename').contains(file);
- });
- if (scps.length) {
- Em.set(configProperty, 'value', Em.get(scps[0], 'value'));
- }
- }
- });
- });
- });
- });
- },
/**
* Mark descriptor properties in configuration object.
@@ -913,25 +888,16 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
}
});
//add user properties
-
Em.keys(configsMap).forEach(function (filename) {
Em.keys(configsMap[filename]).forEach(function (propertyName) {
- configs.push(configMixin.addUserProperty({
- id: 'site property',
- name: propertyName,
- serviceName: configMixin.getServiceNameByConfigType(filename),
- value: configsMap[filename][propertyName],
- savedValue: configsMap[filename][propertyName],
- filename: configMixin.get('filenameExceptions').contains(filename) ? filename : filename + '.xml',
- category: 'Advanced',
- hasInitialValue: true,
- isUserProperty: true,
- isOverridable: true,
- overrides: [],
- isRequired: true,
- isVisible: true,
- showLabel: true
- }, false, []));
+ configs.push(configMixin.createDefaultConfig(propertyName,
+ configMixin.getServiceByConfigType(filename).get('serviceName'),
+ configMixin.getOriginalFileName(filename),
+ false, {
+ value: configsMap[filename][propertyName],
+ savedValue: configsMap[filename][propertyName],
+ hasInitialValue: true
+ }));
});
});
},
@@ -1044,7 +1010,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
this._setEditableValue(config);
this._setOverrides(config, overrides);
}, this);
- //this.getRecommendationsForDependencies(null, true, Em.K);
}.observes('selectedConfigGroup'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/8867b368/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index deb436e..be0404c 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -80,18 +80,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
return !!App.get('router.mainAdminKerberosController.kdc_type')
}.property('App.router.mainAdminKerberosController.kdc_type'),
- /**
- * All configs
- * @type {Array}
- */
- configMapping: function () {
- return App.config.get('configMapping').all(true);
- }.property('App.config.configMapping'),
-
- /**
- *
- */
- slaveComponentConfig: null,
/**
* Should Submit button be disabled
@@ -231,114 +219,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
},
/**
- * Remove unused Hive configs
- * @param {Ember.Enumerable} configs
- * @returns {Ember.Enumerable}
- * @method removeHiveConfigs
- */
- removeHiveConfigs: function (configs) {
- var hiveDb = configs.findProperty('name', 'hive_database');
- var hiveDbType = configs.findProperty('name', 'hive_database_type');
- if (hiveDbType) {
- var hive_properties = Em.A([]);
-
- switch (hiveDb.value) {
- case 'New MySQL Database':
- if (configs.someProperty('name', 'hive_ambari_host')) {
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_ambari_host').value;
- }
- hive_properties = Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
- break;
- case 'New PostgreSQL Database':
- if (configs.someProperty('name', 'hive_ambari_host')) {
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_ambari_host').value;
- }
- hive_properties = Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database']);
- break;
- case 'Existing MySQL Database':
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_mysql_host').value;
- hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
- break;
- case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_postgresql_host').value;
- hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_mysql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
- break;
- case 'Existing MSSQL Server database with SQL authentication':
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_mssql_server_host').value;
- hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
- 'hive_existing_mysql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_database']);
- break;
- case 'Existing MSSQL Server database with integrated authentication':
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_mssql_server_2_host').value;
- hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
- 'hive_existing_mysql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
- break;
- default:
- configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_oracle_host').value;
- hive_properties = Em.A(['hive_ambari_database', 'hive_existing_mysql_database', 'hive_existing_postgresql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
- break;
- }
-
- hive_properties.push('hive_master_hosts');
- configs = dataManipulationUtils.rejectPropertyValues(configs, 'name', hive_properties);
- }
- return configs;
- },
-
- /**
- * Remove unused Oozie configs
- * @param {Ember.Enumerable} configs
- * @returns {Ember.Enumerable}
- * @method removeOozieConfigs
- */
- removeOozieConfigs: function (configs) {
- var oozieDb = configs.findProperty('name', 'oozie_database');
- if (oozieDb) {
- var oozie_properties = Em.A(['oozie_ambari_database']);
-
- switch (oozieDb.value) {
- case 'New Derby Database':
- configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_ambari_host').value;
- oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_existing_oracle_database',
- 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
- break;
- case 'Existing MySQL Database':
- configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_mysql_host').value;
- oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_derby_database',
- 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
- break;
- case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
- configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_postgresql_host').value;
- oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_existing_mysql_database',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
- break;
- case 'Existing MSSQL Server database with SQL authentication':
- configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_mssql_server_host').value;
- oozie_properties = Em.A(['oozie_existing_oracle_database', 'oozie_existing_postgresql_database',
- 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
- break;
- case 'Existing MSSQL Server database with integrated authentication':
- configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_mssql_server_2_host').value;
- oozie_properties = Em.A(['oozie_existing_oracle_database', 'oozie_existing_postgresql_database',
- 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_database']);
- break;
- default:
- configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_oracle_host').value;
- oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_derby_database',
- 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
- break;
- }
-
- configs = dataManipulationUtils.rejectPropertyValues(configs, 'name', oozie_properties);
- }
- return configs;
- },
-
- /**
* Load all site properties
* @method loadConfigs
*/
@@ -362,37 +242,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
},
/**
- * Load UI configs
- * @param {Array} configMapping
- * @return {Array}
- * @method loadUiSideConfigs
- */
- loadUiSideConfigs: function (configMapping) {
- var uiConfig = [];
- var dependentConfig = $.extend(true, [], configMapping.filterProperty('foreignKey'));
- dependentConfig.forEach(function (_config) {
- App.config.setConfigValue(uiConfig, this.get('content.serviceConfigProperties'), _config);
- // generated config name using template for example `hadoop.proxyuser.hive.hosts`
- var configName = _config._name || _config.name;
- // property from <code>content.serviceConfigProperties</code>. This property can be added in custom-site.xml
- // with the same name as propety from defined config mapping. In this case property from config mapping
- // object should be ignored.
- var isPropertyDefined = this.get('content.serviceConfigProperties')
- .filterProperty('filename', _config.filename).someProperty('name', configName);
- // ignore config mapping property if no matches for template was found or property already added by user
- if(!_config.noMatchSoSkipThisConfig && !isPropertyDefined) {
- uiConfig.pushObject({
- "id": "site property",
- "name": configName,
- "value": _config.value,
- "filename": _config.filename
- });
- }
- }, this);
- return uiConfig;
- },
-
- /**
* Format <code>content.hosts</code> from Object to Array
* @returns {Array}
* @method getRegisteredHosts
@@ -1020,10 +869,10 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
if (App.get('isKerberosEnabled') && !this.get('isManualKerberos')) {
this.updateKerberosDescriptor();
}
- }
- var fileNamesToUpdate = this.get('wizardController').getDBProperty('fileNamesToUpdate');
- if (fileNamesToUpdate && fileNamesToUpdate.length) {
- this.updateConfigurations(fileNamesToUpdate);
+ var fileNamesToUpdate = this.get('wizardController').getDBProperty('fileNamesToUpdate');
+ if (fileNamesToUpdate && fileNamesToUpdate.length) {
+ this.updateConfigurations(fileNamesToUpdate);
+ }
}
this.createConfigurations();
this.applyConfigurationsToCluster(this.get('serviceConfigTags'));
@@ -1692,61 +1541,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
},
/**
- * proxyuser configs which depend on service
- * @type {{serviceName: string, user: string}[]}
- */
- optionalCoreSiteConfigs: [
- {
- serviceName: 'OOZIE',
- user: 'oozie_user'
- },
- {
- serviceName: 'HIVE',
- user: 'hive_user'
- },
- {
- serviceName: 'HIVE',
- user: 'hcat_user'
- },
- {
- serviceName: 'FALCON',
- user: 'falcon_user'
- }
- ],
-
- /**
- * push proxyuser properties to core-site if they required by dependencies
- * @param coreSiteObj
- * @param installedAndSelectedServices
- * @return {Object}
- */
- resolveProxyuserDependecies: function (coreSiteObj, installedAndSelectedServices) {
- var coreSiteProperties = {};
- var optionalCoreSiteConfigs = this.get('optionalCoreSiteConfigs');
- var proxyuserGroup = this.get('configs').findProperty('name', 'proxyuser_group');
-
- coreSiteObj.forEach(function (_coreSiteObj) {
- //proxyuser_group property should be added only if proxyuser properties are used
- if (proxyuserGroup && _coreSiteObj.name === proxyuserGroup.name) return;
-
- // exclude some configs if service wasn't selected
- var addProperty = optionalCoreSiteConfigs.every(function (config) {
- var userValue = this.get('configs').someProperty('name', config.user) ? this.get('configs').findProperty('name', config.user).value : null;
- return (installedAndSelectedServices.someProperty('serviceName', config.serviceName) ||
- (_coreSiteObj.name != 'hadoop.proxyuser.' + userValue + '.hosts' && _coreSiteObj.name != 'hadoop.proxyuser.' + userValue + '.groups'))
- }, this);
- if (addProperty) {
- coreSiteProperties[_coreSiteObj.name] = _coreSiteObj.value;
- }
- }, this);
-
- if (!App.isEmptyObject(coreSiteProperties) && proxyuserGroup) {
- coreSiteProperties[proxyuserGroup.name] = proxyuserGroup.value;
- }
- return coreSiteProperties;
- },
-
- /**
* Create Core Site object
* @returns {{type: string, tag: string, properties: {}}}
* @method createCoreSiteObj