AMBARI-16188. Logfeeder: metrics collector hosts and input files are not configurable (oleewere)

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml

@@ -23,7 +23,7 @@
 
   <property>
     <name>logfeeder.config.files</name>
-    <value>{{logfeeder_config_files}}</value>
+    <value>{default_config_files}</value>
     <description>Comma separated config files in grok format</description>
     <display-name>Logfeeder config files</display-name>
   </property>
@@ -38,4 +38,11 @@
     </value-attributes>
   </property>
 
+  <property>
+    <name>logfeeder.metrics.collector.hosts</name>
+    <value>{metrics_collector_hosts}</value>
+    <description>Metrics collector hosts for pushing metrics by Logfeeder</description>
+    <display-name>Metrics collector hosts</display-name>
+  </property>
+
 </configuration>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml

@@ -182,8 +182,6 @@
         <service>ZOOKEEPER</service>
       </requiredServices>
 
-      <restartRequiredAfterChange>false</restartRequiredAfterChange>
-
       <quickLinksConfigurations>
         <quickLinksConfiguration>
           <fileName>quicklinks.json</fileName>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py

@@ -253,8 +253,12 @@ logfeeder_supported_services = ['accumulo', 'ambari', 'ams', 'atlas', 'falcon',
 logfeeder_config_file_names = ['global.config.json', 'output.config.json'] + ['input.config-%s.json' % (tag) for tag in
                                                                               logfeeder_supported_services]
 
-logfeeder_config_files = ','.join(logfeeder_config_file_names)
+default_config_files = ','.join(logfeeder_config_file_names)
+
+logfeeder_config_files = format(config['configurations']['logfeeder-properties']['logfeeder.config.files'])
+logfeeder_metrics_collector_hosts = format(config['configurations']['logfeeder-properties']['logfeeder.metrics.collector.hosts'])
 
 logfeeder_custom_properties = dict(config['configurations']['logfeeder-properties'])
 logfeeder_custom_properties.pop('logfeeder.config.files', None)
-logfeeder_custom_properties.pop('logfeeder.checkpoint.folder', None)
+logfeeder_custom_properties.pop('logfeeder.checkpoint.folder', None)
+logfeeder_custom_properties.pop('logfeeder.metrics.collector.hosts', None)

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 logfeeder.checkpoint.folder={{logfeeder_checkpoint_folder}}
-metrics.collector.hosts={{metrics_collector_hosts}}
+metrics.collector.hosts={{logfeeder_metrics_collector_hosts}}
 config.files={{logfeeder_config_files}}
 
 # Custom properties

ambari-server/src/test/python/stacks/2.4/configs/default.json

@@ -271,6 +271,8 @@
         "logsearch.app.max.memory": "1g"
       },
       "logfeeder-properties": {
+        "logfeeder.metrics.collector.hosts" : "{metrics_collector_hosts}",
+        "logfeeder.config.files" : "{default_config_files}"
       },
       "logfeeder-env": {
         "logsearch_ui_port": "61888",

ambari-web/app/data/HDP2/site_properties.js

@@ -1890,6 +1890,13 @@ var hdp2properties = [
     "category": "Advanced logfeeder-properties",
     "index": 2
   },
+  {
+    "name": "logfeeder.metrics.collector.hosts",
+    "serviceName": "LOGSEARCH",
+    "filename": "logfeeder-properties.xml",
+    "category": "Advanced logfeeder-properties",
+    "index": 3
+  },
   /*logfeeder-env*/
   {
     "name": "logfeeder_log_dir",