Repository: ambari Updated Branches: refs/heads/trunk 8c6e09152 -> 1df9a1659
AMBARI-5478 Flume configurations should not have 'flume-agent' 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/1df9a165 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1df9a165 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1df9a165 Branch: refs/heads/trunk Commit: 1df9a16593d52c4d5c020630e9087d1d6678645e Parents: 8c6e091 Author: atkach <atk...@hortonworks.com> Authored: Wed Apr 16 20:54:51 2014 +0300 Committer: atkach <atk...@hortonworks.com> Committed: Wed Apr 16 20:54:51 2014 +0300 ---------------------------------------------------------------------- .../FLUME/configuration/flume-agent.xml | 29 -------------------- .../HDP/2.0.6/services/FLUME/metainfo.xml | 1 - .../assets/data/clusters/tags_and_groups.json | 2 +- .../configurations/cluster_level_configs.json | 2 +- .../app/controllers/wizard/step8_controller.js | 2 +- ambari-web/app/data/HDP2/site_properties.js | 2 +- ambari-web/app/data/service_configs.js | 4 +-- ambari-web/app/utils/config.js | 2 +- 8 files changed, 7 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/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 deleted file mode 100644 index 7643366..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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. - */ ---> - -<configuration> - <property> - <name>content</name> - <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/1df9a165/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml index 8851727..8e3dca0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml @@ -53,7 +53,6 @@ </commandScript> <configuration-dependencies> - <config-type>flume-agent</config-type> <config-type>flume-conf</config-type> <config-type>flume-log4j</config-type> <config-type>global</config-type> http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/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 3a0849a..4c88d8d 100644 --- a/ambari-web/app/assets/data/clusters/tags_and_groups.json +++ b/ambari-web/app/assets/data/clusters/tags_and_groups.json @@ -41,7 +41,7 @@ "tez-site": { "tag": "version1" }, - "flume-agent": { + "flume-conf": { "tag": "version1" }, "core-site" : { http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/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 d9808c0..54966b2 100644 --- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json +++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json @@ -688,7 +688,7 @@ { "href" : "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/configurations?type=flume-agent&tag=version1";, "tag" : "version1", - "type" : "flume-agent", + "type" : "flume-conf", "Config" : { "cluster_name" : "c1" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/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 e9aaba5..abc617e 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -1339,7 +1339,7 @@ App.WizardStep8Controller = Em.Controller.extend({ ], log4j: []}, ZOOKEEPER: {site: [], log4j: ['zookeeper']}, FLUME: {site: [ - {filename: 'flume-agent', isXmlFile: false} + {filename: 'flume-conf', isXmlFile: false} ], log4j: []} }; http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/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 8fb60b9..8c0ac63 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1660,7 +1660,7 @@ module.exports = "serviceName": "FLUME", "isCanBeEmpty": true, "category": "FlumeAgent", - "filename": "flume-agent.xml" + "filename": "flume-conf.xml" } ] }; http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/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 55166c6..eee95ce 100644 --- a/ambari-web/app/data/service_configs.js +++ b/ambari-web/app/data/service_configs.js @@ -283,9 +283,9 @@ module.exports = [ serviceName: 'FLUME', displayName: 'Flume', configCategories: [ - App.ServiceConfigCategory.create({ name: 'FlumeAgent', displayName : 'flume-agent.conf', siteFileName: 'flume-agent', canAddProperty: false}) + App.ServiceConfigCategory.create({ name: 'FlumeAgent', displayName : 'flume.conf', siteFileName: 'flume-conf', canAddProperty: false}) ], - sites: ['flume-agent'], + sites: ['flume-conf'], configs: [] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/1df9a165/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index ec13338..905cd2d 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-agent.xml']; + var customFiles = ['flume-conf.xml']; if (App.supports.capacitySchedulerUi) { if (App.get('isHadoop2Stack')) { return customFiles.concat(['capacity-scheduler.xml']);
