Updated Branches: refs/heads/branch-1.4.1 1b6b3cc70 -> 5b8070355
AMBARI-3512. Nagios doesn't start after upgrade (SLES11, 1.3.2->2.0.6). Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/5b807035 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/5b807035 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/5b807035 Branch: refs/heads/branch-1.4.1 Commit: 5b8070355283340ec4269f2235d8ec6d59f74eea Parents: 1b6b3cc Author: Sumit Mohanty <[email protected]> Authored: Mon Oct 14 19:23:14 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Oct 14 19:23:14 2013 -0700 ---------------------------------------------------------------------- .../modules/hdp-nagios/templates/hadoop-services.cfg.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5b807035/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb index 739eb97..58238ae 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb @@ -336,7 +336,7 @@ define service { retry_check_interval 1 max_check_attempts 3 } - <% if scope.function_hdp_template_var("hdp_os_type") != "suse"%> +<% if scope.function_hdp_template_var("hdp_os_type") != "suse"%> define service { hostgroup_name jobtracker use hadoop-service @@ -426,6 +426,7 @@ define service { max_check_attempts 3 } +<% if scope.function_hdp_template_var("hdp_os_type") != "suse"%> define service { hostgroup_name resourcemanager use hadoop-service @@ -436,6 +437,7 @@ define service { retry_check_interval 2 max_check_attempts 5 } +<% end %> define service { hostgroup_name resourcemanager @@ -508,6 +510,7 @@ define service { max_check_attempts 3 } +<% if scope.function_hdp_template_var("hdp_os_type") != "suse"%> define service { hostgroup_name historyserver2 use hadoop-service @@ -518,6 +521,7 @@ define service { retry_check_interval 2 max_check_attempts 5 } +<% end %> define service { hostgroup_name historyserver2
