You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/01/17 01:32:09 UTC
git commit: AMBARI-3754. Nagios won't start if HDFS is not selected.
(Erin Boyd via mahadev)
Updated Branches:
refs/heads/trunk 2e29777a5 -> 8d5c99db8
AMBARI-3754. Nagios won't start if HDFS is not selected. (Erin Boyd via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d5c99db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d5c99db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d5c99db
Branch: refs/heads/trunk
Commit: 8d5c99db8d78bef4e9d09b793cab4b9bcb804ab4
Parents: 2e29777
Author: Mahadev Konar <ma...@apache.org>
Authored: Thu Jan 16 16:31:32 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Thu Jan 16 16:31:32 2014 -0800
----------------------------------------------------------------------
.../templates/hadoop-services.cfg.erb | 27 +++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d5c99db/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 13b03a9..6e8acd6 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
@@ -45,6 +45,7 @@ define service {
max_check_attempts 2
}
+<%if scope.function_hdp_nagios_members_exist('namenode')-%>
# NAGIOS SERVER HDFS Checks
define service {
hostgroup_name nagios-server
@@ -67,6 +68,7 @@ define service {
retry_check_interval 0.25
max_check_attempts 3
}
+<%end-%> #end HDFS if
<% 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"))%>
@@ -80,7 +82,8 @@ define service {
retry_check_interval 0.25
max_check_attempts 5
}
-<%end-%>
+<%end-%> #end HDFS if
+
# AMBARI AGENT Checks
<%scope.function_hdp_template_var("all_hosts").each_with_index do |hostname, index|-%>
@@ -95,7 +98,7 @@ define service {
max_check_attempts 4
}
-<%end-%>
+<%end-%> #end do loop
# NAGIOS SERVER ZOOKEEPER Checks
<%if scope.function_hdp_nagios_members_exist('zookeeper-servers')-%>
@@ -124,7 +127,7 @@ define service {
max_check_attempts 3
}
<%end-%>
-<%end-%>
+<%end-%> #end if nagios-server
@@ -215,7 +218,7 @@ define service {
}
<%end-%>
-<%end-%>
+<%end-%> #end if ganglia
<%if scope.function_hdp_nagios_members_exist('snamenode')-%>
# Secondary namenode checks
@@ -230,6 +233,7 @@ define service {
max_check_attempts 3
}
<%end-%>
+
<%if scope.function_hdp_nagios_members_exist('namenode')-%>
# HDFS Checks
<% @namenodes = scope.function_hdp_template_var("::hdp::params::namenode_host"); @namenodes.each do |namenode| -%>
@@ -256,7 +260,7 @@ define service {
retry_check_interval 2
max_check_attempts 5
}
-<% end %>
+<% end %> #end os type
define service {
host_name <%= namenode %>
@@ -291,7 +295,6 @@ define service {
max_check_attempts 5
}
- <% end -%>
define service {
hostgroup_name nagios-server
@@ -314,8 +317,8 @@ define service {
retry_check_interval 1
max_check_attempts 1
}
-
-<%end-%>
+<% end -%> #end do loop
+<% end -%> #end if HDFS (namenode)
# MAPREDUCE Checks
<%if scope.function_hdp_nagios_members_exist('jobtracker')-%>
@@ -376,7 +379,7 @@ define service {
max_check_attempts 5
}
-<%end-%>
+<%end-%> #end if MapReduce
<%if scope.function_hdp_nagios_members_exist('tasktracker-servers')-%>
define service {
@@ -669,7 +672,7 @@ define service {
retry_check_interval 2
max_check_attempts 5
}
-<% end %>
+<% end %> #end if suse
define service {
host_name <%= hbasemaster %>
use hadoop-service
@@ -680,8 +683,8 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
-<%end-%>
-<%end-%>
+<%end-%> #end do loop
+<%end-%> #end if Hbase
<%if scope.function_hdp_nagios_members_exist('hiveserver')-%>
# HIVE Metastore check