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

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>

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

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

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

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

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

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