ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject git commit: AMBARI-6372. Nagios install fails if hbase service is unavailable.(vbrodetskyi)
Date Thu, 03 Jul 2014 14:49:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 065906814 -> c1571bc08


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/c1571bc0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c1571bc0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c1571bc0

Branch: refs/heads/trunk
Commit: c1571bc0830d756a538ec0e820b15d5f156150ca
Parents: 0659068
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Thu Jul 3 14:56:07 2014 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Thu Jul 3 14:56:07 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/c1571bc0/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/c1571bc0/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 8fe3c42..8c37bc9 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/c1571bc0/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/c1571bc0/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 8f70340..e8e13b5 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 {


Mime
View raw message