Updated Branches: refs/heads/trunk de56ee61d -> 74dfb8e17
AMBARI-3948. HBase Multi-Master setup shows HBase Master alerts under HDP 1.3.x stack. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/74dfb8e1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/74dfb8e1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/74dfb8e1 Branch: refs/heads/trunk Commit: 74dfb8e1780008afb7d2cdd2f803ab9671359f9e Parents: de56ee6 Author: Siddharth Wagle <[email protected]> Authored: Mon Dec 2 16:28:24 2013 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Mon Dec 2 16:28:24 2013 -0800 ---------------------------------------------------------------------- .../templates/hadoop-services.cfg.erb | 22 ++++++++++---------- .../main/puppet/modules/hdp/manifests/init.pp | 2 ++ 2 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/74dfb8e1/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 41c74ef..7590715 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 @@ -647,16 +647,16 @@ define service { } # HBASE:: MASTER Checks -define service { - hostgroup_name hbasemasters - use hadoop-service - service_description HBASEMASTER::HBase Master Web UI - servicegroups HBASE - check_command check_webui!hbase!<%=scope.function_hdp_template_var("::hdp::hbase_master_port")%> - normal_check_interval 1 - retry_check_interval 1 - max_check_attempts 3 -} +# define service { +# hostgroup_name hbasemasters +# use hadoop-service +# service_description HBASEMASTER::HBase Master Web UI +# servicegroups HBASE +# check_command check_webui!hbase!<%=scope.function_hdp_template_var("::hdp::hbase_master_port")%> +# normal_check_interval 1 +# retry_check_interval 1 +# max_check_attempts 3 +# } <% if scope.function_hdp_template_var("hdp_os_type") != "suse"%> define service { hostgroup_name hbasemasters @@ -674,7 +674,7 @@ define service { use hadoop-service service_description HBASEMASTER::HBase Master process servicegroups HBASE - check_command check_tcp!<%=scope.function_hdp_template_var("::hdp::hbase_master_port")%>!-w 1 -c 1 + check_command check_tcp!<%=scope.function_hdp_template_var("::hdp::hbase_master_rpc_port")%>!-w 1 -c 1 normal_check_interval 0.5 retry_check_interval 0.25 max_check_attempts 4 http://git-wip-us.apache.org/repos/asf/ambari/blob/74dfb8e1/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp index 2eaec7b..256610d 100644 --- a/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp +++ b/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp @@ -78,6 +78,8 @@ class hdp( $hbase_master_port = hdp_default("hbase-site/hbase.master.info.port","60010") $hbase_rs_port = hdp_default("hbase-site/hbase.regionserver.info.port","60030") + ## Nagios check_tcp port + $hbase_master_rpc_port = hdp_default("hbase-site/hbase.master.port", "60000") $ganglia_port = hdp_default("ganglia_port","8651") $ganglia_collector_slaves_port = hdp_default("ganglia_collector_slaves_port","8660")
