Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2628D1180F for ; Thu, 3 Jul 2014 14:53:50 +0000 (UTC) Received: (qmail 222 invoked by uid 500); 3 Jul 2014 14:53:50 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 195 invoked by uid 500); 3 Jul 2014 14:53:49 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 186 invoked by uid 99); 3 Jul 2014 14:53:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 14:53:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9B183995CD8; Thu, 3 Jul 2014 14:53:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vbrodetskyi@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-6372. Nagios install fails if hbase service is unavailable.(vbrodetskyi) Date: Thu, 3 Jul 2014 14:53:49 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-1.6.1 a0677c9a7 -> 473e40e6b AMBARI-6372. Nagios install fails if hbase service is unavailable.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/473e40e6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/473e40e6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/473e40e6 Branch: refs/heads/branch-1.6.1 Commit: 473e40e6b8f3b311e62bf3209c7796e1f8f757c3 Parents: a0677c9 Author: Vitaly Brodetskyi Authored: Thu Jul 3 14:59:30 2014 +0300 Committer: Vitaly Brodetskyi Committed: Thu Jul 3 14:59:30 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py | 3 ++- .../services/NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 ++ .../stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py | 3 ++- .../services/NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/473e40e6/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py index 6d43bcc..b172dce 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py @@ -125,7 +125,8 @@ _flume_hosts = default("/clusterHostInfo/flume_hosts", None) _nagios_server_host = default("/clusterHostInfo/nagios_server_host",None) _ganglia_server_host = default("/clusterHostInfo/ganglia_server_host",None) hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts",None) -hbase_master_hosts_in_str = ','.join(hbase_master_hosts) +if type(hbase_master_hosts) is list: + hbase_master_hosts_in_str = ','.join(hbase_master_hosts) _hive_server_host = default("/clusterHostInfo/hive_server_host",None) _oozie_server = default("/clusterHostInfo/oozie_server",None) _webhcat_server_host = default("/clusterHostInfo/webhcat_server_host",None) http://git-wip-us.apache.org/repos/asf/ambari/blob/473e40e6/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 index fea7777..db8942d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 @@ -488,6 +488,7 @@ define service { # retry_check_interval 1 # max_check_attempts 3 # #} +{% if hostgroup_defs['hbasemasters'] %} {% if check_cpu_on %} define service { hostgroup_name nagios-server @@ -501,6 +502,7 @@ define service { max_check_attempts 5 } {% endif %} +{% endif %} {% for hbasemaster in hbase_master_hosts %} define service { http://git-wip-us.apache.org/repos/asf/ambari/blob/473e40e6/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py index 7fa32fa..3be204b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py @@ -200,7 +200,8 @@ _supervisor_hosts = default("/clusterHostInfo/supervisor_hosts",None) _storm_ui_host = default("/clusterHostInfo/storm_ui_server_hosts",None) _storm_rest_api_hosts = default("/clusterHostInfo/storm_rest_api_hosts",None) hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts",None) -hbase_master_hosts_in_str = ','.join(hbase_master_hosts) +if type(hbase_master_hosts) is list: + hbase_master_hosts_in_str = ','.join(hbase_master_hosts) _hive_server_host = default("/clusterHostInfo/hive_server_host",None) _oozie_server = default("/clusterHostInfo/oozie_server",None) _webhcat_server_host = default("/clusterHostInfo/webhcat_server_host",None) http://git-wip-us.apache.org/repos/asf/ambari/blob/473e40e6/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 index 35bdaec..260c8b2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 @@ -656,6 +656,7 @@ define service { # retry_check_interval 1 # max_check_attempts 3 # #} +{% if hostgroup_defs['hbasemasters'] %} {% if check_cpu_on %} define service { hostgroup_name nagios-server @@ -669,6 +670,7 @@ define service { max_check_attempts 5 } {% endif %} +{% endif %} {% for hbasemaster in hbase_master_hosts %} define service {