SLIDER-769 Modify Slider app packages for seamless integration with AMS provider (Ambari Metrics Service)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/24622cbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/24622cbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/24622cbe Branch: refs/heads/feature/package_simplification_II Commit: 24622cbe5f83c59f3539b50481239f6a88871282 Parents: 54bcc86 Author: Gour Saha <gourks...@apache.org> Authored: Tue Mar 3 08:55:01 2015 -0800 Committer: Gour Saha <gourks...@apache.org> Committed: Tue Mar 3 08:55:01 2015 -0800 ---------------------------------------------------------------------- app-packages/storm/package/scripts/params.py | 1 + app-packages/storm/package/templates/config.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/24622cbe/app-packages/storm/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py index 8354617..379b229 100644 --- a/app-packages/storm/package/scripts/params.py +++ b/app-packages/storm/package/scripts/params.py @@ -43,6 +43,7 @@ storm_env_sh_template = config['configurations']['storm-env']['content'] metric_collector_host = default('/configurations/global/metric_collector_host', '') metric_collector_port = default('/configurations/global/metric_collector_port', '') metric_collector_lib = default('/configurations/global/metric_collector_lib', '') +metric_collector_app_id = format("{app_name}") has_metric_collector = 1 if not metric_collector_lib: http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/24622cbe/app-packages/storm/package/templates/config.yaml.j2 ---------------------------------------------------------------------- diff --git a/app-packages/storm/package/templates/config.yaml.j2 b/app-packages/storm/package/templates/config.yaml.j2 index d9c47a9..5294917 100644 --- a/app-packages/storm/package/templates/config.yaml.j2 +++ b/app-packages/storm/package/templates/config.yaml.j2 @@ -27,9 +27,9 @@ enableMetricsSink: True metrics_collector: reportInterval: 60 - host: "{{metric_collector_host}}" port: {{metric_collector_port}} + appId: "{{metric_collector_app_id}}" {% else %} enableGanglia: True
