Updated Branches: refs/heads/trunk f8e39c72c -> 23ceb7713
AMBARI-3157. Nagios alert for NN HA shows up after Nagios restart, no HA enabled. (Dmitry Sen via odiachenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/23ceb771 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/23ceb771 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/23ceb771 Branch: refs/heads/trunk Commit: 23ceb77134f34ab63dff9ac8b8ff2f70b6433afa Parents: f8e39c7 Author: Oleksandr Diachenko <[email protected]> Authored: Tue Sep 10 18:20:56 2013 +0300 Committer: Oleksandr Diachenko <[email protected]> Committed: Tue Sep 10 18:20:56 2013 +0300 ---------------------------------------------------------------------- .../puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/23ceb771/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 b8ee10f..8a6a2e3 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 @@ -63,7 +63,9 @@ define service { retry_check_interval 0.25 max_check_attempts 3 } -<% if scope.function_hdp_nagios_members_exist('namenode') && (scope.function_hdp_get_major_stack_version([scope.function_hdp_template_var("stack_version")]) >= 2)%> +<% if scope.function_hdp_nagios_members_exist('namenode') && + (scope.function_hdp_get_major_stack_version([scope.function_hdp_template_var("stack_version")]) >= 2) && + (scope.function_hdp_template_var("::hdp::params::dfs_ha_enabled"))%> define service { hostgroup_name nagios-server use hadoop-service
