You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2013/12/04 15:12:06 UTC
[2/2] git commit: AMBARI-3953 HBase Master alerts are confusing in
multi-master environment (dsen)
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/e405a345
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e405a345
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e405a345
Branch: refs/heads/branch-1.4.2
Commit: e405a345934f8f400fa4359ccc86b9fb1ac95a8e
Parents: 86b297e
Author: Dmitry Sen <ds...@hortonworks.com>
Authored: Tue Dec 3 15:30:09 2013 +0200
Committer: Dmitry Sen <ds...@hortonworks.com>
Committed: Wed Dec 4 16:11:44 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/e405a345/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 549f400..13b03a9 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