Updated Branches: refs/heads/trunk 34c6d94b4 -> b6b1980a6
AMBARI-3953 HBase Master alerts are confusing in multi-master environment (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b6b1980a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6b1980a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6b1980a Branch: refs/heads/trunk Commit: b6b1980a6748d4a1ad070291856decc263be2a02 Parents: 34c6d94 Author: Dmitry Sen <[email protected]> Authored: Tue Dec 3 15:32:52 2013 +0200 Committer: Dmitry Sen <[email protected]> Committed: Tue Dec 3 15:32:52 2013 +0200 ---------------------------------------------------------------------- .../modules/hdp-nagios/templates/hadoop-services.cfg.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b6b1980a/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 7590715..a70a817 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 @@ -657,11 +657,12 @@ define service { # retry_check_interval 1 # max_check_attempts 3 # } +<% @hbasemasters = scope.function_hdp_template_var("::hdp::params::hbase_master_hosts"); @hbasemasters.each do |hbasemaster| -%> <% if scope.function_hdp_template_var("hdp_os_type") != "suse"%> define service { - hostgroup_name hbasemasters + host_name <%= hbasemaster %> use hadoop-service - service_description HBASEMASTER::HBase Master CPU utilization + service_description HBASEMASTER::HBase Master CPU utilization on <%= hbasemaster %> servicegroups HBASE check_command check_cpu!200%!250% normal_check_interval 5 @@ -670,9 +671,9 @@ define service { } <% end %> define service { - hostgroup_name hbasemasters + host_name <%= hbasemaster %> use hadoop-service - service_description HBASEMASTER::HBase Master process + service_description HBASEMASTER::HBase Master process on <%= hbasemaster %> servicegroups HBASE check_command check_tcp!<%=scope.function_hdp_template_var("::hdp::hbase_master_rpc_port")%>!-w 1 -c 1 normal_check_interval 0.5 @@ -680,6 +681,7 @@ define service { max_check_attempts 4 } <%end-%> +<%end-%> <%if scope.function_hdp_nagios_members_exist('hiveserver')-%> # HIVE Metastore check
