Repository: ambari Updated Branches: refs/heads/trunk 7a251ae7e -> 8b3983f12
AMBARI-5478 Flume configurations should not have 'flume-conf' type. (Buzhor Denys via atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8b3983f1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8b3983f1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8b3983f1 Branch: refs/heads/trunk Commit: 8b3983f1243d898670f01cc6ed735fb8c9bbdb1b Parents: 7a251ae Author: atkach <atk...@hortonworks.com> Authored: Wed Apr 16 14:50:44 2014 +0300 Committer: atkach <atk...@hortonworks.com> Committed: Wed Apr 16 14:50:44 2014 +0300 ---------------------------------------------------------------------- .../services/FLUME/configuration/flume-agent.xml | 4 ++-- .../app/assets/data/clusters/tags_and_groups.json | 3 --- .../data/configurations/cluster_level_configs.json | 13 +------------ .../app/controllers/wizard/step8_controller.js | 3 +-- ambari-web/app/data/HDP2/site_properties.js | 16 +--------------- ambari-web/app/data/service_configs.js | 5 ++--- ambari-web/app/utils/config.js | 2 +- 7 files changed, 8 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml index cf7d07b..7643366 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml @@ -23,7 +23,7 @@ <configuration> <property> <name>content</name> - <description>Flume agent config</description> - <value></value> + <description>Describe all the Flume agent configurations</description> + <value># Flume agents configuration</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/ambari-web/app/assets/data/clusters/tags_and_groups.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/clusters/tags_and_groups.json b/ambari-web/app/assets/data/clusters/tags_and_groups.json index ece895d..3a0849a 100644 --- a/ambari-web/app/assets/data/clusters/tags_and_groups.json +++ b/ambari-web/app/assets/data/clusters/tags_and_groups.json @@ -44,9 +44,6 @@ "flume-agent": { "tag": "version1" }, - "flume-conf": { - "tag": "version1" - }, "core-site" : { "tag" : "version1" } http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/ambari-web/app/assets/data/configurations/cluster_level_configs.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json index ccdfa66..d9808c0 100644 --- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json +++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json @@ -693,18 +693,7 @@ "cluster_name" : "c1" }, "properties" : { - "content" : "" - } - }, - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/configurations?type=flume-conf&tag=version1";, - "tag" : "version1", - "type" : "flume-conf", - "Config" : { - "cluster_name" : "c1" - }, - "properties" : { - "content" : "agent.sources = seqGenSrc\nagent.channels = memoryChannel\nagent.sinks = loggerSink\n" + "content" : "# Flume agents configuration" } } ] http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/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 231e1c2..e9aaba5 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -1339,8 +1339,7 @@ App.WizardStep8Controller = Em.Controller.extend({ ], log4j: []}, ZOOKEEPER: {site: [], log4j: ['zookeeper']}, FLUME: {site: [ - {filename: 'flume-agent', isXmlFile: false}, - {filename: 'flume-conf', isXmlFile: false} + {filename: 'flume-agent', isXmlFile: false} ], log4j: []} }; http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/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 3e1c230..8fb60b9 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1649,20 +1649,6 @@ module.exports = "serviceName": "GLUSTERFS", "category": "General" }, - - /********************************************* flume.conf *****************************/ - { - "id": "site property", - "serviceName": "FLUME", - "showLabel": false, - "isRequired": false, - "category": "AdvancedFlumeConf", - "displayName": "content", - "name": "content", - "isCanBeEmpty": true, - "displayType": "multiLine", - "filename": "flume-conf.xml" - }, /********************************************* flume-agent *****************************/ { "id": "site property", @@ -1670,7 +1656,7 @@ module.exports = "displayName": "content", "showLabel": false, "isRequired": false, - "displayType": "multiLine", + "displayType": "content", "serviceName": "FLUME", "isCanBeEmpty": true, "category": "FlumeAgent", http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/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 f2bb756..55166c6 100644 --- a/ambari-web/app/data/service_configs.js +++ b/ambari-web/app/data/service_configs.js @@ -283,10 +283,9 @@ module.exports = [ serviceName: 'FLUME', displayName: 'Flume', configCategories: [ - App.ServiceConfigCategory.create({ name: 'AdvancedFlumeConf', displayName : 'flume.conf', siteFileName: 'flume.conf', canAddProperty: false}), - App.ServiceConfigCategory.create({ name: 'FlumeAgent', displayName : 'flume-agent', siteFileName: 'flume-agent', canAddProperty: false}) + App.ServiceConfigCategory.create({ name: 'FlumeAgent', displayName : 'flume-agent.conf', siteFileName: 'flume-agent', canAddProperty: false}) ], - sites: ['flume-conf', 'flume-agent'], + sites: ['flume-agent'], configs: [] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/8b3983f1/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 29444f6..ec13338 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -109,7 +109,7 @@ App.config = Em.Object.create({ categoriesWithCustom: ['CapacityScheduler'], //configs with these filenames go to appropriate category not in Advanced customFileNames: function () { - var customFiles = ['flume-conf.xml', 'flume-agent.xml']; + var customFiles = ['flume-agent.xml']; if (App.supports.capacitySchedulerUi) { if (App.get('isHadoop2Stack')) { return customFiles.concat(['capacity-scheduler.xml']);
