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 2014/02/27 18:49:07 UTC
git commit: AMBARI-4762 Modify Config pages to store/retrieve custom
log4j configs as raw text update. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 572d369d8 -> b911c05e1
AMBARI-4762 Modify Config pages to store/retrieve custom log4j configs as raw text update. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b911c05e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b911c05e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b911c05e
Branch: refs/heads/trunk
Commit: b911c05e1b532982118fcf32896aad36313dc50e
Parents: 572d369
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Feb 27 19:45:35 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Feb 27 19:46:28 2014 +0200
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 3 -
ambari-web/app/data/HDP2/site_properties.js | 809 +++++++++----------
ambari-web/app/data/service_configs.js | 20 +-
ambari-web/app/data/site_properties.js | 24 +-
ambari-web/app/models/service_config.js | 4 +
.../templates/common/configs/service_config.hbs | 30 +-
ambari-web/app/utils/config.js | 77 +-
.../app/views/common/configs/services_config.js | 4 +-
ambari-web/app/views/wizard/controls_view.js | 12 +
9 files changed, 472 insertions(+), 511 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/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 3ff6309..d360cf9 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -357,9 +357,6 @@ App.WizardStep7Controller = Em.Controller.extend({
if (this.get('allSelectedServiceNames').contains('YARN') && !App.supports.capacitySchedulerUi) {
configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml');
}
- this.get('allSelectedServiceNames').forEach(function(serviceName) {
- App.config.addLog4jConfig(configs, serviceName);
- });
this.set('groupsToDelete', this.get('wizardController').getDBProperty('groupsToDelete') || []);
var localDB = {
hosts: this.get('wizardController').getDBProperty('hosts'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/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 39ffb13..909f8ad 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -696,38 +696,38 @@ module.exports =
"category": "General"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"General",
- "displayName":"storm.messaging.netty.buffer_size",
- "name":"storm.messaging.netty.buffer_size",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "General",
+ "displayName": "storm.messaging.netty.buffer_size",
+ "name": "storm.messaging.netty.buffer_size",
+ "displayType": "int",
"unit": "bytes"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"General",
- "displayName":"storm.messaging.netty.max_retries",
- "name":"storm.messaging.netty.max_retries",
- "displayType":"int"
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "General",
+ "displayName": "storm.messaging.netty.max_retries",
+ "name": "storm.messaging.netty.max_retries",
+ "displayType": "int"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"General",
- "displayName":"storm.messaging.netty.max_wait_ms",
- "name":"storm.messaging.netty.max_wait_ms",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "General",
+ "displayName": "storm.messaging.netty.max_wait_ms",
+ "name": "storm.messaging.netty.max_wait_ms",
+ "displayType": "int",
"unit": "ms"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"General",
- "displayName":"storm.messaging.netty.min_wait_ms",
- "name":"storm.messaging.netty.min_wait_ms",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "General",
+ "displayName": "storm.messaging.netty.min_wait_ms",
+ "name": "storm.messaging.netty.min_wait_ms",
+ "displayType": "int",
"unit": "ms"
},
{
@@ -875,61 +875,61 @@ module.exports =
"category": "Supervisor"
},
{
- "id":"site property",
- "description":"This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.",
- "isVisible":false,
+ "id": "site property",
+ "description": "This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.",
+ "isVisible": false,
"isOverrideable": false,
- "serviceName":"STORM",
- "category":"Supervisor",
- "displayName":"supervisor.childopts",
- "name":"supervisor.childopts",
- "defaultValue":"-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
- "displayType":"string",
+ "serviceName": "STORM",
+ "category": "Supervisor",
+ "displayName": "supervisor.childopts",
+ "name": "supervisor.childopts",
+ "defaultValue": "-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
+ "displayType": "string",
"filename": "storm-site.xml"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"Supervisor",
- "displayName":"supervisor.worker.start.timeout.secs",
- "name":"supervisor.worker.start.timeout.secs",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "Supervisor",
+ "displayName": "supervisor.worker.start.timeout.secs",
+ "name": "supervisor.worker.start.timeout.secs",
+ "displayType": "int",
"unit": "seconds"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"Supervisor",
- "displayName":"supervisor.worker.timeout.secs",
- "name":"supervisor.worker.timeout.secs",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "Supervisor",
+ "displayName": "supervisor.worker.timeout.secs",
+ "name": "supervisor.worker.timeout.secs",
+ "displayType": "int",
"unit": "seconds"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"Supervisor",
- "displayName":"supervisor.monitor.frequency.secs",
- "name":"supervisor.monitor.frequency.secs",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "Supervisor",
+ "displayName": "supervisor.monitor.frequency.secs",
+ "name": "supervisor.monitor.frequency.secs",
+ "displayType": "int",
"unit": "seconds"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"Supervisor",
- "displayName":"supervisor.heartbeat.frequency.secs",
- "name":"supervisor.heartbeat.frequency.secs",
- "displayType":"int",
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "Supervisor",
+ "displayName": "supervisor.heartbeat.frequency.secs",
+ "name": "supervisor.heartbeat.frequency.secs",
+ "displayType": "int",
"unit": "seconds"
},
{
- "id":"site property",
- "serviceName":"STORM",
- "category":"Supervisor",
- "displayName":"supervisor.enable",
- "name":"supervisor.enable",
- "displayType":"checkbox"
+ "id": "site property",
+ "serviceName": "STORM",
+ "category": "Supervisor",
+ "displayName": "supervisor.enable",
+ "name": "supervisor.enable",
+ "displayType": "checkbox"
},
{
"id": "site property",
@@ -1036,363 +1036,363 @@ module.exports =
},
/*********************************************oozie-site for Falcon*****************************/
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
- "name":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
- "displayType":"custom",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-instances",
+ "name": "oozie.service.ELService.ext.functions.coord-job-submit-instances",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-action-create-inst",
- "name":"oozie.service.ELService.ext.functions.coord-action-create-inst",
- "displayType":"custom",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-action-create-inst",
+ "name": "oozie.service.ELService.ext.functions.coord-action-create-inst",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-action-create",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-action-create",
"name": "oozie.service.ELService.ext.functions.coord-action-create",
- "displayType":"custom",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-job-submit-data",
- "name":"oozie.service.ELService.ext.functions.coord-job-submit-data",
- "displayType":"custom",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-data",
+ "name": "oozie.service.ELService.ext.functions.coord-job-submit-data",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-action-start",
- "name":"oozie.service.ELService.ext.functions.coord-action-start",
- "displayType":"custom",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-action-start",
+ "name": "oozie.service.ELService.ext.functions.coord-action-start",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-sla-submit",
- "name":"oozie.service.ELService.ext.functions.coord-sla-submit",
- "displayType":"custom",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-sla-submit",
+ "name": "oozie.service.ELService.ext.functions.coord-sla-submit",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
{
- "id":"site property",
- "isReconfigurable":false,
- "serviceName":"FALCON",
- "category":"Falcon - Oozie integration",
- "displayName":"oozie.service.ELService.ext.functions.coord-sla-create",
- "name":"oozie.service.ELService.ext.functions.coord-sla-create",
- "displayType":"custom",
+ "id": "site property",
+ "isReconfigurable": false,
+ "serviceName": "FALCON",
+ "category": "Falcon - Oozie integration",
+ "displayName": "oozie.service.ELService.ext.functions.coord-sla-create",
+ "name": "oozie.service.ELService.ext.functions.coord-sla-create",
+ "displayType": "custom",
"filename": "oozie-site.xml"
},
// Runtime properties
{
- "id":"site property",
- "name":"*.domain",
- "displayName":"*.domain",
- "category":"FalconRuntimeSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.domain",
+ "displayName": "*.domain",
+ "category": "FalconRuntimeSite",
+ "serviceName": "FALCON",
"filename": "falcon-runtime.properties.xml"
},
{
- "id":"site property",
- "name":"*.log.cleanup.frequency.minutes.retention",
- "displayName":"*.log.cleanup.frequency.minutes.retention",
- "category":"FalconRuntimeSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.log.cleanup.frequency.minutes.retention",
+ "displayName": "*.log.cleanup.frequency.minutes.retention",
+ "category": "FalconRuntimeSite",
+ "serviceName": "FALCON",
"filename": "falcon-runtime.properties.xml"
},
{
- "id":"site property",
- "name":"*.log.cleanup.frequency.hours.retention",
- "displayName":"*.log.cleanup.frequency.hours.retention",
- "category":"FalconRuntimeSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.log.cleanup.frequency.hours.retention",
+ "displayName": "*.log.cleanup.frequency.hours.retention",
+ "category": "FalconRuntimeSite",
+ "serviceName": "FALCON",
"filename": "falcon-runtime.properties.xml"
},
{
- "id":"site property",
- "name":"*.log.cleanup.frequency.days.retention",
- "displayName":"*.log.cleanup.frequency.days.retention",
- "category":"FalconRuntimeSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.log.cleanup.frequency.days.retention",
+ "displayName": "*.log.cleanup.frequency.days.retention",
+ "category": "FalconRuntimeSite",
+ "serviceName": "FALCON",
"filename": "falcon-runtime.properties.xml"
},
{
- "id":"site property",
- "name":"*.log.cleanup.frequency.months.retention",
- "displayName":"*.log.cleanup.frequency.months.retention",
- "category":"FalconRuntimeSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.log.cleanup.frequency.months.retention",
+ "displayName": "*.log.cleanup.frequency.months.retention",
+ "category": "FalconRuntimeSite",
+ "serviceName": "FALCON",
"filename": "falcon-runtime.properties.xml"
},
// Startup properties
{
- "id":"site property",
- "name":"*.domain",
- "displayName":"*.domain",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.domain",
+ "displayName": "*.domain",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.workflow.engine.impl",
- "displayName":"*.workflow.engine.impl",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.workflow.engine.impl",
+ "displayName": "*.workflow.engine.impl",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.oozie.process.workflow.builder",
- "displayName":"*.oozie.process.workflow.builder",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.oozie.process.workflow.builder",
+ "displayName": "*.oozie.process.workflow.builder",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.oozie.feed.workflow.builder",
- "displayName":"*.oozie.feed.workflow.builder",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.oozie.feed.workflow.builder",
+ "displayName": "*.oozie.feed.workflow.builder",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.SchedulableEntityManager.impl",
- "displayName":"*.SchedulableEntityManager.impl",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.SchedulableEntityManager.impl",
+ "displayName": "*.SchedulableEntityManager.impl",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.ConfigSyncService.impl",
- "displayName":"*.ConfigSyncService.impl",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.ConfigSyncService.impl",
+ "displayName": "*.ConfigSyncService.impl",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.ProcessInstanceManager.impl",
- "displayName":"*.ProcessInstanceManager.impl",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.ProcessInstanceManager.impl",
+ "displayName": "*.ProcessInstanceManager.impl",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.catalog.service.impl",
- "displayName":"*.catalog.service.impl",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.catalog.service.impl",
+ "displayName": "*.catalog.service.impl",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.application.services",
- "displayName":"*.application.services",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.application.services",
+ "displayName": "*.application.services",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"prism.application.services",
- "displayName":"prism.application.services",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "prism.application.services",
+ "displayName": "prism.application.services",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.configstore.listeners",
- "displayName":"*.configstore.listeners",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.configstore.listeners",
+ "displayName": "*.configstore.listeners",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"prism.configstore.listeners",
- "displayName":"prism.configstore.listeners",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "prism.configstore.listeners",
+ "displayName": "prism.configstore.listeners",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.broker.impl.class",
- "displayName":"*.broker.impl.class",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.broker.impl.class",
+ "displayName": "*.broker.impl.class",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.shared.libs",
- "displayName":"*.shared.libs",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.shared.libs",
+ "displayName": "*.shared.libs",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.config.store.uri",
- "displayName":"*.config.store.uri",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.config.store.uri",
+ "displayName": "*.config.store.uri",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.system.lib.location",
- "displayName":"*.system.lib.location",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.system.lib.location",
+ "displayName": "*.system.lib.location",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"prism.system.lib.location",
- "displayName":"prism.system.lib.location",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "prism.system.lib.location",
+ "displayName": "prism.system.lib.location",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.retry.recorder.path",
- "displayName":"*.retry.recorder.path",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.retry.recorder.path",
+ "displayName": "*.retry.recorder.path",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.cleanup.service.frequency",
- "displayName":"*.falcon.cleanup.service.frequency",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.falcon.cleanup.service.frequency",
+ "displayName": "*.falcon.cleanup.service.frequency",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.broker.url",
- "displayName":"*.broker.url",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.broker.url",
+ "displayName": "*.broker.url",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.broker.ttlInMins",
- "displayName":"*.broker.ttlInMins",
+ "id": "site property",
+ "name": "*.broker.ttlInMins",
+ "displayName": "*.broker.ttlInMins",
"displayType": "int",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.entity.topic",
- "displayName":"*.entity.topic",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.entity.topic",
+ "displayName": "*.entity.topic",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.max.retry.failure.count",
- "displayName":"*.max.retry.failure.count",
+ "id": "site property",
+ "name": "*.max.retry.failure.count",
+ "displayName": "*.max.retry.failure.count",
"displayType": "int",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.internal.queue.size",
- "displayName":"*.internal.queue.size",
+ "id": "site property",
+ "name": "*.internal.queue.size",
+ "displayName": "*.internal.queue.size",
"displayType": "int",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.authentication.type",
- "displayName":"*.falcon.authentication.type",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.falcon.authentication.type",
+ "displayName": "*.falcon.authentication.type",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.http.authentication.type",
- "displayName":"*.falcon.http.authentication.type",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.falcon.http.authentication.type",
+ "displayName": "*.falcon.http.authentication.type",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.http.authentication.token.validity",
- "displayName":"*.falcon.http.authentication.token.validity",
+ "id": "site property",
+ "name": "*.falcon.http.authentication.token.validity",
+ "displayName": "*.falcon.http.authentication.token.validity",
"displayType": "int",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.http.authentication.signature.secret",
- "displayName":"*.falcon.http.authentication.signature.secret",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.falcon.http.authentication.signature.secret",
+ "displayName": "*.falcon.http.authentication.signature.secret",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.http.authentication.simple.anonymous.allowed",
- "displayName":"*.falcon.http.authentication.simple.anonymous.allowed",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.falcon.http.authentication.simple.anonymous.allowed",
+ "displayName": "*.falcon.http.authentication.simple.anonymous.allowed",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
- "id":"site property",
- "name":"*.falcon.http.authentication.kerberos.name.rules",
- "displayName":"*.falcon.http.authentication.kerberos.name.rules",
- "category":"FalconStartupSite",
- "serviceName":"FALCON",
+ "id": "site property",
+ "name": "*.falcon.http.authentication.kerberos.name.rules",
+ "displayName": "*.falcon.http.authentication.kerberos.name.rules",
+ "category": "FalconStartupSite",
+ "serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
/**********************************************webhcat-site***************************************/
@@ -1403,126 +1403,121 @@ module.exports =
"displayType": "multiLine",
"serviceName": "WEBHCAT",
"category": "Advanced"
- /**********************************************log4j.properties***************************************/
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "HDFS",
- "filename": "hdfs-log4j.xml",
- "category": "AdvancedHDFSLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "MAPREDUCE2",
- "filename": "mapreduce2-log4j.xml",
- "category": "AdvancedMapredLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "YARN",
- "filename": "yarn-log4j.xml",
- "category": "AdvancedYARNLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "HBASE",
- "filename": "hbase-log4j.xml",
- "category": "AdvancedHbaseLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "HIVE",
- "filename": "hive-exec-log4j.xml",
- "category": "AdvancedHiveExecLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "HIVE",
- "filename": "hive-log4j.xml",
- "category": "AdvancedHiveLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isOverridable": true,
- "isRequired": false,
- "serviceName": "OOZIE",
- "filename": "oozie-log4j.xml",
- "category": "AdvancedOozieLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isOverridable": true,
- "isRequired": false,
- "serviceName": "ZOOKEEPER",
- "filename": "zookeeper-log4j.xml",
- "category": "AdvancedZooLog4j"
- },
- {
- "id": "site property",
- "name": "content",
- "displayName": "content",
- "value": "",
- "defaultValue": "",
- "description": "log4j properties",
- "displayType": "custom",
- "isRequired": false,
- "serviceName": "PIG",
- "filename": "pig-log4j.xml",
- "category": "AdvancedPigLog4j"
- }
+ /**********************************************log4j.properties***************************************/
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "HDFS",
+ "filename": "hdfs-log4j.xml",
+ "category": "AdvancedHDFSLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "YARN",
+ "filename": "yarn-log4j.xml",
+ "category": "AdvancedYARNLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "HBASE",
+ "filename": "hbase-log4j.xml",
+ "category": "AdvancedHbaseLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "HIVE",
+ "filename": "hive-exec-log4j.xml",
+ "category": "AdvancedHiveExecLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "HIVE",
+ "filename": "hive-log4j.xml",
+ "category": "AdvancedHiveLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isOverridable": true,
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "OOZIE",
+ "filename": "oozie-log4j.xml",
+ "category": "AdvancedOozieLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isOverridable": true,
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "ZOOKEEPER",
+ "filename": "zookeeper-log4j.xml",
+ "category": "AdvancedZooLog4j"
+ },
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "log4j properties",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "PIG",
+ "filename": "pig-log4j.xml",
+ "category": "AdvancedPigLog4j"
+ }
]
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index fd832e6..c8dcd52 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -37,7 +37,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedCoreSite', displayName : 'Custom core-site.xml', siteFileName: 'core-site.xml', canAddProperty: true}),
App.ServiceConfigCategory.create({ name: 'AdvancedHDFSSite', displayName : 'Custom hdfs-site.xml', siteFileName: 'hdfs-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHDFSLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hdfs-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedHDFSLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hdfs-log4j.xml', canAddProperty: false})
],
sites: ['global', 'core-site', 'hdfs-site', 'hdfs-log4j'],
configs: []
@@ -64,7 +64,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom log4j.properties', siteFileName: 'mapreduce-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom log4j.properties', siteFileName: 'mapreduce-log4j.xml', canAddProperty: false})
],
sites: ['global', 'mapred-site', 'mapred-queue-acls', 'mapreduce-log4j'],
configs: []
@@ -84,7 +84,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Scheduler', isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml', siteFileNames: ['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: App.supports.capacitySchedulerUi}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedYARNLog4j', displayName : 'Custom log4j.properties', siteFileName: 'yarn-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedYARNLog4j', displayName : 'Custom log4j.properties', siteFileName: 'yarn-log4j.xml', canAddProperty: false})
],
sites: ['global', 'yarn-site', 'capacity-scheduler', 'yarn-log4j'],
configs: []
@@ -101,7 +101,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom log4j.properties', siteFileName: 'mapreduce2-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom log4j.properties', siteFileName: 'mapreduce2-log4j.xml', canAddProperty: false})
],
sites: ['global', 'mapred-site', 'mapred-queue-acls', 'mapreduce2-log4j'],
configs: []
@@ -115,8 +115,8 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName : 'Hive Metastore'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedHiveSite', displayName : 'Custom hive-site.xml', siteFileName: 'hive-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHiveLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hive-log4j.xml'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHiveExecLog4j', displayName : 'Custom hive-exec-log4j', siteFileName: 'hive-exec-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedHiveLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hive-log4j.xml', canAddProperty: false}),
+ App.ServiceConfigCategory.create({ name: 'AdvancedHiveExecLog4j', displayName : 'Custom hive-exec-log4j', siteFileName: 'hive-exec-log4j.xml', canAddProperty: false})
],
sites: ['global', 'hive-site', 'hive-log4j', 'hive-exec-log4j'],
configs: []
@@ -145,7 +145,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedHbaseSite', displayName : 'Custom hbase-site.xml', siteFileName: 'hbase-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHbaseLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hbase-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedHbaseLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hbase-log4j.xml', canAddProperty: false})
],
sites: ['global', 'hbase-site', 'hbase-log4j'],
configs: []
@@ -157,7 +157,7 @@ module.exports = [
configCategories: [
App.ServiceConfigCategory.create({ name: 'ZooKeeper Server', displayName : 'ZooKeeper Server'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedZooLog4j', displayName : 'Custom log4j.properties', siteFileName: 'zookeeper-log4j.xml'}),
+ App.ServiceConfigCategory.create({ name: 'AdvancedZooLog4j', displayName : 'Custom log4j.properties', siteFileName: 'zookeeper-log4j.xml', canAddProperty: false}),
App.ServiceConfigCategory.create({ name: 'AdvancedZooCfg', displayName : 'Custom zoo.cfg', siteFileName: 'zoo.cfg', canAddProperty: true})
],
sites: ['global', 'zookeeper-log4j', 'zoo.cfg'],
@@ -172,7 +172,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Oozie Server', displayName : 'Oozie Server'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedOozieSite', displayName : 'Custom oozie-site.xml', siteFileName: 'oozie-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedOozieLog4j', displayName : 'Custom log4j.properties', siteFileName: 'oozie-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedOozieLog4j', displayName : 'Custom log4j.properties', siteFileName: 'oozie-log4j.xml', canAddProperty: false})
],
sites: ['global', 'oozie-site', 'oozie-log4j'],
configs: []
@@ -215,7 +215,7 @@ module.exports = [
displayName: 'Pig',
configCategories: [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedPigLog4j', displayName : 'Custom log4j.properties', siteFileName: 'pig-log4j.xml'})
+ App.ServiceConfigCategory.create({ name: 'AdvancedPigLog4j', displayName : 'Custom log4j.properties', siteFileName: 'pig-log4j.xml', canAddProperty: false})
],
sites: ['pig-log4j'],
configs: []
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js
index 589688e..44485a1 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -714,10 +714,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "HDFS",
"filename": "hdfs-log4j.xml",
"category": "AdvancedHDFSLog4j"
@@ -729,10 +730,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "MAPREDUCE",
"filename": "mapreduce-log4j.xml",
"category": "AdvancedMapredLog4j"
@@ -744,10 +746,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "HBASE",
"filename": "hbase-log4j.xml",
"category": "AdvancedHbaseLog4j"
@@ -759,10 +762,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "HIVE",
"filename": "hive-exec-log4j.xml",
"category": "AdvancedHiveExecLog4j"
@@ -774,10 +778,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "HIVE",
"filename": "hive-log4j.xml",
"category": "AdvancedHiveLog4j"
@@ -789,10 +794,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "OOZIE",
"filename": "oozie-log4j.xml",
"category": "AdvancedOozieLog4j"
@@ -804,10 +810,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "ZOOKEEPER",
"filename": "zookeeper-log4j.xml",
"category": "AdvancedZooLog4j"
@@ -819,10 +826,11 @@ module.exports =
"value": "",
"defaultValue": "",
"description": "log4j properties",
- "displayType": "custom",
+ "displayType": "content",
"isOverridable": true,
"isRequired": false,
"isVisible": true,
+ "showLabel": false,
"serviceName": "PIG",
"filename": "pig-log4j.xml",
"category": "AdvancedPigLog4j"
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index a98d06c..61d7191 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -160,6 +160,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
group: null, // Contain group related to this property. Set only when isOriginalSCP is false.
isUserProperty: null, // This property was added by user. Hence they get removal actions etc.
isOverridable: true,
+ showLabel: true,
error: false,
warn: false,
overrideErrorTrigger: 0, //Trigger for overrridable property error
@@ -629,6 +630,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'directories':
return App.ServiceConfigTextArea;
break;
+ case 'content':
+ return App.ServiceConfigTextAreaContent;
+ break;
case 'multiLine':
return App.ServiceConfigTextArea;
break;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/templates/common/configs/service_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index d37f6b8..4bf74f8 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -96,22 +96,24 @@
{{#each view.filteredCategoryConfigs}}
<div {{bindAttr class=":entry-row isOverridden:overridden-property"}}>
- <span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}>
- <label class="control-label">
- {{displayName}}
- {{#if App.supports.secureCluster}}
- {{#if isSecureConfig}}
- <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip" title="security knob"></i></a>
+ {{#if showLabel}}
+ <span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}>
+ <label class="control-label">
+ {{displayName}}
+ {{#if App.supports.secureCluster}}
+ {{#if isSecureConfig}}
+ <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip" title="security knob"></i></a>
+ {{/if}}
{{/if}}
- {{/if}}
- {{#if view.supportsHostOverrides}}
- {{#if isRestartRequired}}
- <i class="icon-refresh restart-required-property" rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
+ {{#if view.supportsHostOverrides}}
+ {{#if isRestartRequired}}
+ <i class="icon-refresh restart-required-property" rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
+ {{/if}}
{{/if}}
- {{/if}}
- </label>
- </span>
- <div class="controls">
+ </label>
+ </span>
+ {{/if}}
+ <div {{bindAttr class="showLabel:controls"}}>
{{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }}
<div {{bindAttr class="errorMessage:error: warnMessage:warning: :control-group"}}>
{{view viewClass serviceConfigBinding="this" categoryConfigsAllBinding="view.categoryConfigsAll" }}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 153305c..4829bf1 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -50,11 +50,6 @@ App.config = Em.Object.create({
*/
filenameExceptions: ['zoo.cfg'],
- log4jNotDefaultFilenames: [
- {serviceName: 'HIVE', tagName: 'hive-exec-log4j.xml', configCroupName: 'AdvancedHiveExecLog4j', fileName: 'hive-exec-log4j.properties'},
- {serviceName: 'HIVE', tagName: 'hive-log4j.xml', configCroupName: 'AdvancedHiveLog4j', fileName: 'hive-log4j.properties'}
- ],
-
/**
* Since values end up in XML files (core-sit.xml, etc.), certain
* XML sensitive characters should be escaped. If not we will have
@@ -276,6 +271,7 @@ App.config = Em.Object.create({
filename: filename,
isUserProperty: false,
isOverridable: true,
+ showLabel: true,
serviceName: serviceName,
belongsToService: []
});
@@ -354,6 +350,7 @@ App.config = Em.Object.create({
serviceConfigObj.isSecureConfig = configsPropertyDef.isSecureConfig === undefined ? false : configsPropertyDef.isSecureConfig;
serviceConfigObj.belongsToService = configsPropertyDef.belongsToService;
serviceConfigObj.category = configsPropertyDef.category;
+ serviceConfigObj.showLabel = configsPropertyDef.showLabel !== false;
},
/**
@@ -440,6 +437,7 @@ App.config = Em.Object.create({
configData.filename = stored.filename;
configData.description = stored.description;
configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent : true;
+ configData.showLabel = stored.showLabel !== false;
} else if (!preDefined && stored) {
configData = {
@@ -455,7 +453,8 @@ App.config = Em.Object.create({
isUserProperty: stored.isUserProperty === true,
isOverridable: true,
overrides: stored.overrides,
- isRequired: true
+ isRequired: true,
+ showLabel: stored.showLabel !== false
};
this.calculateConfigProperties(configData, isAdvanced, advancedConfigs);
} else if (preDefined && !stored) {
@@ -482,6 +481,7 @@ App.config = Em.Object.create({
configData.overrides = storedCfg.overrides;
configData.filename = storedCfg.filename;
configData.description = storedCfg.description;
+ configData.description = storedCfg.showLabel !== false;
} else if (isAdvanced){
advanced = advancedConfigs.filterProperty('filename', configData.filename).findProperty('name', configData.name);
this.setPropertyFromStack(configData,advanced);
@@ -503,10 +503,10 @@ App.config = Em.Object.create({
// Password fields should be made blank by default in installer wizard
// irrespective of whatever value is sent from stack definition.
// This forces the user to fill the password field.
- configData.value = configData.displayType == "password" ? '' : advanced.value;
+ configData.value = configData.displayType == "password" ? '' : advanced ? advanced.value : configData.value;
configData.defaultValue = configData.value;
- configData.filename = advanced.filename;
- configData.description = advanced.description;
+ configData.filename = advanced ? advanced.filename : configData.filename;
+ configData.description = advanced ? advanced.description : configData.description;
},
@@ -1011,65 +1011,6 @@ App.config = Em.Object.create({
return configs;
},
-
- addLog4jConfig: function (configs, serviceName) {
- var fileName = serviceName.toLowerCase() + '-log4j.xml';
- var content = configs.filterProperty('serviceName', serviceName).findProperty('name', 'content');
- if (!content || (!content.value.length)) {
- var category = categotyConfigs.findProperty('serviceName', serviceName) && categotyConfigs.findProperty('serviceName', serviceName).configCategories.findProperty('siteFileName', fileName);
- if (category) {
- if (serviceName == 'HIVE') {
- this.get('log4jNotDefaultFilenames').forEach(function (info) {
- this.loadLog4jDefaultProperties(configs, 'HIVE', info.tagName, info.configCroupName, info.fileName);
- }, this);
- } else {
- this.loadLog4jDefaultProperties(configs, serviceName, category.siteFileName, category.name);
- }
- }
- }
- /**
- * Filtering properties to exclude {serviceName}-log4j.xml file. We don't use properties from this file,
- * instead we load log4j.properties file as one property named "content".
- * Filter can be deleted after {serviceName}-log4j.xml will be deleted from server
- */
- return configs.filter(function (_config) {
- return (_config.filename !== fileName || _config.name == "content");
- });
- },
-
- loadLog4jDefaultProperties: function(configs, serviceName, fileName, categoryName, log4jFile) {
- var url = "/resources//stacks/HDP/" + App.get('currentStackVersionNumber') + "/services/" + serviceName + "/configuration/" + (log4jFile || "log4j.properties");
- $.ajax({
- type: "GET",
- url: url,
- async: false,
- success: function(data) {
- var log4jObj = new Object({
- "id": "puppet var",
- "name": "content",
- "displayName": "content",
- "value": data,
- "defaultValue": data,
- "description": "log4j properties",
- "displayType": "custom",
- "isOverridable": true,
- "isRequired": true,
- "isVisible": true,
- "serviceName": serviceName,
- "filename": fileName,
- "category": categoryName
- });
- var cfg = configs.findProperty('filename',fileName);
- if (!cfg) {
- configs.push(log4jObj);
- } else {
- cfg.value = data;
- cfg.defaultValue = data;
- }
- }
- });
- },
-
/**
* trim trailing spaces for all properties.
* trim both trailing and leading spaces for host displayType and hive/oozie datebases url.
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/views/common/configs/services_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js
index 515d78f..f3c6f2d 100644
--- a/ambari-web/app/views/common/configs/services_config.js
+++ b/ambari-web/app/views/common/configs/services_config.js
@@ -74,7 +74,9 @@ App.ServiceConfigView = Em.View.extend({
canAddProperty = false;
}
this.get('controller.selectedService.configCategories').filterProperty('siteFileName').forEach(function (config) {
- config.set('canAddProperty', canAddProperty);
+ if (config.get('canAddProperty') !== false) {
+ config.set('canAddProperty', canAddProperty);
+ }
});
}.observes(
'App.router.mainServiceInfoConfigsController.selectedConfigGroup.name',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b911c05e/ambari-web/app/views/wizard/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js
index e8eedc2..ec88cd8 100644
--- a/ambari-web/app/views/wizard/controls_view.js
+++ b/ambari-web/app/views/wizard/controls_view.js
@@ -157,6 +157,18 @@ App.ServiceConfigTextArea = Ember.TextArea.extend(App.ServiceConfigPopoverSuppor
});
/**
+ * Textarea control for content type
+ * @type {*}
+ */
+App.ServiceConfigTextAreaContent = Ember.TextArea.extend(App.ServiceConfigPopoverSupport, {
+
+ valueBinding: 'serviceConfig.value',
+ rows: 20,
+ classNames: ['span10'],
+ placeholderBinding: 'serviceConfig.defaultValue'
+});
+
+/**
* Textarea control with bigger height
* @type {*}
*/