AMBARI-5478 Flume configurations should not have 'flume-agent' type. (Buzhor Denys via atkach)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-agent.xml

@@ -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>

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>

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" : {

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"
       },

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: []}
     };
 

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"
     }
   ]
 };

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: []
   },
   {

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']);