Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E8D3610B3C for ; Tue, 2 Jul 2013 21:10:40 +0000 (UTC) Received: (qmail 39399 invoked by uid 500); 2 Jul 2013 21:10:40 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 39379 invoked by uid 500); 2 Jul 2013 21:10:40 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 39370 invoked by uid 99); 2 Jul 2013 21:10:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 21:10:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 21:10:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3F3FF2388906; Tue, 2 Jul 2013 21:10:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1499114 - /incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb Date: Tue, 02 Jul 2013 21:10:17 -0000 To: ambari-commits@incubator.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130702211017.3F3FF2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Tue Jul 2 21:10:16 2013 New Revision: 1499114 URL: http://svn.apache.org/r1499114 Log: AMBARI-2497. Remove dependence on dfs_datanode_http_address global for Nagios checks. (Vitaly via mahadev) Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb?rev=1499114&r1=1499113&r2=1499114&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb (original) +++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb Tue Jul 2 21:10:16 2013 @@ -493,7 +493,7 @@ define service { use hadoop-service service_description DATANODE::DataNode process down servicegroups HDFS - check_command check_tcp!<%=scope.function_hdp_template_var("dfs_datanode_http_address")%>!-w 1 -c 1 + check_command check_tcp!<%=scope.function_hdp_template_var("datanode_port")%>!-w 1 -c 1 normal_check_interval 1 retry_check_interval 0.5 max_check_attempts 3 @@ -504,7 +504,7 @@ define service { use hadoop-service service_description DATANODE::DataNode storage full servicegroups HDFS - check_command check_datanode_storage!<%=scope.function_hdp_template_var("dfs_datanode_http_address")%>!90%!90% + check_command check_datanode_storage!<%=scope.function_hdp_template_var("datanode_port")%>!90%!90% normal_check_interval 5 retry_check_interval 1 max_check_attempts 2