Repository: ambari Updated Branches: refs/heads/trunk 413231099 -> a606a046d
AMBARI-16188. Logfeeder: metrics collector hosts and input files are not configurable (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a606a046 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a606a046 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a606a046 Branch: refs/heads/trunk Commit: a606a046d3e327dc9180ca9d67e030887f4eca66 Parents: 4132310 Author: oleewere <[email protected]> Authored: Fri Apr 29 19:39:08 2016 +0200 Committer: oleewere <[email protected]> Committed: Fri Apr 29 19:39:22 2016 +0200 ---------------------------------------------------------------------- .../LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml | 9 ++++++++- .../resources/common-services/LOGSEARCH/0.5.0/metainfo.xml | 2 -- .../LOGSEARCH/0.5.0/package/scripts/params.py | 8 ++++++-- .../0.5.0/package/templates/logfeeder.properties.j2 | 2 +- .../src/test/python/stacks/2.4/configs/default.json | 2 ++ ambari-web/app/data/HDP2/site_properties.js | 7 +++++++ 6 files changed, 24 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a606a046/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml index 8283429..2e92ab9 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/a606a046/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml index 4fec7e0..56a5cf9 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/a606a046/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py index aafd4ba..6d9d305 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py +++ b/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) \ No newline at end of file +logfeeder_custom_properties.pop('logfeeder.checkpoint.folder', None) +logfeeder_custom_properties.pop('logfeeder.metrics.collector.hosts', None) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/a606a046/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 index b674e42..2408261 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/a606a046/ambari-server/src/test/python/stacks/2.4/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json index e528797..cab15a4 100644 --- a/ambari-server/src/test/python/stacks/2.4/configs/default.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/a606a046/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 a523cf1..9ca0218 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/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",
