incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject git commit: AMBARI-2871. Nagios start fails due to invalid configs. (odiachenko)
Date Mon, 12 Aug 2013 15:10:47 GMT
Updated Branches:
  refs/heads/trunk cd30718c6 -> 4dceca42c


AMBARI-2871. Nagios start fails due to invalid configs. (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/4dceca42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/4dceca42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/4dceca42

Branch: refs/heads/trunk
Commit: 4dceca42c504ca26078e57d724096f5b5f4ea33d
Parents: cd30718
Author: Oleksandr Diachenko <odiachenko@hortonworks.com>
Authored: Mon Aug 12 18:07:36 2013 +0300
Committer: Oleksandr Diachenko <odiachenko@hortonworks.com>
Committed: Mon Aug 12 18:10:28 2013 +0300

----------------------------------------------------------------------
 .../templates/hadoop-services.cfg.erb           | 28 +++++++++++---------
 1 file changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4dceca42/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 3a8e3cb..3aa8be2 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
@@ -64,17 +64,6 @@ define service {
         max_check_attempts      3
 }
 
-# NAGIOS SERVER MAPREDUCE Checks
-define service {
-        hostgroup_name          nagios-server
-        use                     hadoop-service
-        service_description     MAPREDUCE::Percent TaskTrackers down
-        servicegroups           MAPREDUCE
-        check_command           check_aggregate!"TASKTRACKER::TaskTracker process down"!10%!30%
-        normal_check_interval   0.5
-        retry_check_interval    0.25
-        max_check_attempts      3
-}
 
 # AMBARI AGENT Checks
 define service {
@@ -374,6 +363,20 @@ define service {
         max_check_attempts      5
 }
 
+<%end-%>
+
+<%if scope.function_hdp_nagios_members_exist('tasktracker')-%>
+define service {
+        hostgroup_name          nagios-server
+        use                     hadoop-service
+        service_description     MAPREDUCE::Percent TaskTrackers down
+        servicegroups           MAPREDUCE
+        check_command           check_aggregate!"TASKTRACKER::TaskTracker process down"!10%!30%
+        normal_check_interval   0.5
+        retry_check_interval    0.25
+        max_check_attempts      3
+}
+
 # MAPREDUCE::TASKTRACKER Checks 
 define service {
         hostgroup_name          tasktracker-servers
@@ -386,7 +389,7 @@ define service {
         max_check_attempts      3
 }
 
-# MAPREDUCE::TASKTRACKER Mapreduuce locad dir used space
+# MAPREDUCE::TASKTRACKER Mapreduce local dir used space
 define service {
         hostgroup_name          tasktracker-servers
         use                     hadoop-service
@@ -400,6 +403,7 @@ define service {
 
 <%end-%>
 
+
 <%if scope.function_hdp_nagios_members_exist('resourcemanager')-%>
 # YARN::RESOURCEMANAGER Checks 
 define service {


Mime
View raw message